Allow compilation with --disable-nls on systems without libintl.h

This is being triggered when a non glibc claims to be glibc.
Closes: #465420

diff --git a/ChangeLog b/ChangeLog
index 3e181d72dad252dbc022428c7ec116a071617d61..66103e2833e45ad46f8183475eb8adeda238daa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-16  Guillem Jover  <guillem@debian.org>
+
+       * configure.ac (AC_CHECK_HEADERS): Add 'libintl.h'.
+       * lib/gettext.h [!ENABLE_NLS]: Use HAVE_LIBINTL_H instead of
+       '(__GLIBC__ >= 2)'.
+
 2008-03-15  Erast Benson  <erast@gnusolaris.org>
 
        * utils/start-stop-daemon.c (check): Move 'return' inside preprocessor

diff --git a/configure.ac b/configure.ac
index 5bd0ea330e4e9d197996567119f4cd6b8eab9e39..1f3972c10034a7f8145bdcfabbad24a1227db558 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ fi
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h error.h locale.h sys/cdefs.h kvm.h])
+AC_CHECK_HEADERS([stddef.h error.h locale.h libintl.h sys/cdefs.h kvm.h])
 DPKG_CHECK_DEFINE(TIOCNOTTY, [sys/ioctl.h])
 
 # Checks for typedefs, structures, and compiler characteristics.

diff --git a/debian/changelog b/debian/changelog
index 4a3e9b3e0240c0eb1f25b98d68e35e12e96284cb..442d2a89e52c88f74a1b24da4ba12ef791f07b5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dpkg (1.14.17) UNRELEASED; urgency=low
     Thanks to Ian Jackson.
   * Fix erroneous description of Breaks in dselect output.
     Thanks to Ian Jackson.
+  * Allow compilation with --disable-nls on systems without libintl.h where
+    a non glibc claims to be glibc. Closes: #465420
 
   [ Raphael Hertzog ]
   * Add a warning displayed by dpkg-genchanges if the current version is

diff --git a/lib/gettext.h b/lib/gettext.h
index 8874d9baa2fa6790101db9b13ef0fb90693ab27b..3e80f7fb0bba68309f8a69aeca06549687774860 100644 (file)
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -54,7 +54,7 @@
    it now, to make later inclusions of <libintl.h> a NOP.  */
 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
 # include <cstdlib>
-# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+# if HAVE_LIBINTL_H || _GLIBCXX_HAVE_LIBINTL_H
 #  include <libintl.h>
 # endif
 #endif