--- configure 2001/05/11 18:46:39 1.2
+++ configure 2001/05/11 19:50:52 1.3
@@ -52,6 +52,8 @@
fi
ac_default_prefix=/usr/local
ac_help="$ac_help
+ --with-cxx build C++ library (default=no)"
+ac_help="$ac_help
--enable-debug build for debugging (default=no)"
ac_help="$ac_help
--enable-static build static libraries (default=yes)"
@@ -587,8 +589,40 @@
echo ""
+echo $ac_n "checking whether to build C++ library""... $ac_c" 1>&6
+echo "configure:594: checking whether to build C++ library" >&5
+LIBL2XX_LA=""
+L2_TESTXX=""
+L2XX_3=""
+TEST_CXX=""
+INSTALL_CXX=""
+UNINSTALL_CXX=""
+# Check whether --with-cxx or --without-cxx was given.
+if test "${with_cxx+set}" = set; then
+ withval="$with_cxx"
+
+ LIBL2XX_LA="libl2++.la"
+ L2_TESTXX="l2_test++"
+ L2XX_3="l2++.3"
+ TEST_CXX=test-cxx
+ INSTALL_CXX=install-cxx
+ UNINSTALL_CXX=uninstall-cxx
+
+else
+
+ with_cxx=no
+
+fi
+echo "$ac_t""$with_cxx" 1>&6
+
+
+
+
+
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:592: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:626: 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
@@ -617,7 +651,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:621: checking for $ac_word" >&5
+echo "configure:655: 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
@@ -647,7 +681,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:651: checking for $ac_word" >&5
+echo "configure:685: 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
@@ -698,7 +732,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:702: checking for $ac_word" >&5
+echo "configure:736: 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
@@ -730,7 +764,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:734: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:768: 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.
@@ -741,12 +775,12 @@
cat > conftest.$ac_ext << EOF
-#line 745 "configure"
+#line 779 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:784: \"$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
@@ -772,12 +806,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:776: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:810: 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:781: checking whether we are using GNU C" >&5
+echo "configure:815: 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
@@ -786,7 +820,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:790: \"$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:824: \"$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
@@ -805,7 +839,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:809: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:843: 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
@@ -836,12 +870,13 @@
fi
fi
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+if test ".$with_cxx" = .yes; then
+ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
do
# 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:845: checking for $ac_word" >&5
+echo "configure:880: 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
@@ -873,7 +908,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:877: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:912: 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.
@@ -884,12 +919,12 @@
cat > conftest.$ac_ext << EOF
-#line 888 "configure"
+#line 923 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:928: \"$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
@@ -915,12 +950,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:919: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:954: 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:924: checking whether we are using GNU C++" >&5
+echo "configure:959: 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
@@ -929,7 +964,7 @@
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:933: \"$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:968: \"$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
@@ -948,7 +983,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:952: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:987: 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
@@ -979,8 +1014,9 @@
fi
fi
+fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:984: checking how to run the C preprocessor" >&5
+echo "configure:1020: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -995,13 +1031,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 999 "configure"
+#line 1035 "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:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1041: \"$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
:
@@ -1012,13 +1048,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1016 "configure"
+#line 1052 "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:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1058: \"$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
:
@@ -1029,13 +1065,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1033 "configure"
+#line 1069 "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:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1075: \"$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
:
@@ -1074,7 +1110,7 @@
case "$CFLAGS" in
*-pipe* ) ;;
* ) echo $ac_n "checking whether compiler option(s) -pipe work""... $ac_c" 1>&6
-echo "configure:1078: checking whether compiler option(s) -pipe work" >&5
+echo "configure:1114: checking whether compiler option(s) -pipe work" >&5
if eval "test \"`echo '$''{'ac_cv_compiler_option_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1082,14 +1118,14 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pipe"
cat > conftest.$ac_ext <<EOF
-#line 1086 "configure"
+#line 1122 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_compiler_option_pipe=yes
else
@@ -1111,7 +1147,7 @@
;;
esac
echo $ac_n "checking whether compiler option(s) -ggdb3 work""... $ac_c" 1>&6
-echo "configure:1115: checking whether compiler option(s) -ggdb3 work" >&5
+echo "configure:1151: checking whether compiler option(s) -ggdb3 work" >&5
if eval "test \"`echo '$''{'ac_cv_compiler_option_ggdb3'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1119,14 +1155,14 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -ggdb3"
cat > conftest.$ac_ext <<EOF
-#line 1123 "configure"
+#line 1159 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_compiler_option_ggdb3=yes
else
@@ -1151,7 +1187,7 @@
WMORE="-Wshadow -Wpointer-arith -Wcast-align -Winline"
WMORE="$WMORE -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
echo $ac_n "checking whether compiler option(s) -W<xxx> work""... $ac_c" 1>&6
-echo "configure:1155: checking whether compiler option(s) -W<xxx> work" >&5
+echo "configure:1191: checking whether compiler option(s) -W<xxx> work" >&5
if eval "test \"`echo '$''{'ac_cv_compiler_option_wmore'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1159,14 +1195,14 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $WMORE"
cat > conftest.$ac_ext <<EOF
-#line 1163 "configure"
+#line 1199 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_compiler_option_wmore=yes
else
@@ -1187,7 +1223,7 @@
echo "$ac_t""$ac_cv_compiler_option_wmore" 1>&6
echo $ac_n "checking whether compiler option(s) -Wno-long-long work""... $ac_c" 1>&6
-echo "configure:1191: checking whether compiler option(s) -Wno-long-long work" >&5
+echo "configure:1227: checking whether compiler option(s) -Wno-long-long work" >&5
if eval "test \"`echo '$''{'ac_cv_compiler_option_wnolonglong'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1195,14 +1231,14 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wno-long-long"
cat > conftest.$ac_ext <<EOF
-#line 1199 "configure"
+#line 1235 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_compiler_option_wnolonglong=yes
else
@@ -1240,7 +1276,7 @@
case "$CFLAGS" in
*-pipe* ) ;;
* ) echo $ac_n "checking whether compiler option(s) -pipe work""... $ac_c" 1>&6
-echo "configure:1244: checking whether compiler option(s) -pipe work" >&5
+echo "configure:1280: checking whether compiler option(s) -pipe work" >&5
if eval "test \"`echo '$''{'ac_cv_compiler_option_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1248,14 +1284,14 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pipe"
cat > conftest.$ac_ext <<EOF
-#line 1252 "configure"
+#line 1288 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_compiler_option_pipe=yes
else
@@ -1289,7 +1325,7 @@
fi
echo $ac_n "checking for compilation debug mode""... $ac_c" 1>&6
-echo "configure:1293: checking for compilation debug mode" >&5
+echo "configure:1329: checking for compilation debug mode" >&5
echo "$ac_t""$msg" 1>&6
if test ".$msg" = .enabled; then
enable_shared=no
@@ -1462,6 +1498,12 @@
s%@L2_VERSION_STR@%$L2_VERSION_STR%g
s%@L2_VERSION_HEX@%$L2_VERSION_HEX%g
s%@PLATFORM@%$PLATFORM%g
+s%@LIBL2XX_LA@%$LIBL2XX_LA%g
+s%@L2_TESTXX@%$L2_TESTXX%g
+s%@L2XX_3@%$L2XX_3%g
+s%@TEST_CXX@%$TEST_CXX%g
+s%@INSTALL_CXX@%$INSTALL_CXX%g
+s%@UNINSTALL_CXX@%$UNINSTALL_CXX%g
s%@SET_MAKE@%$SET_MAKE%g
s%@CC@%$CC%g
s%@CXX@%$CXX%g
|
