commit 55493c20524e46820ab340c467f34496151dcbff
parent 4aa302fe4a0966e3fd6fa913635146cdcd473b8a
Author: Chris Allegretta <chrisa@asty.org>
Date: Sun, 18 Mar 2001 18:55:06 +0000
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
Diffstat:
12 files changed, 2 insertions(+), 23 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)