diff options
| author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-04-30 18:04:23 +0000 |
|---|---|---|
| committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-04-30 18:04:23 +0000 |
| commit | 894fa295cf6b3b5fd1cafc06ba683ebae2fb7e66 (patch) | |
| tree | 6c986d63937353df2eab6ea838f8d0a9daaf7133 | |
| parent | 72c1da2f21d852b946699b7c9e3458a5e8a97fa9 (diff) | |
| download | ppe42-gcc-894fa295cf6b3b5fd1cafc06ba683ebae2fb7e66.tar.gz ppe42-gcc-894fa295cf6b3b5fd1cafc06ba683ebae2fb7e66.zip | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 2 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6bbba24d6c6..962ddb0b32f 100644 --- 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 e48765b0899..1aa1e0d37d2 100644 --- 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 ca36dd66b50..253e5b81933 100644 --- 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 775f5533581..94eb02ecb0e 100755 --- 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 |
