diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-06-28 22:58:32 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-06-28 22:58:32 +0000 |
| commit | 1ba741304a84766aa86fdcc7008f65dcec1b2674 (patch) | |
| tree | 774662485dae67e6b26c8b8d537807b71bb5c217 /libstdc++-v3/acinclude.m4 | |
| parent | e301e2c4c2b84349039d806fc1649570d8575e42 (diff) | |
| download | gcc-1ba741304a84766aa86fdcc7008f65dcec1b2674.zip gcc-1ba741304a84766aa86fdcc7008f65dcec1b2674.tar.gz gcc-1ba741304a84766aa86fdcc7008f65dcec1b2674.tar.bz2 | |
re PR libstdc++/32509 (unable to explicitely configure with a given locale model)
2007-06-28 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/32509
* acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Carry out the checks
involving the de_DE locale only if an auto locale config is
used for a target suitable for the gnu locale model.
* docs/html/install.html: Update.
* configure: Regenerated.
From-SVN: r126096
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 07d5239..4b3aaa5 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1341,21 +1341,22 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ #endif ], enable_clocale_flag=gnu, enable_clocale_flag=generic) - # Test for bugs early in glibc-2.2.x series - AC_TRY_RUN([ - #define _GNU_SOURCE 1 - #include <locale.h> - #include <string.h> - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - extern __typeof(newlocale) __newlocale; - extern __typeof(duplocale) __duplocale; - extern __typeof(strcoll_l) __strcoll_l; - #endif - int main() - { - const char __one[] = "Äuglein Augmen"; + if test $enable_clocale = auto; then + # Test for bugs early in glibc-2.2.x series + AC_TRY_RUN([ + #define _GNU_SOURCE 1 + #include <locale.h> + #include <string.h> + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) + extern __typeof(newlocale) __newlocale; + extern __typeof(duplocale) __duplocale; + extern __typeof(strcoll_l) __strcoll_l; + #endif + int main() + { + const char __one[] = "Äuglein Augmen"; const char __two[] = "Äuglein"; - int i; + int i; int j; __locale_t loc; __locale_t loc_dup; @@ -1364,10 +1365,11 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ i = __strcoll_l(__one, __two, loc); j = __strcoll_l(__one, __two, loc_dup); return 0; - } - ], - [enable_clocale_flag=gnu],[enable_clocale_flag=generic], - [enable_clocale_flag=generic]) + } + ], + [enable_clocale_flag=gnu],[enable_clocale_flag=generic], + [enable_clocale_flag=generic]) + fi # Set it to scream when it hurts. ac_save_CFLAGS="$CFLAGS" |