Fix (non-)detection of setlocale.

diff --git a/ChangeLog b/ChangeLog
index b1e6f11df045ec57ab266394c15da119d48e1171..2b9997fd2fd0f88c08d7ff9cb9b282ef7011da85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 20 17:44:40 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * configure.in, include/dpkg.h.in: Fix (non-)detection of setlocale.
+
 Fri Sep 19 20:02:19 CDT 2003 Adam Heath <doogie@debian.org>
 
   * debian/changelog: Set date/time for 1.10.15 release.

diff --git a/configure.in b/configure.in
index f729bccd2f1ae1d3ab48282725659dcd0226ae0e..66103500a9e860654927268c7cc5ba8fbc73d18d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -135,6 +135,18 @@ dnl gettext
 ALL_LINGUAS="ca cs da de en es fr gl it nl ja pl pt_BR ru sv"
 AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS
+if test "x$HAVE_LOCALE_H" = "x"; then
+ AC_MSG_CHECKING([whether setlocale() is available])
+ HAVE_SETLOCALE=''
+ AC_TRY_COMPILE([#include <locale.h>],[ setlocale(0, "bar");], HAVE_SETLOCALE=1;
+  AC_DEFINE(HAVE_SETLOCALE,1,[Define if setlocale is available.])
+ )
+ if test "x$HAVE_SETLOCALE" = x; then
+  AC_MSG_RESULT(no)
+ else
+  AC_MSG_RESULT(yes)
+ fi
+fi
 
 dnl Other stuff
 
@@ -422,9 +434,33 @@ void unsetenv(const char *x);
 #ifndef BUILDOLDPKGFORMAT
 #define BUILDOLDPKGFORMAT 0
 #endif
+
+/* Take care of NLS matters.  */
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+#if !HAVE_SETLOCALE
+# define setlocale(Category, Locale) /* empty */
+#endif
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+# define N_(Text) Text
+#else
+# undef bindtextdomain
+# define bindtextdomain(Domain, Directory) /* empty */
+# undef textdomain
+# define textdomain(Domain) /* empty */ 
+# define _(Text) Text
+# define N_(Text) Text
+# define gettext(Text) Text
+#endif
+
 ])
 
-AC_OUTPUT(
+AC_OUTPUT( po/Makefile.in
 Makefile.conf
 Makefile
 include/Makefile
@@ -446,5 +482,4 @@ scripts/Makefile
 main/Makefile
 dselect/Makefile
 methods/Makefile
-utils/Makefile
-po/Makefile.in)
+utils/Makefile)

diff --git a/debian/changelog b/debian/changelog
index 94c241349523007e15ef02807929462d606e2968..c97b72620247d2a22e04a30e7db4c189b1a4548b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dpkg (1.10.16) unstable; urgency=low
 
+  * Fix configure to set HAVE_SETLOCALE.  Closes: #211816
+
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 
 dpkg (1.10.15) unstable; urgency=low

diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index d424a65d5a932c25d076ee420bb617984dbe71be..67a5df4dfc8720672f49c5413a3d98bd38607c8f 100644 (file)
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -139,29 +139,6 @@
 
 #define TARBLKSZ       512
 
-/* Take care of NLS matters.  */
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-# define N_(Text) Text
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */
-# define _(Text) Text
-# define N_(Text) Text
-# define gettext(Text) Text
-#endif
-
 extern const char thisname[]; /* defined separately in each program */
 extern const char printforhelp[];