--- sql/sqlite/configure	2012/06/08 13:33:50	1.13
+++ sql/sqlite/configure	2012/06/11 20:59:42	1.17
@@ -316,7 +316,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 SQLITE_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 AS ac_ct_AS DLLTOOL ac_ct_DLLTOOL OBJDUMP ac_ct_OBJDUMP LIBTOOL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S AR ac_ct_AR RANLIB ac_ct_RANLIB MANIFEST_TOOL ac_ct_MANIFEST_TOOL DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CXXCPP LIBLTDL LTDLDEPS LTDLINCL INCLTDL LT_DLLOADERS LIBADD_DLOPEN LIBADD_SHL_LOAD LIBADD_DLD_LINK LT_DLPREOPEN LIBADD_DL sys_symbol_underscore ARGZ_H INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE subdirs LT_CONFIG_H LTDLOPEN LIBOBJS LTLIBOBJS ltdl_LIBOBJS ltdl_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 SQLITE_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 AS ac_ct_AS DLLTOOL ac_ct_DLLTOOL OBJDUMP ac_ct_OBJDUMP LIBTOOL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S AR ac_ct_AR RANLIB ac_ct_RANLIB MANIFEST_TOOL ac_ct_MANIFEST_TOOL DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CXXCPP LIBLTDL LTDLDEPS LTDLINCL INCLTDL LT_DLLOADERS LIBADD_DLOPEN LIBADD_SHL_LOAD LIBADD_DLD_LINK LT_DLPREOPEN LIBADD_DL sys_symbol_underscore ARGZ_H INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE subdirs LT_CONFIG_H LTDLOPEN LIBOBJS LTLIBOBJS ltdl_LIBOBJS ltdl_LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -885,8 +885,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-sqlite-inc=DIR        DIR is the SQLite includes directory
-  --with-dynamic-stdcpp   link libstdc++ dynamically
-                          by default, libstdc++ is linked statically
   --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -1360,7 +1358,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
           ac_config_headers="$ac_config_headers config_auto.h"
 
 
-
 am__api_version="1.9"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1802,8 +1799,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
 
 
 
-
-
 # Check whether --with-sqlite-inc or --without-sqlite-inc was given.
 if test "${with_sqlite_inc+set}" = set; then
   withval="$with_sqlite_inc"
@@ -1847,22 +1842,6 @@ 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:
@@ -3518,7 +3497,6 @@ fi
 
 
 
-
 case `pwd` in
   *\ * | *\	*)
     { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -17374,7 +17352,6 @@ eval "LTDLOPEN=\"$libname_spec\""
 
 
 
-
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
@@ -17410,7 +17387,6 @@ fi;
 
 
 
-
 for ac_header in stdio.h \
 stdlib.h \
 string.h \
@@ -17566,7 +17542,6 @@ fi
 done
 
 
-
 echo "$as_me:$LINENO: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
@@ -17635,7 +17610,6 @@ fi
 
 
 
-
           ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18713,9 +18687,9 @@ s,@AMTAR@,$AMTAR,;t t
 s,@am__tar@,$am__tar,;t t
 s,@am__untar@,$am__untar,;t t
 s,@SQLITE_INC@,$SQLITE_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