--- sql/oracle/configure 2005/11/22 16:43:19 1.18 +++ sql/oracle/configure 2009/08/23 05:39:06 1.23 @@ -469,7 +469,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all libltdl" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ORACLE_OCI_INC ORACLE_PUBLIC_INC CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE INCLTDL LIBLTDL LIBADD_DL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ORACLE_OCI_INC ORACLE_PUBLIC_INC LDFLAGS CXX CXXFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE INCLTDL LIBLTDL LIBADD_DL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1029,6 +1029,8 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-oracleoci-inc=DIR DIR is the Oracle OCI includes directory --with-oraclepublic-inc=DIR DIR is the Oracle public includes directory + --with-dynamic-stdcpp link libstdc++ dynamically + by default, libstdc++ is linked statically --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both @@ -1788,7 +1790,7 @@ fi # Define the identity of the package. PACKAGE=parser3oracle - VERSION=3.1.HEAD + VERSION=10.0 # Some tools Automake needs. @@ -1952,6 +1954,22 @@ echo "$as_me: error: $ORACLE_PUBLIC_INC fi + +# Check whether --with-dynamic-stdcpp or --without-dynamic-stdcpp was given. +if test "${with_dynamic_stdcpp+set}" = set; then + withval="$with_dynamic_stdcpp" + + LDFLAGS="-lstdc++" + +else + + LDFLAGS="-Wl,-Bstatic -Wl,-lstdc++ -Wl,-Bdynamic" + +fi; + + + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -5420,7 +5438,7 @@ test "x$enable_libtool_lock" != xno && e case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5423 "configure"' > conftest.$ac_ext + echo '#line 5441 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5992,7 +6010,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:6013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7956,7 +7974,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF @@ -9028,32 +9046,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking for POSIX putenv/getenv" >&5 + echo "$as_me:$LINENO: checking for POSIX putenv/getenv" >&5 echo $ECHO_N "checking for POSIX putenv/getenv... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef HAVE_STDLIB_H - # include - #endif - #ifdef HAVE_STRING_H - # include - #endif + # include + #endif + #ifdef HAVE_STRING_H + # include + #endif int main () { #define TEST_NAME "oracle-configure-test-var" - #define TEST_VALUE "oracle-configure-test-value" - int result=putenv(TEST_NAME"="TEST_VALUE); - char *getenv_value=getenv(TEST_NAME); - if(!getenv_value) - return 1; - if(strcmp(getenv_value, TEST_NAME)!=0) - return 2; + #define TEST_VALUE "oracle-configure-test-value" + int result=putenv(TEST_NAME"="TEST_VALUE); + char *getenv_value=getenv(TEST_NAME); + if(!getenv_value) + return 1; + if(strcmp(getenv_value, TEST_NAME)!=0) + return 2; ; return 0; @@ -9082,7 +9100,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF @@ -9096,7 +9114,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: \"there must be some function to modify environment\"" >&5 + { { echo "$as_me:$LINENO: error: \"there must be some function to modify environment\"" >&5 echo "$as_me: error: \"there must be some function to modify environment\"" >&2;} { (exit 1); exit 1; }; } @@ -9847,9 +9865,9 @@ s,@am__tar@,$am__tar,;t t s,@am__untar@,$am__untar,;t t s,@ORACLE_OCI_INC@,$ORACLE_OCI_INC,;t t s,@ORACLE_PUBLIC_INC@,$ORACLE_PUBLIC_INC,;t t +s,@LDFLAGS@,$LDFLAGS,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t s,@EXEEXT@,$EXEEXT,;t t