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

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@568 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index a627d52f382b8ef7617683f153f1d13649b7ff14..169797a02ea1502c784b5bdfee1af6ff375eb3f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,6 @@ CVS code -
          the "new" C++ reserved word, even though there is likely no way
          nano will EVER be compilable with a C++ compiler. (suggested by
          Rocco Corsi).
-       - Added explicit check for libintl.h and only #include it if
-         found.
 - aclocal.m4
        - Minor patch for intl check (Christian Weisgerber)
 

diff --git a/config.h.in b/config.h.in
index be195c38526bf3f067228f7bd1c24f307004dde9..223f9e4ac14d7de4fa57ec65d4109a058246e446 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -163,9 +163,6 @@
 /* Define if you have the <getopt.h> header file.  */
 #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.  */
 #undef HAVE_LIMITS_H
 

diff --git a/configure b/configure
index ffa88cf87022c46efbed5f279eb683b39018e039..2d282b31669149ff90099957acbde2c82ce3e9b1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1237,7 +1237,7 @@ EOF
 
 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
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 7ce08498732e2e961c75ca9298f83c8e0cc1c4cd..cf840c01e7db4ed1520ddcec94b9edc9d6ab3166 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_ISC_POSIX
 
 dnl Checks for header files.
 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
 AC_ARG_ENABLE(tiny,

diff --git a/cut.c b/cut.c
index 98ea137ab7084d42fea5c26ffad876bf5c6e83d7..5e8cba7569e01ced4d6df49a475e2fbdfed9b0ec 100644 (file)
--- a/cut.c
+++ b/cut.c
@@ -27,9 +27,7 @@
 #include "nano.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/files.c b/files.c
index 4746fe6f493189c2f4fdd2b42a75143b54b0ec83..ebc9b554862db4356acbf1f4b5a316bf7df9f39e 100644 (file)
--- a/files.c
+++ b/files.c
@@ -36,9 +36,7 @@
 #include "nano.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/global.c b/global.c
index 32628fad52643e768715f21ddd528dd10850341e..77af9281d62765b68c33753d88908d4b567e813e 100644 (file)
--- a/global.c
+++ b/global.c
@@ -25,9 +25,7 @@
 #include "proto.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/move.c b/move.c
index 065de62373c5817735330e1d73c18030c29893d3..bda2c3c84573dd37755a30bdf83a89f16bb6d656 100644 (file)
--- a/move.c
+++ b/move.c
@@ -27,9 +27,7 @@
 #include "nano.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/nano.c b/nano.c
index d68f283b43c28580ed4d0ebe0e182d4c1929e662..1c475a072a5eb6248673614fbbd928adcd29bdca 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -43,9 +43,7 @@
 #include "nano.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/search.c b/search.c
index 9833b94bd861461c717f8918b0c6f40c5cecf578..97f1ece763d3770f8fb22a7325b6428d638573d2 100644 (file)
--- a/search.c
+++ b/search.c
@@ -29,9 +29,7 @@
 #include "nano.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/utils.c b/utils.c
index fb1d5fd8d08515a1bc3ea71ea0dd5cae38043c7f..a13964198fa8c9a9eb4ea8dfaba8b655a9e09d43 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -29,9 +29,7 @@
 #include "proto.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)

diff --git a/winio.c b/winio.c
index 4c97daf110a045678982f75a10b8a606a788470d..f64ee17b61f3ea53c91cbe0402d4114a08c9b743 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -28,9 +28,7 @@
 #include "nano.h"
 
 #ifndef NANO_SMALL
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 #define _(string) gettext(string)
 #else
 #define _(string) (string)