This is the mail archive of the
libstdc++@sourceware.cygnus.com
mailing list for the libstdc++ project.
--enable's patch
- To: libstdc++ at sourceware dot cygnus dot com
- Subject: --enable's patch
- From: Phil Edwards <pedwards at jaj dot com>
- Date: Mon, 20 Dec 1999 18:37:43 -0500
First, much thanks to Mumit Khan for helping to track down a libtool
problem.
This patch adds --enable-debug and --enable-namespaces to configure:
--enable-debug sets '-ggdb -O0'.
--disable-debug sets '-g' and whatever optimization options the
compiler can handle.
+ I assumed that people would be using gdb to do their debugging,
given the slight GNU-ish bent to the whole project...
+ Perhaps --enable-maintainer-mode should automatically turn this on?
+ Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...?
--enable-namespaces sets '-fhonor-std' and defines _GLIBCPP_USE_NAMESPACES
--disable-namespaces sets '-fno-honor-std'
+ Eventually, this will go away.
The biggest effect is on CXXFLAGS in src/Makefile*, but
--enable-namepsaces will also #define _GLIBCPP_USE_NAMESPACES (commented
out all this time, but occasionally used). This has been tested with
gcc 2.95.2 and the 19991214 snapshot of 2.96. The resulting CXXFLAGS are:
-no == -fno-honor-std
-yes == -fhonor-std
| | enable | enable |
| nothing | debug | namespaces | both
--------------------------------------------------
| | -ggdb | | -ggdb
2.95 | -g -no | -O0 -no | -g -yes | -O0 -yes
| | | |
--------------------------------------------------
| -O2 -g | | -O2 -g |
2.96 | -no | ugly -no | -yes | ugly -yes
| | | |
where "ugly" is "-O2 -ggdb -O0". These flags were something of a
guess on my part; if the Hivemind (that'd be you guys) prefers other
combinations, hey.
Patch follows. Check in? Discussion? Pizza party?
1999-12-20 Phil Edwards <pedwards@jaj.com>
* bits/c++config.h.in: Uncomment _GLIBCPP_USE_NAMESPACES and move...
* acconfig.h: ...to here.
* config.h.in: Regenerate from aclocal.
* acinclude.m4: Add GLIBCPP_ENABLE_DEBUG, GLIBCPP_ENABLE_NAMESPACES.
* aclocal.m4: Regenerate from acinclude.
* configure.in: Use ENABLE macros here.
* configure: Regenerate.
* src/Makefile.am: Use results from ENABLE macros.
* src/Makefile.in: Regenerate.
Index: acconfig.h
===================================================================
RCS file: /cvs/libstdc++/libstdc++/acconfig.h,v
retrieving revision 1.11
diff -u -3 -r1.11 acconfig.h
--- acconfig.h 1999/12/20 08:37:25 1.11
+++ acconfig.h 1999/12/20 22:48:19
@@ -10,6 +10,13 @@
// Define if LC_MESSAGES is available in <locale.h>.
#undef HAVE_LC_MESSAGES
+// If using the namespace std, you need this. Eventually this should
+// not be an option. In the meantime, and as things like std_ctype.h
+// need to be hacked out, give people the option. If this is set to 1,
+// CXXFLAGS should include -fhonor-std. If this is undefined, CXXFLAGS
+// should include -fno-honor-std.
+#undef _GLIBCPP_USE_NAMESPACES
+
// Define if the host has a type mbstate_t defined in
// wchar.h, as required by 21.1.3.1. Some systems, namely
// hppa-hp-hpux10.20 do not meet this requirement, and must be worked
Index: acinclude.m4
===================================================================
RCS file: /cvs/libstdc++/libstdc++/acinclude.m4,v
retrieving revision 1.2
diff -u -3 -r1.2 acinclude.m4
--- acinclude.m4 1999/11/29 18:32:59 1.2
+++ acinclude.m4 1999/12/20 22:48:19
@@ -42,3 +42,78 @@
fi
])
+
+dnl
+dnl Check for certain special build configurations.
+dnl
+dnl GLIBCPP_ENABLE_DEBUG
+dnl --enable-debug sets '-ggdb -O0'.
+dnl --disable-debug sets '-g' and whatever optimization options the
+dnl compiler can handle.
+dnl + Perhaps --enable-maintainer-mode should automatically turn this on?
+dnl + Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...?
+dnl + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
+dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
+dnl defaults to `no'.
+dnl
+dnl GLIBCPP_ENABLE_NAMESPACES
+dnl --enable-namespaces sets '-fhonor-std' and defines _GLIBCPP_USE_NAMESPACES
+dnl --disable-namespaces sets '-fno-honor-std' (the macro should be
+dnl undefined by default in whatever.h.in).
+dnl + Eventually, this will go away.
+dnl + Usage: GLIBCPP_ENABLE_NAMESPACES[(DEFAULT)]
+dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
+dnl defaults to `no'.
+dnl
+dnl Based on the AC_ENABLE macros found in aclocal.m4, but how they
+dnl got there isn't documented.
+dnl
+
+dnl GLIBCPP_ENABLE_DEBUG
+AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
+define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_ARG_ENABLE(debug,
+changequote(<<, >>)dnl
+<< --enable-debug extra debugging, turn off optimization [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
+changequote([, ])dnl
+[case "$enableval" in
+ yes) enable_debug=yes ;;
+ no) enable_debug=no ;;
+ *) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
+ esac],
+enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
+dnl Option parsed, now set things appropriately
+case "$enable_debug" in
+ yes) DEBUGFLAGS='-ggdb -O0'
+ ;;
+ no) DEBUGFLAGS='-g'
+ ;;
+esac
+AC_SUBST(DEBUGFLAGS)
+])
+
+
+dnl GLIBCPP_ENABLE_NAMESPACES
+AC_DEFUN(GLIBCPP_ENABLE_NAMESPACES, [dnl
+define([GLIBCPP_ENABLE_NAMESPACES_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_ARG_ENABLE(namespaces,
+changequote(<<, >>)dnl
+<< --enable-namespaces turns on 'std' [default=>>GLIBCPP_ENABLE_NAMESPACES_DEFAULT],
+changequote([, ])dnl
+[case "$enableval" in
+ yes) enable_namespaces=yes ;;
+ no) enable_namespaces=no ;;
+ *) AC_MSG_ERROR([Unknown argument to enable/disable namespaces]) ;;
+ esac],
+enable_namespaces=GLIBCPP_ENABLE_NAMESPACES_DEFAULT)dnl
+dnl Option parsed, now set things appropriately
+case "$enable_namespaces" in
+ yes) NAMESPACES='-fhonor-std'
+ AC_DEFINE(_GLIBCPP_USE_NAMESPACES)
+ ;;
+ no) NAMESPACES='-fno-honor-std'
+ ;;
+esac
+AC_SUBST(NAMESPACES)
+])
+
Index: aclocal.m4
===================================================================
RCS file: /cvs/libstdc++/libstdc++/aclocal.m4,v
retrieving revision 1.8
diff -u -3 -r1.8 aclocal.m4
--- aclocal.m4 1999/11/29 18:32:59 1.8
+++ aclocal.m4 1999/12/20 22:48:19
@@ -55,6 +55,81 @@
])
+dnl
+dnl Check for certain special build configurations.
+dnl
+dnl GLIBCPP_ENABLE_DEBUG
+dnl --enable-debug sets '-ggdb -O0'.
+dnl --disable-debug sets '-g' and whatever optimization options the
+dnl compiler can handle.
+dnl + Perhaps --enable-maintainer-mode should automatically turn this on?
+dnl + Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...?
+dnl + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
+dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
+dnl defaults to `no'.
+dnl
+dnl GLIBCPP_ENABLE_NAMESPACES
+dnl --enable-namespaces sets '-fhonor-std' and defines _GLIBCPP_USE_NAMESPACES
+dnl --disable-namespaces sets '-fno-honor-std' (the macro should be
+dnl undefined by default in whatever.h.in).
+dnl + Eventually, this will go away.
+dnl + Usage: GLIBCPP_ENABLE_NAMESPACES[(DEFAULT)]
+dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
+dnl defaults to `no'.
+dnl
+dnl Based on the AC_ENABLE macros found in aclocal.m4, but how they
+dnl got there isn't documented.
+dnl
+
+dnl GLIBCPP_ENABLE_DEBUG
+AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
+define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_ARG_ENABLE(debug,
+changequote(<<, >>)dnl
+<< --enable-debug extra debugging, turn off optimization [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
+changequote([, ])dnl
+[case "$enableval" in
+ yes) enable_debug=yes ;;
+ no) enable_debug=no ;;
+ *) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
+ esac],
+enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
+dnl Option parsed, now set things appropriately
+case "$enable_debug" in
+ yes) DEBUGFLAGS='-ggdb -O0'
+ ;;
+ no) DEBUGFLAGS='-g'
+ ;;
+esac
+AC_SUBST(DEBUGFLAGS)
+])
+
+
+dnl GLIBCPP_ENABLE_NAMESPACES
+AC_DEFUN(GLIBCPP_ENABLE_NAMESPACES, [dnl
+define([GLIBCPP_ENABLE_NAMESPACES_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_ARG_ENABLE(namespaces,
+changequote(<<, >>)dnl
+<< --enable-namespaces turns on 'std' [default=>>GLIBCPP_ENABLE_NAMESPACES_DEFAULT],
+changequote([, ])dnl
+[case "$enableval" in
+ yes) enable_namespaces=yes ;;
+ no) enable_namespaces=no ;;
+ *) AC_MSG_ERROR([Unknown argument to enable/disable namespaces]) ;;
+ esac],
+enable_namespaces=GLIBCPP_ENABLE_NAMESPACES_DEFAULT)dnl
+dnl Option parsed, now set things appropriately
+case "$enable_namespaces" in
+ yes) NAMESPACES='-fhonor-std'
+ AC_DEFINE(_GLIBCPP_USE_NAMESPACES)
+ ;;
+ no) NAMESPACES='-fno-honor-std'
+ ;;
+esac
+AC_SUBST(NAMESPACES)
+])
+
+
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
Index: config.h.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/config.h.in,v
retrieving revision 1.20
diff -u -3 -r1.20 config.h.in
--- config.h.in 1999/11/29 18:32:59 1.20
+++ config.h.in 1999/12/20 22:48:19
@@ -7,6 +7,13 @@
// Define if LC_MESSAGES is available in <locale.h>.
#undef HAVE_LC_MESSAGES
+// If using the namespace std, you need this. Eventually this should
+// not be an option. In the meantime, and as things like std_ctype.h
+// need to be hacked out, give people the option. If this is set to 1,
+// CXXFLAGS should include -fhonor-std. If this is undefined, CXXFLAGS
+// should include -fno-honor-std.
+#undef _GLIBCPP_USE_NAMESPACES
+
// Define if the host has a type mbstate_t defined in
// wchar.h, as required by 21.1.3.1. Some systems, namely
// hppa-hp-hpux10.20 do not meet this requirement, and must be worked
Index: configure
===================================================================
RCS file: /cvs/libstdc++/libstdc++/configure,v
retrieving revision 1.38
diff -u -3 -r1.38 configure
--- configure 1999/12/20 08:37:25 1.38
+++ configure 1999/12/20 22:48:20
@@ -24,6 +24,10 @@
ac_help="$ac_help
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer"
+ac_help="$ac_help
+ --enable-debug extra debugging, turn off optimization [default=no]"
+ac_help="$ac_help
+ --enable-namespaces turns on 'std' [default=no]"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -565,7 +569,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:569: checking for a BSD compatible install" >&5
+echo "configure:573: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -618,7 +622,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:622: checking whether build environment is sane" >&5
+echo "configure:626: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -675,7 +679,7 @@
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:679: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:683: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -721,7 +725,7 @@
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:725: checking for working aclocal" >&5
+echo "configure:729: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -734,7 +738,7 @@
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:738: checking for working autoconf" >&5
+echo "configure:742: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -747,7 +751,7 @@
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:751: checking for working automake" >&5
+echo "configure:755: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -760,7 +764,7 @@
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:764: checking for working autoheader" >&5
+echo "configure:768: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -773,7 +777,7 @@
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:777: checking for working makeinfo" >&5
+echo "configure:781: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -867,7 +871,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:871: checking host system type" >&5
+echo "configure:875: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -888,7 +892,7 @@
echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:892: checking build system type" >&5
+echo "configure:896: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -908,7 +912,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:912: checking for $ac_word" >&5
+echo "configure:916: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -938,7 +942,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:942: checking for $ac_word" >&5
+echo "configure:946: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -968,7 +972,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:972: checking for $ac_word" >&5
+echo "configure:976: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1019,7 +1023,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1023: checking for $ac_word" >&5
+echo "configure:1027: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1051,7 +1055,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1055: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1059: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1062,12 +1066,12 @@
cat > conftest.$ac_ext << EOF
-#line 1066 "configure"
+#line 1070 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1093,12 +1097,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1097: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1101: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1102: checking whether we are using GNU C" >&5
+echo "configure:1106: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1107,7 +1111,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1126,7 +1130,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1130: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1134: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1169,7 +1173,7 @@
if test "$ac_cv_prog_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1173: checking for ld used by GCC" >&5
+echo "configure:1177: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -1193,10 +1197,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1197: checking for GNU ld" >&5
+echo "configure:1201: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1200: checking for non-GNU ld" >&5
+echo "configure:1204: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1232,7 +1236,7 @@
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1236: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1240: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1248,7 +1252,7 @@
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1252: checking for BSD-compatible nm" >&5
+echo "configure:1256: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1285,7 +1289,7 @@
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1289: checking whether ln -s works" >&5
+echo "configure:1293: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1329,8 +1333,8 @@
case "$host" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 1333 "configure"' > conftest.$ac_ext
- if { (eval echo configure:1334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 1337 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:1338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"
@@ -1351,19 +1355,19 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1355: checking whether the C compiler needs -belf" >&5
+echo "configure:1359: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1364 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -1467,7 +1471,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1471: checking for $ac_word" >&5
+echo "configure:1475: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1497,7 +1501,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1501: checking for $ac_word" >&5
+echo "configure:1505: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1548,7 +1552,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1552: checking for $ac_word" >&5
+echo "configure:1556: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1580,7 +1584,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1584: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1591,12 +1595,12 @@
cat > conftest.$ac_ext << EOF
-#line 1595 "configure"
+#line 1599 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1622,12 +1626,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1626: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1630: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1631: checking whether we are using GNU C" >&5
+echo "configure:1635: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1636,7 +1640,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1655,7 +1659,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1659: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1663: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1691,7 +1695,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1695: checking for $ac_word" >&5
+echo "configure:1699: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1723,7 +1727,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1727: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1731: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1734,12 +1738,12 @@
cat > conftest.$ac_ext << EOF
-#line 1738 "configure"
+#line 1742 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1765,12 +1769,12 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1769: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1773: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1774: checking whether we are using GNU C++" >&5
+echo "configure:1778: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1779,7 +1783,7 @@
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1798,7 +1802,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1802: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1806: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1830,7 +1834,7 @@
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1834: checking whether ln -s works" >&5
+echo "configure:1838: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1853,7 +1857,7 @@
# How optimal can we be?
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1857: checking how to run the C preprocessor" >&5
+echo "configure:1861: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1868,13 +1872,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1872 "configure"
+#line 1876 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1882: \"$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
:
@@ -1885,13 +1889,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1889 "configure"
+#line 1893 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1899: \"$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
:
@@ -1902,13 +1906,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1906 "configure"
+#line 1910 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1916: \"$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
:
@@ -1933,7 +1937,7 @@
echo "$ac_t""$CPP" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1937 "configure"
+#line 1941 "configure"
#include "confdefs.h"
#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
@@ -1955,7 +1959,7 @@
# More options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1959: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1963: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -1978,12 +1982,12 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1982: checking for Cygwin environment" >&5
+echo "configure:1986: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1987 "configure"
+#line 1991 "configure"
#include "confdefs.h"
int main() {
@@ -1994,7 +1998,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:1998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -2011,19 +2015,19 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2015: checking for mingw32 environment" >&5
+echo "configure:2019: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2020 "configure"
+#line 2024 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:2027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -2042,7 +2046,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2046: checking for executable suffix" >&5
+echo "configure:2050: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2052,7 +2056,7 @@
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:2060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -2072,12 +2076,54 @@
echo "$ac_t""${ac_cv_exeext}" 1>&6
ac_exeext=$EXEEXT
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+ case "$enableval" in
+ yes) enable_debug=yes ;;
+ no) enable_debug=no ;;
+ *) { echo "configure: error: Unknown argument to enable/disable extra debugging" 1>&2; exit 1; } ;;
+ esac
+else
+ enable_debug=no
+fi
+case "$enable_debug" in
+ yes) DEBUGFLAGS='-ggdb -O0'
+ ;;
+ no) DEBUGFLAGS='-g'
+ ;;
+esac
+
+
+# Check whether --enable-namespaces or --disable-namespaces was given.
+if test "${enable_namespaces+set}" = set; then
+ enableval="$enable_namespaces"
+ case "$enableval" in
+ yes) enable_namespaces=yes ;;
+ no) enable_namespaces=no ;;
+ *) { echo "configure: error: Unknown argument to enable/disable namespaces" 1>&2; exit 1; } ;;
+ esac
+else
+ enable_namespaces=no
+fi
+case "$enable_namespaces" in
+ yes) NAMESPACES='-fhonor-std'
+ cat >> confdefs.h <<\EOF
+#define _GLIBCPP_USE_NAMESPACES 1
+EOF
+
+ ;;
+ no) NAMESPACES='-fno-honor-std'
+ ;;
+esac
+
+
#
# Math-related tests.
#
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:2081: checking for sin in -lm" >&5
+echo "configure:2127: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2085,7 +2131,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2089 "configure"
+#line 2135 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2096,7 +2142,7 @@
sin()
; return 0; }
EOF
-if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2126,12 +2172,12 @@
carg cargf nan hypot hypotf atan2f expf copysignf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_func" >&5
+echo "configure:2176: 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 2135 "configure"
+#line 2181 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2154,7 +2200,7 @@
; return 0; }
EOF
-if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2204: \"$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
@@ -2185,12 +2231,12 @@
# the non-complex functions.
USE_LONG_DOUBLE=no
echo $ac_n "checking for sinl""... $ac_c" 1>&6
-echo "configure:2189: checking for sinl" >&5
+echo "configure:2235: checking for sinl" >&5
if eval "test \"`echo '$''{'ac_cv_func_sinl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2194 "configure"
+#line 2240 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sinl(); below. */
@@ -2213,7 +2259,7 @@
; return 0; }
EOF
-if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sinl=yes"
else
@@ -2232,12 +2278,12 @@
csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2236: checking for $ac_func" >&5
+echo "configure:2282: 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 2241 "configure"
+#line 2287 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2260,7 +2306,7 @@
; return 0; }
EOF
-if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2310: \"$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
@@ -2298,12 +2344,12 @@
strtof strtold fabsf sincos sincosf sincosl finite qfinite fpclass qfpclass
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2302: checking for $ac_func" >&5
+echo "configure:2348: 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 2307 "configure"
+#line 2353 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2326,7 +2372,7 @@
; return 0; }
EOF
-if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2376: \"$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
@@ -2360,12 +2406,12 @@
_strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _qfinite _fpclass _qfpclass
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2364: checking for $ac_func" >&5
+echo "configure:2410: 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 2369 "configure"
+#line 2415 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2388,7 +2434,7 @@
; return 0; }
EOF
-if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2438: \"$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
@@ -2415,14 +2461,14 @@
# Test for builtin math functions.
cat > conftest.$ac_ext <<EOF
-#line 2419 "configure"
+#line 2465 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_sinf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_sinf=yes
else
@@ -2440,14 +2486,14 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 2444 "configure"
+#line 2490 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_cosf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_cosf=yes
else
@@ -2465,14 +2511,14 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 2469 "configure"
+#line 2515 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_fabsf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_fabsf=yes
else
@@ -2490,14 +2536,14 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 2494 "configure"
+#line 2540 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_sqrtf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_sqrtf=yes
else
@@ -2518,17 +2564,17 @@
ac_safe=`echo "complex.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for complex.h""... $ac_c" 1>&6
-echo "configure:2522: checking for complex.h" >&5
+echo "configure:2568: checking for complex.h" >&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 2527 "configure"
+#line 2573 "configure"
#include "confdefs.h"
#include <complex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2578: \"$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*
@@ -2556,17 +2602,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2560: checking for $ac_hdr" >&5
+echo "configure:2606: 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 2565 "configure"
+#line 2611 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2616: \"$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*
@@ -2601,14 +2647,14 @@
&& test "$ac_cv_header_sys_machine_h" = no
then
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2605: checking whether byte ordering is bigendian" >&5
+echo "configure:2651: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 2612 "configure"
+#line 2658 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2619,11 +2665,11 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 2627 "configure"
+#line 2673 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2634,7 +2680,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -2654,7 +2700,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2658 "configure"
+#line 2704 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -2667,7 +2713,7 @@
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -2696,12 +2742,12 @@
for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2700: checking for $ac_func" >&5
+echo "configure:2746: 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 2705 "configure"
+#line 2751 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2724,7 +2770,7 @@
; return 0; }
EOF
-if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2774: \"$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
@@ -2753,17 +2799,17 @@
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:2757: checking for wchar.h" >&5
+echo "configure:2803: checking for wchar.h" >&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 2762 "configure"
+#line 2808 "configure"
#include "confdefs.h"
#include <wchar.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2813: \"$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*
@@ -2782,14 +2828,14 @@
# Test wchar.h for mbstate_t, which is needed for char_traits and others.
cat > conftest.$ac_ext <<EOF
-#line 2786 "configure"
+#line 2832 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
mbstate_t teststate;
; return 0; }
EOF
-if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_native_mbstatet=yes
else
@@ -2810,14 +2856,14 @@
# Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
# numeric_limits can instantiate type_traits<wchar_t>
cat > conftest.$ac_ext <<EOF
-#line 2814 "configure"
+#line 2860 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
int i = WCHAR_MIN; int j = WCHAR_MAX;
; return 0; }
EOF
-if { (eval echo configure:2821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
has_wchar_minmax=yes
else
@@ -2839,9 +2885,9 @@
# Test wchar.h for WEOF, which is what we use to determine whether
# to specialize for wchar_t or not.
echo $ac_n "checking for wide character support""... $ac_c" 1>&6
-echo "configure:2843: checking for wide character support" >&5
+echo "configure:2889: checking for wide character support" >&5
cat > conftest.$ac_ext <<EOF
-#line 2845 "configure"
+#line 2891 "configure"
#include "confdefs.h"
#include <wchar.h>
@@ -2850,7 +2896,7 @@
wint_t i = WEOF;
; return 0; }
EOF
-if { (eval echo configure:2854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
has_weof=yes
else
@@ -2884,13 +2930,13 @@
# Test for glibc 2. In this case we need not compile the libio.
echo $ac_n "checking for glibc 2""... $ac_c" 1>&6
-echo "configure:2888: checking for glibc 2" >&5
+echo "configure:2934: checking for glibc 2" >&5
if eval "test \"`echo '$''{'use_glibc2'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2894 "configure"
+#line 2940 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
@@ -2900,7 +2946,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_glibc2=yes
else
@@ -2925,20 +2971,20 @@
# Test for <ctype> functionality -- linux
echo $ac_n "checking for linux <ctype>""... $ac_c" 1>&6
-echo "configure:2929: checking for linux <ctype>" >&5
+echo "configure:2975: checking for linux <ctype>" >&5
ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:2932: checking for ctype.h" >&5
+echo "configure:2978: checking for ctype.h" >&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 2937 "configure"
+#line 2983 "configure"
#include "confdefs.h"
#include <ctype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2988: \"$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*
@@ -2956,7 +3002,7 @@
echo "$ac_t""yes" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 2960 "configure"
+#line 3006 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -2967,7 +3013,7 @@
+ __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
; return 0; }
EOF
-if { (eval echo configure:2971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_linux=yes
@@ -2989,20 +3035,20 @@
# Test for <ctype> functionality -- solaris
echo $ac_n "checking for solaris <ctype>""... $ac_c" 1>&6
-echo "configure:2993: checking for solaris <ctype>" >&5
+echo "configure:3039: checking for solaris <ctype>" >&5
ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:2996: checking for ctype.h" >&5
+echo "configure:3042: checking for ctype.h" >&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 3001 "configure"
+#line 3047 "configure"
#include "confdefs.h"
#include <ctype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3052: \"$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*
@@ -3020,7 +3066,7 @@
echo "$ac_t""yes" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 3024 "configure"
+#line 3070 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
@@ -3031,7 +3077,7 @@
+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
; return 0; }
EOF
-if { (eval echo configure:3035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
\
ctype_solaris=yes
@@ -3059,19 +3105,19 @@
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3063: checking for LC_MESSAGES" >&5
+echo "configure:3109: 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 3068 "configure"
+#line 3114 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:3075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3121: \"$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
@@ -3095,7 +3141,7 @@
echo $ac_n "checking for GNU C++ float __complex__ support""... $ac_c" 1>&6
-echo "configure:3099: checking for GNU C++ float __complex__ support" >&5
+echo "configure:3145: checking for GNU C++ float __complex__ support" >&5
if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3128,14 +3174,14 @@
};
EOB
cat > conftest.$ac_ext <<EOF
-#line 3132 "configure"
+#line 3178 "configure"
#include "confdefs.h"
#include "conftest.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
glibcpp_cv_float_complex=ok
else
@@ -3332,6 +3378,8 @@
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
s%@EXEEXT@%$EXEEXT%g
+s%@DEBUGFLAGS@%$DEBUGFLAGS%g
+s%@NAMESPACES@%$NAMESPACES%g
s%@LIBMATHOBJS@%$LIBMATHOBJS%g
s%@USE_LONG_DOUBLE@%$USE_LONG_DOUBLE%g
s%@LIBSTRINGOBJS@%$LIBSTRINGOBJS%g
Index: configure.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/configure.in,v
retrieving revision 1.37
diff -u -3 -r1.37 configure.in
--- configure.in 1999/12/20 08:37:25 1.37
+++ configure.in 1999/12/20 22:48:20
@@ -21,6 +21,8 @@
# More options.
AM_MAINTAINER_MODE
AC_EXEEXT
+GLIBCPP_ENABLE_DEBUG
+GLIBCPP_ENABLE_NAMESPACES
#
# Math-related tests.
Index: bits/c++config.h.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/bits/c++config.h.in,v
retrieving revision 1.7
diff -u -3 -r1.7 c++config.h.in
--- c++config.h.in 1999/12/18 10:16:41 1.7
+++ c++config.h.in 1999/12/20 22:48:20
@@ -39,13 +39,6 @@
// string and exception.
# define _GLIBCPP_USE_EXCEPTIONS 1
-// If using the namespace std, you need this. Eventually this should
-// not be an option. In the meantime, and as things like std_ctype.h
-// need to be hacked out, give people the option. If this is set to 1,
-// CXXFLAGS should include -fhonor-std. If this is set to 0, CXXFLAGS
-// should include -fno-honor-std.
-//# define _GLIBCPP_USE_NAMESPACES 1
-
// This is necessary until Egcs supports separate template
// compilation.
#define _GLIBCPP_NO_TEMPLATE_EXPORT 1
Index: src/Makefile.am
===================================================================
RCS file: /cvs/libstdc++/libstdc++/src/Makefile.am,v
retrieving revision 1.60
diff -u -3 -r1.60 Makefile.am
--- Makefile.am 1999/12/20 08:37:25 1.60
+++ Makefile.am 1999/12/20 22:48:20
@@ -6,9 +6,9 @@
# in libtool since this would add -lstdc++ to the link line which of
# course is impossible.
WERROR = -Werror
-# OPTIMIZE_CXXFLAGS = -fsquangle -fhonor-std -fnew-exceptions \
+# OPTIMIZE_CXXFLAGS = -fsquangle -fnew-exceptions \
# -ffunction-sections -fvtable-gc -Wl,--gc-sections
-CXXFLAGS = -g @OPTLEVEL@
+CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@
AM_CXXFLAGS = -D_GNU_SOURCE -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OPTIMIZE_CXXFLAGS)
Index: src/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/src/Makefile.in,v
retrieving revision 1.71
diff -u -3 -r1.71 Makefile.in
--- Makefile.in 1999/12/20 08:37:25 1.71
+++ Makefile.in 1999/12/20 22:48:20
@@ -87,9 +87,9 @@
# in libtool since this would add -lstdc++ to the link line which of
# course is impossible.
WERROR = -Werror
-# OPTIMIZE_CXXFLAGS = -fsquangle -fhonor-std -fnew-exceptions \
+# OPTIMIZE_CXXFLAGS = -fsquangle -fnew-exceptions \
# -ffunction-sections -fvtable-gc -Wl,--gc-sections
-CXXFLAGS = -g @OPTLEVEL@
+CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@
AM_CXXFLAGS = -D_GNU_SOURCE -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OPTIMIZE_CXXFLAGS)