summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libstdc++-v3/acinclude.m44
-rw-r--r--libstdc++-v3/aclocal.m44
-rwxr-xr-xlibstdc++-v3/configure74
3 files changed, 47 insertions, 35 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index f248858dd44..5aa93b40714 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -312,6 +312,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
fi
dnl Test for <ctype> functionality -- FreeBSD 4.0
+ if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for freebsd 4.0 ])
AC_TRY_COMPILE([#include <ctype.h>],
[int
@@ -324,8 +325,10 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_include_dir="config/bsd"
ctype_default=no
fi
+ fi
dnl Test for <ctype> functionality -- FreeBSD 3.4
+ if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for freebsd 3.4 ])
AC_TRY_COMPILE([#include <ctype.h>],
[int
@@ -338,6 +341,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_include_dir="config/bsd"
ctype_default=no
fi
+ fi
dnl Test for <ctype> functionality -- solaris 2.6 and 2.7
if test $ctype_default = "yes"; then
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 83a52928e14..d53b21de18a 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -324,6 +324,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
fi
dnl Test for <ctype> functionality -- FreeBSD 4.0
+ if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for freebsd 4.0 ])
AC_TRY_COMPILE([#include <ctype.h>],
[int
@@ -336,8 +337,10 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_include_dir="config/bsd"
ctype_default=no
fi
+ fi
dnl Test for <ctype> functionality -- FreeBSD 3.4
+ if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for freebsd 3.4 ])
AC_TRY_COMPILE([#include <ctype.h>],
[int
@@ -350,6 +353,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_include_dir="config/bsd"
ctype_default=no
fi
+ fi
dnl Test for <ctype> functionality -- solaris 2.6 and 2.7
if test $ctype_default = "yes"; then
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 4b79496a366..bc8b4e6236e 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -3521,10 +3521,11 @@ rm -f conftest*
ctype_default=no
fi
- echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6
-echo "configure:3526: checking <ctype> for freebsd 4.0 " >&5
+ if test $ctype_default = "yes"; then
+ echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6
+echo "configure:3527: checking <ctype> for freebsd 4.0 " >&5
cat > conftest.$ac_ext <<EOF
-#line 3528 "configure"
+#line 3529 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3534,7 +3535,7 @@ int
+ _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;}
; return 0; }
EOF
-if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_bsd=yes
@@ -3550,11 +3551,13 @@ rm -f conftest*
ctype_include_dir="config/bsd"
ctype_default=no
fi
+ fi
- echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6
-echo "configure:3556: checking <ctype> for freebsd 3.4 " >&5
+ if test $ctype_default = "yes"; then
+ echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6
+echo "configure:3559: checking <ctype> for freebsd 3.4 " >&5
cat > conftest.$ac_ext <<EOF
-#line 3558 "configure"
+#line 3561 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3564,7 +3567,7 @@ int
+ _D + _P + _X + _G + __istype (a, 0);}
; return 0; }
EOF
-if { (eval echo configure:3568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_freebsd34=yes
@@ -3580,12 +3583,13 @@ rm -f conftest*
ctype_include_dir="config/bsd"
ctype_default=no
fi
+ fi
if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6
-echo "configure:3587: checking <ctype> for solaris 2.6,7,8 " >&5
+echo "configure:3591: checking <ctype> for solaris 2.6,7,8 " >&5
cat > conftest.$ac_ext <<EOF
-#line 3589 "configure"
+#line 3593 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3596,7 +3600,7 @@ int
+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
; return 0; }
EOF
-if { (eval echo configure:3600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_solaris=yes
@@ -3611,7 +3615,7 @@ rm -f conftest*
if test $ctype_solaris = "yes"; then
echo $ac_n "checking for version""... $ac_c" 1>&6
-echo "configure:3615: checking for version" >&5
+echo "configure:3619: checking for version" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -3620,14 +3624,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3628 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
typedef long* __to_type; __to_type const& _M_toupper = __trans_upper;
; return 0; }
EOF
-if { (eval echo configure:3631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_solaris26=yes
@@ -3659,9 +3663,9 @@ cross_compiling=$ac_cv_prog_cc_cross
if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6
-echo "configure:3663: checking <ctype> for solaris 2.5.1 " >&5
+echo "configure:3667: checking <ctype> for solaris 2.5.1 " >&5
cat > conftest.$ac_ext <<EOF
-#line 3665 "configure"
+#line 3669 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3671,7 +3675,7 @@ int
+ __ctype[a];}
; return 0; }
EOF
-if { (eval echo configure:3675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_solaris25=yes
@@ -3691,9 +3695,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6
-echo "configure:3695: checking <ctype> for aix " >&5
+echo "configure:3699: checking <ctype> for aix " >&5
cat > conftest.$ac_ext <<EOF
-#line 3697 "configure"
+#line 3701 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3704,7 +3708,7 @@ int
+ _VALC('a') + _IS('c', 0);}
; return 0; }
EOF
-if { (eval echo configure:3708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_aix=yes
@@ -3724,9 +3728,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6
-echo "configure:3728: checking <ctype> for newlib " >&5
+echo "configure:3732: checking <ctype> for newlib " >&5
cat > conftest.$ac_ext <<EOF
-#line 3730 "configure"
+#line 3734 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3736,7 +3740,7 @@ int
+ _ctype_[a];}
; return 0; }
EOF
-if { (eval echo configure:3740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_newlib=yes
@@ -3770,17 +3774,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3774: checking for $ac_hdr" >&5
+echo "configure:3778: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3779 "configure"
+#line 3783 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3809,12 +3813,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3813: checking for $ac_func" >&5
+echo "configure:3817: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3818 "configure"
+#line 3822 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3837,7 +3841,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3862,7 +3866,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3866: checking for working mmap" >&5
+echo "configure:3870: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3870,7 +3874,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 3874 "configure"
+#line 3878 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4010,7 +4014,7 @@ main()
}
EOF
-if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -4073,19 +4077,19 @@ fi
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4077: checking for LC_MESSAGES" >&5
+echo "configure:4081: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4082 "configure"
+#line 4086 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_val_LC_MESSAGES=yes
else
View Lorry Controller Status