acinclude.m4: Add bit missing from previous patch.

2003-04-30  Phil Edwards  <pme@gcc.gnu.org>

	* acinclude.m4:  Add bit missing from previous patch.
	* aclocal.m4, configure:  Regenerated.

From-SVN: r66299

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6bbba24d6c6b865029247ff2817da0cfd2b25396..962ddb0b32ff825aded642c6a54cf48a28b96f2d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-30  Phil Edwards  <pme@gcc.gnu.org>
+
+       * acinclude.m4:  Add bit missing from previous patch.
+       * aclocal.m4, configure:  Regenerated.
+
 2003-04-29  Phil Edwards  <pme@gcc.gnu.org>
 
        * docs/doxygen/mainpage.html:  Bring up to date.

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index e48765b089987aaf40c408220255615e50ff959d..1aa1e0d37d20fb4f653b679ba36dac75cc857082 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1292,7 +1292,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
   if test $USE_NLS = yes; then
-    AC_SEARCH_LIBS(gettext, intl)
+    AC_SEARCH_LIBS(gettext, intl,, USE_NLS=no)
   fi
 
   AC_SUBST(USE_NLS)

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index ca36dd66b500b5365bf53949dacbbb3b47d4cd10..253e5b819331490f852e9bf106dcf40b70d8c296 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1304,7 +1304,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
   if test $USE_NLS = yes; then
-    AC_SEARCH_LIBS(gettext, intl)
+    AC_SEARCH_LIBS(gettext, intl,, USE_NLS=no)
   fi
 
   AC_SUBST(USE_NLS)

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 775f55335816226313f8916a64c2a2063cf58571..94eb02ecb0eaf424f7cd30815fe742523d4ce97f 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -3319,7 +3319,7 @@ if test "$ac_cv_search_gettext" != "no"; then
   test "$ac_cv_search_gettext" = "none required" || LIBS="$ac_cv_search_gettext $LIBS"
   
 else :
-  
+  USE_NLS=no
 fi
   fi