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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66299 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6bbba24..962ddb0 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 e48765b..1aa1e0d 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 ca36dd6..253e5b8 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 775f553..94eb02e 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