Commit 55493c20 authored by Chris Allegretta's avatar Chris Allegretta
Browse files

Im an idiot, that could easily screw up --included-gettext. Rolled back libintl.h check

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@568 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 2 additions and 23 deletions
+2 -23
...@@ -6,8 +6,6 @@ CVS code - ...@@ -6,8 +6,6 @@ CVS code -
the "new" C++ reserved word, even though there is likely no way the "new" C++ reserved word, even though there is likely no way
nano will EVER be compilable with a C++ compiler. (suggested by nano will EVER be compilable with a C++ compiler. (suggested by
Rocco Corsi). Rocco Corsi).
- Added explicit check for libintl.h and only #include it if
found.
- aclocal.m4 - aclocal.m4
- Minor patch for intl check (Christian Weisgerber) - Minor patch for intl check (Christian Weisgerber)
......
...@@ -163,9 +163,6 @@ ...@@ -163,9 +163,6 @@
/* Define if you have the <getopt.h> header file. */ /* Define if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H #undef HAVE_GETOPT_H
/* Define if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define if you have the <limits.h> header file. */ /* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H
......
...@@ -1237,7 +1237,7 @@ EOF ...@@ -1237,7 +1237,7 @@ EOF
fi fi
for ac_hdr in fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h regex.h libintl.h for ac_hdr in fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h regex.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
......
...@@ -11,7 +11,7 @@ AC_ISC_POSIX ...@@ -11,7 +11,7 @@ AC_ISC_POSIX
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h regex.h libintl.h) AC_CHECK_HEADERS(fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h regex.h)
dnl options dnl options
AC_ARG_ENABLE(tiny, AC_ARG_ENABLE(tiny,
......
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
#include "nano.h" #include "nano.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -36,9 +36,7 @@ ...@@ -36,9 +36,7 @@
#include "nano.h" #include "nano.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -25,9 +25,7 @@ ...@@ -25,9 +25,7 @@
#include "proto.h" #include "proto.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
#include "nano.h" #include "nano.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -43,9 +43,7 @@ ...@@ -43,9 +43,7 @@
#include "nano.h" #include "nano.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include "nano.h" #include "nano.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include "proto.h" #include "proto.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
#include "nano.h" #include "nano.h"
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif
#define _(string) gettext(string) #define _(string) gettext(string)
#else #else
#define _(string) (string) #define _(string) (string)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment