The following commit has been merged in the master branch:
commit 8f8e9d9af75672ae051c2d3c11dd797b666b87b8
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sun Mar 16 07:08:24 2008 +0200
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 3e181d7..66103e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-16 Guillem Jover <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* utils/start-stop-daemon.c (check): Move 'return' inside preprocessor
diff --git a/configure.ac b/configure.ac
index 5bd0ea3..1f3972c 100644
--- 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 4a3e9b3..442d2a8 100644
--- 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 8874d9b..3e80f7f 100644
--- 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
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
