Check for bind_textdomain_codeset() outside libc, too.

diff --git a/ChangeLog b/ChangeLog
index baf3b40c3bd44f308a4d202b810d500acb6343d0..705b3e00fa874dc0e18671597dd8116e4149b2b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-15 11:53 +0100  peb  <peb@mppmu.mpg.de>  (22c68faeec08)
+
+       * lib.h: Don't use bind_textdomain_codeset() if we're not using
+       NLS/gettext. Closes #2162.
+
+2007-11-15 11:22 +0100  Rocco Rutte  <pdmef@gmx.net>  (933e57dff004)
+
+       * ChangeLog, doc/manual.xml.head: Properly document simple searches
+       and its "secret" keywords. Closes #2136.
+
 2007-11-13 13:31 +0100  Rocco Rutte  <pdmef@gmx.net>  (7a4a154eefa5)
 
        * wcwidth.c: Fix compiler warnings in new wcwidth.c (too large values

diff --git a/configure.ac b/configure.ac
index 34961b8a45bda632da31ce058a9cb776c9e04737..2e11b0a6755104c4f563c2dfaffac12eb5c88199 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1063,7 +1063,10 @@ if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then
   AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET,1,
           [ Define if your gettext has bind_textdomain_codeset. ])
 else
+  mutt_save_LIBS="$LIBS"
+  LIBS="$LIBS $INTLLIBS"
   AC_CHECK_FUNCS(bind_textdomain_codeset)
+  LIBS="$mutt_save_LIBS"
 fi
 
 fi # libiconv