From ee7d4ea22484873cd3c9ce84635d4c874fa8f3ff Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Jul 03 2011 17:27:54 +0000 Subject: Now links with the multi-threaded versions of the Boost libraries --- diff --git a/soci-3.0.0-gnu-autotools-compatibility.patch b/soci-3.0.0-gnu-autotools-compatibility.patch index fd34f83..3708646 100644 --- a/soci-3.0.0-gnu-autotools-compatibility.patch +++ b/soci-3.0.0-gnu-autotools-compatibility.patch @@ -1,6 +1,6 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 --- soci-3.0.0_4-pack/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/aclocal.m4 2011-02-08 22:39:50.000000000 +0100 ++++ soci-3.0.0_trep300/aclocal.m4 2011-07-03 18:44:25.000000000 +0200 @@ -0,0 +1,961 @@ +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + @@ -17,8 +17,8 @@ diff -Nur soci-3.0.0_4-pack/aclocal.m4 soci-3.0.0_trep300/aclocal.m4 + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, -+[m4_warning([this file was generated for autoconf 2.66. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, ++[m4_warning([this file was generated for autoconf 2.68. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -976,8 +976,8 @@ diff -Nur soci-3.0.0_4-pack/build/Makefile.am soci-3.0.0_trep300/build/Makefile. + diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile.in --- soci-3.0.0_4-pack/build/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,615 @@ ++++ soci-3.0.0_trep300/build/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,619 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -1083,6 +1083,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile. +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -1116,6 +1117,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile. +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -1140,6 +1142,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile. +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -1184,6 +1187,7 @@ diff -Nur soci-3.0.0_4-pack/build/Makefile.in soci-3.0.0_trep300/build/Makefile. +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -1610,8 +1614,8 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.am soci-3.0.0_trep300/buil + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_dll.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/build/msvc80/dll/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,419 @@ ++++ soci-3.0.0_trep300/build/msvc80/dll/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,423 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -1677,6 +1681,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/buil +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -1710,6 +1715,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/buil +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -1734,6 +1740,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/buil +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -1778,6 +1785,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/dll/Makefile.in soci-3.0.0_trep300/buil +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -2048,8 +2056,8 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.am soci-3.0.0_trep300/buil + empty_test.vcproj odbc_test_mysql.vcproj oracle.vcproj soci_lib.vsprops diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/build/msvc80/lib/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,419 @@ ++++ soci-3.0.0_trep300/build/msvc80/lib/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,423 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -2115,6 +2123,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/buil +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -2148,6 +2157,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/buil +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -2172,6 +2182,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/buil +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -2216,6 +2227,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/lib/Makefile.in soci-3.0.0_trep300/buil +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -2483,8 +2495,8 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.am soci-3.0.0_trep300/build/ms +SUBDIRS = dll lib diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/msvc80/Makefile.in --- soci-3.0.0_4-pack/build/msvc80/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,616 @@ ++++ soci-3.0.0_trep300/build/msvc80/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,620 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -2590,6 +2602,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/ms +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -2623,6 +2636,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/ms +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -2647,6 +2661,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/ms +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -2691,6 +2706,7 @@ diff -Nur soci-3.0.0_4-pack/build/msvc80/Makefile.in soci-3.0.0_trep300/build/ms +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -3118,8 +3134,8 @@ diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.am soci-3.0.0_trep300/build/unix + $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix/Makefile.in --- soci-3.0.0_4-pack/build/unix/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/build/unix/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,419 @@ ++++ soci-3.0.0_trep300/build/unix/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,423 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -3185,6 +3201,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -3218,6 +3235,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -3242,6 +3260,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -3286,6 +3305,7 @@ diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -3541,8 +3561,8 @@ diff -Nur soci-3.0.0_4-pack/build/unix/Makefile.in soci-3.0.0_trep300/build/unix +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boost.m4 --- soci-3.0.0_4-pack/config/ax_boost.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ax_boost.m4 2010-01-23 13:27:04.000000000 +0100 -@@ -0,0 +1,754 @@ ++++ soci-3.0.0_trep300/config/ax_boost.m4 2011-07-03 18:38:44.000000000 +0200 +@@ -0,0 +1,774 @@ +dnl @synopsis AX_BOOST([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl +dnl Test for the Boost C++ libraries of a particular version (or newer) @@ -3808,20 +3828,22 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_filesystem, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using namespace boost::filesystem; + path my_path( "foo/bar/data.txt" ); -+ return 0;]]), ++ return 0;]])], + ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_boost_filesystem" = "yes"; then + AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available]) + BN=boost_filesystem -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break], + [link_filesystem="no"]) @@ -3838,19 +3860,22 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_system, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using namespace boost::system; + error_code myErrorCode(); -+ return 0;]]), ++ return 0;]])], + ax_cv_boost_system=yes, ax_cv_boost_system=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_boost_system" = "yes"; then + AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::SYSTEM library is available]) + BN=boost_system -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \ -+ $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_SYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes" break], + [link_system="no"]) @@ -3867,20 +3892,21 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_program_options, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::program_options::options_description generic("Generic options"); -+ return 0;]]), ++ return 0;]])], + ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_boost_program_options" = yes; then + AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available]) + BN=boost_program_options -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break], + [link_program_options="no"]) @@ -3906,9 +3932,9 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + else + CXXFLAGS="-pthread $CXXFLAGS" + fi -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::thread_group thrds; -+ return 0;]]), ++ return 0;]])], + ax_cv_boost_thread=yes, ax_cv_boost_thread=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_RESTORE @@ -3925,12 +3951,12 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + AC_SUBST(BOOST_CFLAGS) + AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available]) + BN=boost_thread -+ for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt \ -+ $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes" break], + [link_thread="no"]) + done @@ -3946,25 +3972,27 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_iostreams, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include -+ @%:@include -+ ]], -+ [[std::string input = "Hello World!"; -+ namespace io = boost::iostreams; -+ io::filtering_istream in(boost::make_iterator_range(input)); -+ return 0; -+ ]]), ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[@%:@include ++ @%:@include ]], ++ [[std::string input = "Hello World!"; ++ namespace io = boost::iostreams; ++ io::filtering_istream in (boost::make_iterator_range(input)); ++ return 0; ++ ]])], + ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no) + AC_LANG_RESTORE + ]) + if test "x$ax_cv_boost_iostreams" = "xyes"; then + AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available]) + BN=boost_iostreams -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break], + [link_thread="no"]) + done @@ -3980,35 +4008,38 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_serialization, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include -+ @%:@include -+ @%:@include -+ ]], -+ [[std::ofstream ofs("filename"); -+ boost::archive::text_oarchive oa(ofs); -+ return 0; -+ ]]), ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++ [[@%:@include ++ @%:@include ++ @%:@include ++ ]], ++ [[std::ofstream ofs("filename"); ++ boost::archive::text_oarchive oa(ofs); ++ return 0; ++ ]])], + ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no) + AC_LANG_RESTORE + ]) + if test "x$ax_cv_boost_serialization" = "xyes"; then + AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available]) + BN=boost_serialization -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break], + [link_thread="no"]) + done + BN=boost_wserialization -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break], + [link_thread="no"]) @@ -4025,22 +4056,23 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_signals, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[boost::signal sig; + return 0; -+ ]]), ++ ]])], + ax_cv_boost_signals=yes, ax_cv_boost_signals=no) + AC_LANG_RESTORE + ]) + if test "x$ax_cv_boost_signals" = "xyes"; then + AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available]) + BN=boost_signals -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes" break], + [link_signals="no"]) + done @@ -4056,22 +4088,23 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_date_time, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[using namespace boost::gregorian; date d(2002,Jan,10); + return 0; -+ ]]), ++ ]])], + ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no) + AC_LANG_RESTORE + ]) + if test "x$ax_cv_boost_date_time" = "xyes"; then + AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available]) + BN=boost_date_time -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes" break], + [link_date_time="no"]) + done @@ -4087,20 +4120,21 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_regex, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], -+ [[boost::regex r(); return 0;]]), ++ [[boost::regex r(); return 0;]])], + ax_cv_boost_regex=yes, ax_cv_boost_regex=no) + AC_LANG_RESTORE + ]) + if test "x$ax_cv_boost_regex" = "xyes"; then + AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available]) + BN=boost_regex -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break], + [link_thread="no"]) + done @@ -4117,14 +4151,14 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_asio, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::asio::io_service io; + boost::system::error_code timer_result; + boost::asio::deadline_timer t(io); + t.cancel(); + io.run_one(); + return 0; -+ ]]), ++ ]])], + ax_cv_boost_asio=yes, ax_cv_boost_asio=no) + AC_LANG_RESTORE + ]) @@ -4134,6 +4168,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_DATE_TIME_LIB}" + BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_REGEX_LIB}" + BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_SERIALIZATION_LIB}" ++ AC_SUBST(BOOST_ASIO_LIB) + fi + +# @@ -4159,10 +4194,10 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + char const* greet() { return "hello"; } + BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet);} -+ ]]), ++ ]])], + ax_cv_boost_python=yes, ax_cv_boost_python=no) + AC_LANG_RESTORE + ]) @@ -4177,21 +4212,22 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_mpi, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[ + return 0; -+ ]]), ++ ]])], + ax_cv_boost_mpi=yes, ax_cv_boost_mpi=no) + AC_LANG_RESTORE + ]) + if test "x$ax_cv_boost_mpi" = "xyes"; then + AC_DEFINE(HAVE_BOOST_MPI,,[define if the Boost::Mpi library is available]) + BN=boost_mpi -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do -+ ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_MPI_LIB="-l$ax_lib" AC_SUBST(BOOST_MPI_LIB) link_mpi="yes" break], + [link_mpi="no"]) + done @@ -4209,11 +4245,11 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_mpi_python, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[ + return 0; -+ ]]), ++ ]])], + ax_cv_boost_mpi_python=yes, ax_cv_boost_mpi_python=no) + AC_LANG_RESTORE + ]) @@ -4221,10 +4257,12 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + AC_DEFINE(HAVE_BOOST_MPI_PYTHON,,[define if the Boost::Mpi_Python library is available]) + BN=boost_mpi_python +# BN=boost_mpi_python-py25 -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_MPI_PYTHON_LIB="-l$ax_lib" AC_SUBST(BOOST_MPI_PYTHON_LIB) link_mpi_python="yes" break], + [link_mpi_python="no"]) + done @@ -4251,9 +4289,9 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + ax_cv_boost_unit_test_framework, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using boost::unit_test::test_suite; -+ test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]), ++ test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])], + ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no) + AC_LANG_RESTORE + ]) @@ -4261,10 +4299,12 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos + AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available]) + BN=boost_unit_test_framework + saved_ldflags="${LDFLAGS}" -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + LDFLAGS="${LDFLAGS} -l$ax_lib" + AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library, + ax_cv_boost_unit_test_framework, @@ -4299,7 +4339,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_boost.m4 soci-3.0.0_trep300/config/ax_boos +]) diff -Nur soci-3.0.0_4-pack/config/ax_mysql.m4 soci-3.0.0_trep300/config/ax_mysql.m4 --- soci-3.0.0_4-pack/config/ax_mysql.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ax_mysql.m4 2010-01-23 13:27:04.000000000 +0100 ++++ soci-3.0.0_trep300/config/ax_mysql.m4 2011-07-03 18:38:44.000000000 +0200 @@ -0,0 +1,164 @@ +dnl @synopsis AX_MYSQL +dnl @@ -4467,7 +4507,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_mysql.m4 soci-3.0.0_trep300/config/ax_mysq +]) dnl AX_MYSQL diff -Nur soci-3.0.0_4-pack/config/ax_oracle_oci.m4 soci-3.0.0_trep300/config/ax_oracle_oci.m4 --- soci-3.0.0_4-pack/config/ax_oracle_oci.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ax_oracle_oci.m4 2010-01-23 13:27:04.000000000 +0100 ++++ soci-3.0.0_trep300/config/ax_oracle_oci.m4 2011-07-03 18:38:44.000000000 +0200 @@ -0,0 +1,286 @@ +dnl $Id: ax_oracle_oci.m4,v 1.11 2008/04/28 19:58:54 mloskot Exp $ +dnl @@ -4634,8 +4674,8 @@ diff -Nur soci-3.0.0_4-pack/config/ax_oracle_oci.m4 soci-3.0.0_trep300/config/ax + AC_MSG_CHECKING([for Oracle OCI headers in $oracle_include_dir]) + + AC_LANG_PUSH(C++) -+ AC_COMPILE_IFELSE([ -+ AC_LANG_PROGRAM([[@%:@include ]], ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[@%:@include ]], + [[ +#if defined(OCI_MAJOR_VERSION) +#if OCI_MAJOR_VERSION == 10 && OCI_MINOR_VERSION == 2 @@ -4674,8 +4714,8 @@ diff -Nur soci-3.0.0_4-pack/config/ax_oracle_oci.m4 soci-3.0.0_trep300/config/ax + AC_MSG_CHECKING([for Oracle OCI libraries in $oracle_lib_dir]) + + AC_LANG_PUSH(C++) -+ AC_LINK_IFELSE([ -+ AC_LANG_PROGRAM([[@%:@include ]], ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[@%:@include ]], + [[ +OCIEnv* envh = 0; +OCIEnvCreate(&envh, OCI_DEFAULT, 0, 0, 0, 0, 0, 0); @@ -4757,7 +4797,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_oracle_oci.m4 soci-3.0.0_trep300/config/ax +]) diff -Nur soci-3.0.0_4-pack/config/ax_postgresql.m4 soci-3.0.0_trep300/config/ax_postgresql.m4 --- soci-3.0.0_4-pack/config/ax_postgresql.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ax_postgresql.m4 2010-01-23 13:27:04.000000000 +0100 ++++ soci-3.0.0_trep300/config/ax_postgresql.m4 2011-07-03 18:38:44.000000000 +0200 @@ -0,0 +1,171 @@ +dnl $Id: ax_postgresql.m4,v 1.3 2007/06/23 01:51:22 mloskot Exp $ +dnl @@ -4932,7 +4972,7 @@ diff -Nur soci-3.0.0_4-pack/config/ax_postgresql.m4 soci-3.0.0_trep300/config/ax +]) diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config.guess --- soci-3.0.0_4-pack/config/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.guess 2011-02-08 22:39:55.000000000 +0100 ++++ soci-3.0.0_trep300/config/config.guess 2011-07-03 18:44:27.000000000 +0200 @@ -0,0 +1,1501 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -6437,7 +6477,7 @@ diff -Nur soci-3.0.0_4-pack/config/config.guess soci-3.0.0_trep300/config/config +# End: diff -Nur soci-3.0.0_4-pack/config/config.sub soci-3.0.0_trep300/config/config.sub --- soci-3.0.0_4-pack/config/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/config.sub 2011-02-08 22:39:55.000000000 +0100 ++++ soci-3.0.0_trep300/config/config.sub 2011-07-03 18:44:27.000000000 +0200 @@ -0,0 +1,1705 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -8243,7 +8283,7 @@ diff -Nur soci-3.0.0_4-pack/config/cppunit.m4 soci-3.0.0_trep300/config/cppunit. + diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp --- soci-3.0.0_4-pack/config/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/depcomp 2011-02-08 22:39:57.000000000 +0100 ++++ soci-3.0.0_trep300/config/depcomp 2011-07-03 18:44:28.000000000 +0200 @@ -0,0 +1,630 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -8877,7 +8917,7 @@ diff -Nur soci-3.0.0_4-pack/config/depcomp soci-3.0.0_trep300/config/depcomp +# End: diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install-sh --- soci-3.0.0_4-pack/config/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/install-sh 2011-02-08 22:39:55.000000000 +0100 ++++ soci-3.0.0_trep300/config/install-sh 2011-07-03 18:44:27.000000000 +0200 @@ -0,0 +1,520 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -9401,8 +9441,8 @@ diff -Nur soci-3.0.0_4-pack/config/install-sh soci-3.0.0_trep300/config/install- +# End: diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool.m4 --- soci-3.0.0_4-pack/config/libtool.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/libtool.m4 2011-02-08 22:39:44.000000000 +0100 -@@ -0,0 +1,7441 @@ ++++ soci-3.0.0_trep300/config/libtool.m4 2011-07-03 18:44:22.000000000 +0200 +@@ -0,0 +1,7835 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9573,10 +9613,13 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our @@ -10153,15 +10196,12 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + -+ _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], @@ -10478,30 +10518,41 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + fi +]) + -+# _LT_SYS_MODULE_PATH_AIX -+# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi +])# _LT_SYS_MODULE_PATH_AIX + + @@ -10526,7 +10577,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. -+if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -10570,6 +10621,39 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([sysroot], ++[ --with-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], @@ -10716,14 +10800,47 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], -+[AC_CHECK_TOOL(AR, ar, false) -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: @@ -11063,10 +11180,10 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); +#endif + -+void fnord () { int i=42; } ++int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11606,8 +11723,9 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + need_version=no + need_lib_prefix=no + -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ @@ -11640,13 +11758,71 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac -+ dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; @@ -12354,6 +12530,11 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -12572,6 +12753,21 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + ;; +esac +]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -12579,7 +12775,11 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], -+ [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + @@ -12682,6 +12882,67 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + +# LT_LIB_M +# -------- @@ -12808,8 +13069,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= @@ -12845,6 +13106,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no @@ -12878,6 +13140,18 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t@_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t@_DLSYM_CONST ++#else ++# define LT@&t@_DLSYM_CONST const ++#endif ++ +#ifdef __cplusplus +extern "C" { +#endif @@ -12889,7 +13163,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ -+const struct { ++LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} @@ -12915,15 +13189,15 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi @@ -12956,6 +13230,13 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + AC_MSG_RESULT(ok) +fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -12966,6 +13247,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + @@ -12977,7 +13260,6 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + -+AC_MSG_CHECKING([for $compiler option to produce PIC]) +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then @@ -13082,6 +13364,12 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) @@ -13456,6 +13744,12 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) @@ -13575,9 +13869,11 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac -+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. @@ -13596,6 +13892,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# @@ -13616,6 +13914,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl @@ -13624,6 +13923,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. @@ -13638,15 +13938,20 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; ++ ;; + cygwin* | mingw* | cegcc*) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; ++ ;; + esac -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= @@ -13814,7 +14119,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -13862,7 +14168,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then -+ tmp_addflag= ++ tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler @@ -13932,8 +14238,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + @@ -13951,8 +14257,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi @@ -13998,8 +14304,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi @@ -14129,7 +14435,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. -+ _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else @@ -14140,7 +14446,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + else + # Determine the default libpath from the value encoded in an + # empty executable. -+ _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. @@ -14184,20 +14490,63 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) @@ -14235,7 +14584,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -14243,7 +14592,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + hpux9*) + if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi @@ -14259,7 +14608,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi @@ -14283,10 +14632,10 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else @@ -14333,16 +14682,31 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE(int foo(void) {}, -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ ) -+ LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -14427,7 +14791,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' @@ -14446,9 +14810,9 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) @@ -14720,8 +15084,6 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) -+_LT_TAGDECL([], [fix_srcfile_path], [1], -+ [Fix the shell variable $srcfile for the compiler]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], @@ -14732,6 +15094,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented @@ -14833,6 +15197,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then @@ -14894,6 +15259,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX @@ -14911,6 +15277,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) @@ -14932,8 +15299,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -15074,7 +15441,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. -+ _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -15086,7 +15453,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + else + # Determine the default libpath from the value encoded in an + # empty executable. -+ _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. @@ -15128,29 +15495,75 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + ;; + + cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; @@ -15225,7 +15638,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + ;; + *) + if test "$GXX" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no @@ -15296,10 +15709,10 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi @@ -15340,9 +15753,9 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -15620,7 +16033,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + @@ -15707,9 +16120,9 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when @@ -15838,6 +16251,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC @@ -15852,6 +16266,29 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose @@ -15860,6 +16297,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= @@ -15910,6 +16348,13 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +}; +_LT_EOF +]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then @@ -15921,7 +16366,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do -+ case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. @@ -15930,13 +16375,22 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + test $p = "-R"; then + prev=$p + continue -+ else -+ prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. @@ -15956,8 +16410,10 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. @@ -15993,6 +16449,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +fi + +$RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], @@ -16142,7 +16599,9 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) @@ -16196,6 +16655,7 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP @@ -16272,7 +16732,9 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + @@ -16328,7 +16790,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + fi # test -n "$compiler" + + GCC=$lt_save_GCC -+ CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP @@ -16365,10 +16828,12 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" @@ -16399,7 +16864,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +AC_LANG_RESTORE + +GCC=$lt_save_GCC -+CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + @@ -16434,9 +16900,11 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} ++CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) @@ -16449,7 +16917,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. + +GCC=$lt_save_GCC +AC_LANG_RESTORE -+CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + @@ -16508,6 +16977,15 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +AC_SUBST([OBJDUMP]) +]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + +# _LT_DECL_SED +# ------------ @@ -16601,8 +17079,8 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" -+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes @@ -16641,216 +17119,171 @@ diff -Nur soci-3.0.0_4-pack/config/libtool.m4 soci-3.0.0_trep300/config/libtool. +])# _LT_CHECK_SHELL_FEATURES + + -+# _LT_PROG_XSI_SHELLFNS -+# --------------------- -+# Bourne and XSI compatible variants of some useful shell functions. -+m4_defun([_LT_PROG_XSI_SHELLFNS], -+[case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $[*] )) -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" + -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + -+dnl func_dirname_and_basename -+dnl A portable version of this function is already defined in general.m4sh -+dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + -+# sed scripts: -+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -+} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -+} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$[@]"` -+} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -+} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + -+_LT_EOF -+esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]+=\$[2]" -+} -+_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; -+ *) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]=\$$[1]\$[2]" -+} -+ -+_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; -+ esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac +]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh --- soci-3.0.0_4-pack/config/ltmain.sh 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ltmain.sh 2011-02-08 22:39:44.000000000 +0100 -@@ -0,0 +1,8745 @@ -+# Generated from ltmain.m4sh. ++++ soci-3.0.0_trep300/config/ltmain.sh 2011-07-03 18:44:22.000000000 +0200 +@@ -0,0 +1,9636 @@ + -+# libtool (GNU libtool) 2.2.10 ++# libtool (GNU libtool) 2.4 +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, @@ -16920,17 +17353,19 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool) 2.2.10 ++# $progname: (GNU libtool) 2.4 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + +PROGRAM=libtool +PACKAGE=libtool -+VERSION=2.2.10 ++VERSION=2.4 +TIMESTAMP="" -+package_revision=1.3175 ++package_revision=1.3293 + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -17013,6 +17448,27 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +dirname="s,/[^/]*$,," +basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: @@ -17027,17 +17483,31 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + -+# Generated shell functions inserted here. + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' @@ -17220,6 +17690,15 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. @@ -17248,7 +17727,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# name if it has been set yet. +func_echo () +{ -+ $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" +} + +# func_verbose arg... @@ -17274,14 +17753,14 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# Echo program name prefixed message to standard error. +func_error () +{ -+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 +} + +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ -+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : @@ -17500,11 +17979,30 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + fi +} + ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} ++ + +# func_version +# Echo version message to standard output and exit. +func_version () +{ ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ @@ -17526,6 +18024,8 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# Echo short help message to standard output and exit. +func_usage () +{ ++ $opt_debug ++ + $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// @@ -17542,7 +18042,10 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# unless 'noexit' is passed as argument. +func_help () +{ ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* @@ -17555,7 +18058,11 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p -+ }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret @@ -17567,12 +18074,39 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# exit_cmd. +func_missing_arg () +{ ++ $opt_debug ++ + func_error "missing argument for $1." + exit_cmd=exit +} + -+exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + @@ -17582,25 +18116,64 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +magic_exe="%%%MAGIC EXE variable%%%" + +# Global variables. -+# $mode is unset +nonopt= -+execute_dlfiles= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 + -+opt_dry_run=false -+opt_duplicate_deps=false -+opt_silent=false -+opt_debug=: -+ +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. @@ -17690,129 +18263,204 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + esac +} + -+# Parse options once, thoroughly. This comes as soon as possible in -+# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () +{ ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi ++ ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac ++ + -+ # Shorthand for --mode=foo, only valid as the first argument -+ case $1 in -+ clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+ compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+ execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+ finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+ link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+ esac + -+ # Parse non-mode specific arguments: -+ while test "$#" -gt 0; do ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift -+ + case $opt in -+ --config) func_config ;; -+ -+ --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" -+ opt_debug='set -x' + $opt_debug + ;; -+ -+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ execute_dlfiles="$execute_dlfiles $1" -+ shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; -+ -+ --dry-run | -n) opt_dry_run=: ;; -+ --features) func_features ;; -+ --finish) mode="finish" ;; -+ -+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ case $1 in -+ # Valid mode arguments: -+ clean) ;; -+ compile) ;; -+ execute) ;; -+ finish) ;; -+ install) ;; -+ link) ;; -+ relink) ;; -+ uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+ esac -+ -+ mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; -+ + --preserve-dup-deps) -+ opt_duplicate_deps=: ;; -+ -+ --quiet|--silent) preserve_args="$preserve_args $opt" -+ opt_silent=: -+ opt_verbose=false ++ opt_preserve_dup_deps=: + ;; -+ -+ --no-quiet|--no-silent) -+ preserve_args="$preserve_args $opt" -+ opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; -+ -+ --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false -+ opt_verbose=: ++func_append preserve_args " $opt" + ;; -+ -+ --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; -+ -+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ preserve_args="$preserve_args $opt $1" -+ func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: -+ -dlopen=*|--mode=*|--tag=*) -+ func_opt_split "$opt" -+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + -+ -\?|-h) func_usage ;; -+ --help) opt_help=: ;; -+ --help-all) opt_help=': help-all' ;; -+ --version) func_version ;; -+ -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ -+ *) nonopt="$opt" -+ break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -17820,82 +18468,44 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + opt_duplicate_compiler_generated_deps=: + ;; + *) -+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + -+ # Having warned about all mis-specified options, bail out if -+ # anything was wrong. -+ $exit_cmd $EXIT_FAILURE -+} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () -+{ -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+## ----------- ## -+## Main. ## -+## ----------- ## -+ -+$opt_help || { -+ # Sanity checks first: -+ func_check_version_match ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" -+ fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + -+ test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$execute_dlfiles" && test "$mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi + -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$mode' for more information." -+} + ++## ----------- ## ++## Main. ## ++## ----------- ## + +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. @@ -17960,12 +18570,9 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ -+ func_ltwrapper_scriptname_result="" -+ if func_ltwrapper_executable_p "$1"; then -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -+ fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +} + +# func_ltwrapper_p file @@ -18011,6 +18618,37 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +} + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. @@ -18023,8 +18661,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do -+ func_quote_for_eval "$arg" -+ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -18043,8 +18680,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. -+ func_quote_for_eval "$arg" -+ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -18113,6 +18749,486 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + } +} + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ +# func_mode_compile arg... +func_mode_compile () +{ @@ -18153,12 +19269,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + ;; + + -pie | -fpie | -fPIE) -+ pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) -+ later="$later $arg" ++ func_append later " $arg" + continue + ;; + @@ -18179,15 +19295,14 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" -+ func_quote_for_eval "$arg" -+ lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. -+ base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + @@ -18203,8 +19318,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + esac # case $arg_mode + + # Aesthetically quote the previous argument. -+ func_quote_for_eval "$lastarg" -+ base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in @@ -18335,17 +19449,16 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi -+ removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist -+ removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + -+ if test -n "$fix_srcfile_path"; then -+ eval srcfile=\"$fix_srcfile_path\" -+ fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + @@ -18365,7 +19478,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + if test -z "$output_obj"; then + # Place PIC objects in $objdir -+ command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ @@ -18412,11 +19525,11 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then -+ command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. -+ command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + @@ -18461,13 +19574,13 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +} + +$opt_help || { -+ test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +} + +func_mode_help () +{ + # We need to display help for each of the modes. -+ case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. @@ -18643,7 +19756,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + ;; + + *) -+ func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + @@ -18658,13 +19771,13 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + else + { + func_help noexit -+ for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit -+ for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done @@ -18693,13 +19806,16 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. -+ for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -18721,7 +19837,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then -+ dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -18778,8 +19894,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + ;; + esac + # Quote arguments (to preserve shell metacharacters). -+ func_quote_for_eval "$file" -+ args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then @@ -18811,22 +19926,59 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + fi +} + -+test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug -+ libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ for dir -+ do -+ libdirs="$libdirs $dir" -+ done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. @@ -18836,7 +19988,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" -+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done @@ -18845,53 +19997,55 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS +} + -+test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... @@ -18916,7 +20070,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" -+ install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; @@ -18936,7 +20090,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + do + arg2= + if test -n "$dest"; then -+ files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi @@ -18974,11 +20128,11 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" -+ install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi -+ install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ @@ -18990,7 +20144,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" -+ install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + @@ -19048,10 +20202,13 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + case $file in + *.$libext) + # Do the static libraries later. -+ staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" @@ -19065,19 +20222,19 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; -+ *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; -+ *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" -+ dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. @@ -19154,7 +20311,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. -+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) @@ -19351,7 +20508,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + fi +} + -+test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p @@ -19398,6 +20555,18 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ +/* External symbol declarations for the compiler. */\ +" + @@ -19409,8 +20578,9 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do -+ func_verbose "extracting global C symbols from \`$progfile'" -+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then @@ -19459,10 +20629,52 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { @@ -19500,26 +20712,9 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + const char *name; + void *address; +} lt_dlsymlist; -+" -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ echo >> "$output_objdir/$my_dlsyms" "\ -+/* DATA imports from DLLs on WIN32 con't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs. */" -+ lt_dlsym_const= ;; -+ *osf5*) -+ echo >> "$output_objdir/$my_dlsyms" "\ -+/* This system does not cope well with relocations in const data */" -+ lt_dlsym_const= ;; -+ *) -+ lt_dlsym_const=const ;; -+ esac -+ -+ echo >> "$output_objdir/$my_dlsyms" "\ -+extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; -+$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," @@ -19575,7 +20770,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; -+ *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + @@ -19638,7 +20833,8 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ win32_nmres=`eval $NM -f posix -A $1 | ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ @@ -19667,6 +20863,131 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + $ECHO "$win32_libid_type" +} + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + +# func_extract_an_archive dir oldlib @@ -20045,6 +21366,18 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ @@ -20059,14 +21392,6 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +" + fi + -+ # fixup the dll searchpath if we need to. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. @@ -20084,166 +21409,6 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +} + + -+# func_to_host_path arg -+# -+# Convert paths to host format when used with build tools. -+# Intended for use with "native" mingw (where libtool itself -+# is running under the msys shell), or in the following cross- -+# build environments: -+# $build $host -+# mingw (msys) mingw [e.g. native] -+# cygwin mingw -+# *nix + wine mingw -+# where wine is equipped with the `winepath' executable. -+# In the native mingw case, the (msys) shell automatically -+# converts paths for any non-msys applications it launches, -+# but that facility isn't available from inside the cwrapper. -+# Similar accommodations are necessary for $host mingw and -+# $build cygwin. Calling this function does no harm for other -+# $host/$build combinations not listed above. -+# -+# ARG is the path (on $build) that should be converted to -+# the proper representation for $host. The result is stored -+# in $func_to_host_path_result. -+func_to_host_path () -+{ -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ case $host in -+ *mingw* ) -+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ case $build in -+ *mingw* ) # actually, msys -+ # awkward: cmd appends spaces to result -+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+ ;; -+ *cygwin* ) -+ func_to_host_path_result=`cygpath -w "$1" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ * ) -+ # Unfortunately, winepath does not exit with a non-zero -+ # error code, so we are forced to check the contents of -+ # stdout. On the other hand, if the command is not -+ # found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both -+ # error code of zero AND non-empty stdout, which explains -+ # the odd construction: -+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -+ func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ # Allow warning below. -+ func_to_host_path_result= -+ fi -+ ;; -+ esac -+ if test -z "$func_to_host_path_result" ; then -+ func_error "Could not determine host path corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_path_result="$1" -+ fi -+ ;; -+ esac -+ fi -+} -+# end: func_to_host_path -+ -+# func_to_host_pathlist arg -+# -+# Convert pathlists to host format when used with build tools. -+# See func_to_host_path(), above. This function supports the -+# following $build/$host combinations (but does no harm for -+# combinations not listed here): -+# $build $host -+# mingw (msys) mingw [e.g. native] -+# cygwin mingw -+# *nix + wine mingw -+# -+# Path separators are also converted from $build format to -+# $host format. If ARG begins or ends with a path separator -+# character, it is preserved (but converted to $host format) -+# on output. -+# -+# ARG is a pathlist (on $build) that should be converted to -+# the proper representation on $host. The result is stored -+# in $func_to_host_pathlist_result. -+func_to_host_pathlist () -+{ -+ func_to_host_pathlist_result="$1" -+ if test -n "$1"; then -+ case $host in -+ *mingw* ) -+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_pathlist_tmp1=$func_stripname_result -+ case $build in -+ *mingw* ) # Actually, msys. -+ # Awkward: cmd appends spaces to result. -+ func_to_host_pathlist_result=` -+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+ ;; -+ *cygwin* ) -+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ * ) -+ # unfortunately, winepath doesn't convert pathlists -+ func_to_host_pathlist_result="" -+ func_to_host_pathlist_oldIFS=$IFS -+ IFS=: -+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -+ IFS=$func_to_host_pathlist_oldIFS -+ if test -n "$func_to_host_pathlist_f" ; then -+ func_to_host_path "$func_to_host_pathlist_f" -+ if test -n "$func_to_host_path_result" ; then -+ if test -z "$func_to_host_pathlist_result" ; then -+ func_to_host_pathlist_result="$func_to_host_path_result" -+ else -+ func_append func_to_host_pathlist_result ";$func_to_host_path_result" -+ fi -+ fi -+ fi -+ done -+ IFS=$func_to_host_pathlist_oldIFS -+ ;; -+ esac -+ if test -z "$func_to_host_pathlist_result"; then -+ func_error "Could not determine the host path(s) corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This may break if $1 contains DOS-style drive -+ # specifications. The fix is not to complicate the expression -+ # below, but for the user to provide a working wine installation -+ # with winepath so that path translation in the cross-to-mingw -+ # case works properly. -+ lt_replace_pathsep_nix_to_dos="s|:|;|g" -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -+ $SED -e "$lt_replace_pathsep_nix_to_dos"` -+ fi -+ # Now, add the leading and trailing path separators back -+ case "$1" in -+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -+ ;; -+ esac -+ case "$1" in -+ *: ) func_append func_to_host_pathlist_result ";" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+} -+# end: func_to_host_pathlist -+ +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because @@ -20413,14 +21578,14 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh +EOF + + cat </dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | @@ -23849,7 +25096,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi @@ -23874,7 +25121,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + ;; + *) + # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. @@ -23890,7 +25137,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac @@ -23903,7 +25150,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi @@ -23928,7 +25175,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + ;; + *) + # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. @@ -24032,7 +25279,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + *) + case " $deplibs " in + *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac @@ -24042,10 +25289,10 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + -L*) + case " $new_libs " in + *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; -+ *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" @@ -24062,10 +25309,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" -+ test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else @@ -24074,18 +25323,18 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" -+ dep_rpath="$dep_rpath $flag" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done @@ -24103,7 +25352,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do -+ rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi @@ -24111,7 +25360,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + fi + + shlibpath="$finalize_shlibpath" -+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi @@ -24137,7 +25386,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + linknames= + for link + do -+ linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic @@ -24148,7 +25397,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" -+ delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= @@ -24179,13 +25428,45 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ func_len " $cmd" -+ len=$func_len_result -+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. @@ -24219,7 +25500,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi @@ -24229,7 +25510,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + case " $convenience " in + *" $test_deplib "*) ;; + *) -+ tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done @@ -24249,21 +25530,21 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" -+ linker_flags="$linker_flags $flag" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking -+ if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + @@ -24325,10 +25606,13 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + echo 'INPUT (' > $output + for obj in $save_libobjs + do -+ $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output -+ delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" @@ -24342,10 +25626,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + fi + for obj + do -+ $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done -+ delfiles="$delfiles $output" -+ output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." @@ -24396,7 +25682,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi -+ delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= @@ -24430,7 +25716,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + lt_exit=$? + + # Restore the uninstalled library and exit -+ if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) @@ -24463,7 +25749,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi @@ -24504,10 +25790,10 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles -+ libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + @@ -24523,7 +25809,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + lt_exit=$? + + # Restore the uninstalled library and exit -+ if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) @@ -24535,7 +25821,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + IFS="$save_ifs" + + # Restore the uninstalled library and exit -+ if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then @@ -24619,13 +25905,16 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" -+ generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + @@ -24699,8 +25988,8 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) -+ compile_command="$compile_command ${wl}-bind_at_load" -+ finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi @@ -24720,7 +26009,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac @@ -24730,17 +26019,17 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + -L*) + case " $new_libs " in + *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; -+ *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + -+ compile_command="$compile_command $compile_deplibs" -+ finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. @@ -24748,7 +26037,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi @@ -24767,18 +26056,18 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in @@ -24787,12 +26076,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; -+ *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac @@ -24818,18 +26107,18 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done @@ -24880,6 +26169,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -24902,7 +26197,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do -+ rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi @@ -24910,7 +26205,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do -+ rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi @@ -24925,6 +26220,13 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + @@ -24958,6 +26260,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + @@ -25055,7 +26363,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then -+ oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" @@ -25063,10 +26371,10 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. @@ -25077,10 +26385,10 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles -+ oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have @@ -25098,7 +26406,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= @@ -25122,9 +26430,9 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; -+ *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi @@ -25134,6 +26442,16 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." @@ -25230,9 +26548,19 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" -+ newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" ++ ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" @@ -25246,9 +26574,9 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" -+ newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; -+ *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" @@ -25265,7 +26593,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" -+ newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done @@ -25277,7 +26605,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac -+ newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= @@ -25286,7 +26614,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac -+ newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi @@ -25371,7 +26699,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + exit $EXIT_SUCCESS +} + -+{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + @@ -25391,9 +26719,9 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + for arg + do + case $arg in -+ -f) RM="$RM $arg"; rmforce=yes ;; -+ -*) RM="$RM $arg" ;; -+ *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + @@ -25402,24 +26730,23 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + rmdirs= + -+ origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then -+ objdir="$origobjdir" ++ odir="$objdir" + else -+ objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" -+ test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + -+ # Remember objdir for removal later, being careful to avoid duplicates -+ if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in -+ *" $objdir "*) ;; -+ *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + @@ -25445,18 +26772,17 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + # Delete the libtool libraries and symlinks. + for n in $library_names; do -+ rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done -+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + -+ case "$mode" in ++ case "$opt_mode" in + clean) -+ case " $library_names " in -+ # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; -+ *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac -+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then @@ -25484,19 +26810,19 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then -+ rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then -+ rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) -+ if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) @@ -25506,7 +26832,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe -+ rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. @@ -25515,7 +26841,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result -+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename @@ -25523,12 +26849,12 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles -+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then -+ rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then -+ rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi @@ -25536,7 +26862,6 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done -+ objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do @@ -25548,16 +26873,16 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + exit $exit_status +} + -+{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + -+test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ -+ func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + +if test -n "$exec_cmd"; then + eval exec "$exec_cmd" @@ -25595,7 +26920,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltmain.sh soci-3.0.0_trep300/config/ltmain.sh + diff -Nur soci-3.0.0_4-pack/config/lt~obsolete.m4 soci-3.0.0_trep300/config/lt~obsolete.m4 --- soci-3.0.0_4-pack/config/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/lt~obsolete.m4 2011-02-08 22:39:44.000000000 +0100 ++++ soci-3.0.0_trep300/config/lt~obsolete.m4 2011-07-03 18:44:22.000000000 +0200 @@ -0,0 +1,98 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# @@ -25697,7 +27022,7 @@ diff -Nur soci-3.0.0_4-pack/config/lt~obsolete.m4 soci-3.0.0_trep300/config/lt~o +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff -Nur soci-3.0.0_4-pack/config/ltoptions.m4 soci-3.0.0_trep300/config/ltoptions.m4 --- soci-3.0.0_4-pack/config/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ltoptions.m4 2011-02-08 22:39:44.000000000 +0100 ++++ soci-3.0.0_trep300/config/ltoptions.m4 2011-07-03 18:44:22.000000000 +0200 @@ -0,0 +1,369 @@ +# Helper functions for option handling. -*- Autoconf -*- +# @@ -26070,7 +27395,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltoptions.m4 soci-3.0.0_trep300/config/ltopti + [m4_define([_LTDL_TYPE], [convenience])]) diff -Nur soci-3.0.0_4-pack/config/ltsugar.m4 soci-3.0.0_trep300/config/ltsugar.m4 --- soci-3.0.0_4-pack/config/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ltsugar.m4 2011-02-08 22:39:44.000000000 +0100 ++++ soci-3.0.0_trep300/config/ltsugar.m4 2011-07-03 18:44:22.000000000 +0200 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# @@ -26197,7 +27522,7 @@ diff -Nur soci-3.0.0_4-pack/config/ltsugar.m4 soci-3.0.0_trep300/config/ltsugar. +]) diff -Nur soci-3.0.0_4-pack/config/ltversion.m4 soci-3.0.0_trep300/config/ltversion.m4 --- soci-3.0.0_4-pack/config/ltversion.m4 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/ltversion.m4 2011-02-08 22:39:44.000000000 +0100 ++++ soci-3.0.0_trep300/config/ltversion.m4 2011-07-03 18:44:22.000000000 +0200 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# @@ -26208,23 +27533,23 @@ diff -Nur soci-3.0.0_4-pack/config/ltversion.m4 soci-3.0.0_trep300/config/ltvers +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + -+# Generated from ltversion.in. ++# @configure_input@ + -+# serial 3175 ltversion.m4 ++# serial 3293 ltversion.m4 +# This file is part of GNU Libtool + -+m4_define([LT_PACKAGE_VERSION], [2.2.10]) -+m4_define([LT_PACKAGE_REVISION], [1.3175]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + +AC_DEFUN([LTVERSION_VERSION], -+[macro_version='2.2.10' -+macro_revision='1.3175' ++[macro_version='2.4' ++macro_revision='1.3293' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing --- soci-3.0.0_4-pack/config/missing 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/config/missing 2011-02-08 22:39:55.000000000 +0100 ++++ soci-3.0.0_trep300/config/missing 2011-07-03 18:44:27.000000000 +0200 @@ -0,0 +1,376 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -26603,13 +27928,13 @@ diff -Nur soci-3.0.0_4-pack/config/missing soci-3.0.0_trep300/config/missing +# time-stamp-end: "; # UTC" +# End: diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure ---- soci-3.0.0_4-pack/configure 2011-02-09 00:30:32.600916392 +0100 -+++ soci-3.0.0_trep300/configure 2011-02-08 22:39:52.000000000 +0100 -@@ -1,72 +1,20472 @@ +--- soci-3.0.0_4-pack/configure 2011-07-03 18:55:06.451876878 +0200 ++++ soci-3.0.0_trep300/configure 2011-07-03 18:44:26.000000000 +0200 +@@ -1,72 +1,21364 @@ -#!/bin/sh +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. -+# Generated by GNU Autoconf 2.66 for SOCI 3.0.0. ++# Generated by GNU Autoconf 2.68 for SOCI 3.0.0. +# +# Report bugs to . +# @@ -26703,6 +28028,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. ++as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -26836,11 +28162,18 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. ++ # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++ esac ++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : @@ -27258,6 +28591,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +BOOST_MPI_PYTHON_LIB +BOOST_MPI_LIB +BOOST_PYTHON_LIB ++BOOST_ASIO_LIB +BOOST_REGEX_LIB +BOOST_DATE_TIME_LIB +BOOST_SIGNALS_LIB @@ -27285,8 +28619,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +LIPO +NMEDIT +DSYMUTIL ++MANIFEST_TOOL +RANLIB ++ac_ct_AR +AR ++DLLTOOL +OBJDUMP +LN_S +NM @@ -27409,6 +28746,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +with_pic +enable_fast_install +with_gnu_ld ++with_sysroot +enable_libtool_lock +enable_exceptions +enable_info_doc @@ -27504,8 +28842,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + fi + + case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. @@ -27845,7 +29184,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac @@ -28092,6 +29431,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified). + --with-docdir=DIR set documentation directory to DIR + --with-boost=DIR use boost (default is NO) , specify the root + directory for boost library (optional) @@ -28186,7 +29527,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +if $ac_init_version; then + cat <<\_ACEOF +SOCI configure 3.0.0 -+generated by GNU Autoconf 2.66 ++generated by GNU Autoconf 2.68 + +Copyright (C) 2010 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation @@ -28234,7 +29575,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + ac_retval=1 +fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile @@ -28260,7 +29601,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : @@ -28271,7 +29612,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + ac_retval=1 +fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp @@ -28309,7 +29650,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + ac_retval=1 +fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile @@ -28355,7 +29696,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link @@ -28369,7 +29710,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28387,7 +29728,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + @@ -28412,7 +29753,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : @@ -28423,7 +29764,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + ac_retval=1 +fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp @@ -28465,7 +29806,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run @@ -28478,7 +29819,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28533,7 +29874,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + @@ -28578,7 +29919,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link @@ -28620,7 +29961,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_run @@ -28633,10 +29974,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_fn_cxx_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval "test \"\${$3+set}\"" = set; then : ++ if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 @@ -28672,7 +30013,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +else + ac_header_preproc=no +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + @@ -28703,7 +30044,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" @@ -28712,7 +30053,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_header_mongrel +cat >config.log <<_ACEOF @@ -28720,7 +30061,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +running configure, to aid debugging if configure makes a mistake. + +It was created by SOCI $as_me 3.0.0, which was -+generated by GNU Autoconf 2.66. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + @@ -29118,7 +30459,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then : ++if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -29320,7 +30661,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then : ++if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then @@ -29360,7 +30701,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then @@ -29413,7 +30754,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then -+ if test "${ac_cv_path_mkdir+set}" = set; then : ++ if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -29464,7 +30805,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_AWK+set}" = set; then : ++if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then @@ -29504,7 +30845,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF @@ -29638,7 +30979,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy cppunit-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then : ++if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CPPUNIT_CONFIG in @@ -29780,7 +31121,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } -+if test "${ac_cv_build+set}" = set; then : ++if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias @@ -29814,7 +31155,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } -+if test "${ac_cv_host+set}" = set; then : ++if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then @@ -29970,6 +31311,20 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ;; +esac + ++# Set default language to C++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ +# Checks for programs +save_CXXFLAGS="$CXXFLAGS" +ac_ext=cpp @@ -29988,7 +31343,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CXX+set}" = set; then : ++if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then @@ -30032,7 +31387,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then @@ -30309,7 +31664,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } -+if test "${ac_cv_objext+set}" = set; then : ++if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30360,7 +31715,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : ++if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30397,7 +31752,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+if test "${ac_cv_prog_cxx_g+set}" = set; then : ++if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -30473,11 +31828,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + CXXFLAGS= + fi +fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" @@ -30545,7 +31900,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } -+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -30676,7 +32031,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then : ++ if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded @@ -30706,7 +32061,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Broken: fails on valid input. +continue +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. @@ -30722,11 +32077,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_preproc_ok=: +break +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi @@ -30765,7 +32120,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Broken: fails on valid input. +continue +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. @@ -30781,11 +32136,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_preproc_ok=: +break +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else @@ -30795,11 +32150,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +See \`config.log' for more details" "$LINENO" 5; } +fi + -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +CXXFLAGS="$save_CXXFLAGS" + @@ -30811,8 +32166,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + -+macro_version='2.2.10' -+macro_revision='1.3175' ++macro_version='2.4' ++macro_revision='1.3293' + + + @@ -30852,7 +32207,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. -+if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -30907,7 +32262,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then @@ -30947,7 +32302,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then @@ -31000,7 +32355,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then @@ -31040,7 +32395,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then @@ -31099,7 +32454,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then @@ -31143,7 +32498,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then @@ -31227,7 +32582,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -31264,7 +32619,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then : ++if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag @@ -31342,7 +32697,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then : ++if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no @@ -31431,17 +32786,17 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +fi + -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -31566,7 +32921,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } -+if test "${ac_cv_path_SED+set}" = set; then : ++if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -31648,7 +33003,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then : ++if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then @@ -31711,7 +33066,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then : ++if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -31778,7 +33133,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } -+if test "${ac_cv_path_FGREP+set}" = set; then : ++if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -31909,7 +33264,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi -+if test "${lt_cv_path_LD+set}" = set; then : ++if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then @@ -31949,7 +33304,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -+if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -31976,7 +33331,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -+if test "${lt_cv_path_NM+set}" = set; then : ++if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then @@ -32039,7 +33394,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DUMPBIN+set}" = set; then : ++if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then @@ -32083,7 +33438,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then @@ -32155,7 +33510,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } -+if test "${lt_cv_nm_interface+set}" = set; then : ++if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" @@ -32190,7 +33545,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } -+if test "${lt_cv_sys_max_cmd_len+set}" = set; then : ++if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 @@ -32335,8 +33690,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" -+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes @@ -32385,9 +33740,83 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if ${lt_cv_to_host_file_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if ${lt_cv_to_tool_file_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } -+if test "${lt_cv_ld_reload_flag+set}" = set; then : ++if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' @@ -32401,6 +33830,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -32423,7 +33857,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OBJDUMP+set}" = set; then : ++if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then @@ -32463,7 +33897,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then @@ -32522,7 +33956,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } -+if test "${lt_cv_deplibs_check_method+set}" = set; then : ++if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -32724,6 +34158,21 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -32739,12 +34188,166 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_DLLTOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++ ++ +if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_AR+set}" = set; then : ++if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then @@ -32757,7 +34360,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi @@ -32777,14 +34380,18 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi + + ++ test -n "$AR" && break ++ done +fi -+if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then + ac_ct_AR=$AR -+ # Extract the first word of "ar", so it can be a program name with args. -+set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : ++if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then @@ -32797,7 +34404,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi @@ -32816,6 +34423,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "no" >&6; } +fi + ++ ++ test -n "$ac_ct_AR" && break ++done ++ + if test "x$ac_ct_AR" = x; then + AR="false" + else @@ -32827,12 +34438,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +esac + AR=$ac_ct_AR + fi -+else -+ AR="$ac_cv_prog_AR" +fi + -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++ + + + @@ -32843,13 +34453,70 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if ${lt_cv_ar_at_file+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++ ++ + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then : ++if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then @@ -32889,7 +34556,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then @@ -32948,7 +34615,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_RANLIB+set}" = set; then : ++if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then @@ -32988,7 +34655,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then @@ -33117,7 +34784,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : ++if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -33178,8 +34845,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= @@ -33215,6 +34882,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no @@ -33256,6 +34924,18 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ +#ifdef __cplusplus +extern "C" { +#endif @@ -33267,7 +34947,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ -+const struct { ++LT_DLSYM_CONST struct { + const char *name; + void *address; +} @@ -33293,8 +34973,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -33304,8 +34984,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi @@ -33342,6 +35022,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "ok" >&6; } +fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ + + + @@ -33364,6 +35054,45 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-sysroot was given. ++if test "${with_sysroot+set}" = set; then : ++ withval=$with_sysroot; ++else ++ with_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 ++$as_echo "${with_sysroot}" >&6; } ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ ++ ++ +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; @@ -33489,7 +35218,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -+if test "${lt_cv_cc_needs_belf+set}" = set; then : ++if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c @@ -33557,6 +35286,123 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +need_locks="$enable_libtool_lock" + ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if ${lt_cv_path_mainfest_tool+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++ + + case $host_os in + rhapsody* | darwin*) @@ -33565,7 +35411,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : ++if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then @@ -33605,7 +35451,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then @@ -33657,7 +35503,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_NMEDIT+set}" = set; then : ++if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then @@ -33697,7 +35543,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : ++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then @@ -33749,7 +35595,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_LIPO+set}" = set; then : ++if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then @@ -33789,7 +35635,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : ++if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then @@ -33841,7 +35687,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OTOOL+set}" = set; then : ++if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then @@ -33881,7 +35727,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then @@ -33933,7 +35779,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OTOOL64+set}" = set; then : ++if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then @@ -33973,7 +35819,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : ++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then @@ -34048,7 +35894,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then : ++if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no @@ -34077,7 +35923,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : ++if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no @@ -34109,7 +35955,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } -+if test "${lt_cv_ld_force_load+set}" = set; then : ++if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no @@ -34186,7 +36032,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + CPP= +fi +if test -z "$CPP"; then -+ if test "${ac_cv_prog_CPP+set}" = set; then : ++ if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded @@ -34216,7 +36062,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Broken: fails on valid input. +continue +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. @@ -34232,11 +36078,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_preproc_ok=: +break +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi @@ -34275,7 +36121,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Broken: fails on valid input. +continue +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. @@ -34291,11 +36137,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_preproc_ok=: +break +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else @@ -34314,7 +36160,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34445,7 +36291,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" -+if test "x$ac_cv_header_dlfcn_h" = x""yes; then : ++if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF @@ -34456,6 +36302,15 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++ ++ + + + @@ -34573,7 +36428,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } -+if test "${lt_cv_objdir+set}" = set; then : ++if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null @@ -34651,7 +36506,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in @@ -34717,7 +36572,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in @@ -34859,7 +36714,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : ++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no @@ -34912,8 +36767,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +lt_prog_compiler_pic= +lt_prog_compiler_static= + -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' @@ -35078,6 +36931,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) @@ -35197,13 +37056,17 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -+$as_echo "$lt_prog_compiler_pic" >&6; } -+ -+ -+ -+ + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if ${lt_cv_prog_compiler_pic+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + +# +# Check to make sure the PIC flag actually works. @@ -35211,7 +37074,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : ++if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no @@ -35264,13 +37127,18 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++ ++ ++ ++ ++ +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then : ++if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no @@ -35313,7 +37181,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no @@ -35368,7 +37236,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no @@ -35614,7 +37482,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -35662,7 +37531,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then -+ tmp_addflag= ++ tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler @@ -35732,8 +37601,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + @@ -35751,8 +37620,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi @@ -35798,8 +37667,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi @@ -35929,7 +37798,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath_+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int @@ -35942,22 +37817,29 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -35969,7 +37851,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + else + # Determine the default libpath from the value encoded in an + # empty executable. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath_+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int @@ -35982,22 +37870,29 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, @@ -36042,20 +37937,63 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) @@ -36120,7 +38058,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no @@ -36128,7 +38066,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + hpux9*) + if test "$GCC" = yes; then -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi @@ -36144,7 +38082,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi @@ -36168,10 +38106,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else @@ -36188,7 +38126,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } -+if test "${lt_cv_prog_compiler__b+set}" = set; then : ++if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no @@ -36250,23 +38188,36 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if ${lt_cv_irix_exported_symbol+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+int foo(void) {} ++int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -36351,7 +38302,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' @@ -36370,9 +38321,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' -+ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) @@ -36560,7 +38511,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : ++if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* @@ -36948,8 +38899,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + need_version=no + need_lib_prefix=no + -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ @@ -36982,13 +38934,71 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac -+ dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; @@ -37202,7 +39212,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH -+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : ++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no @@ -37626,7 +39636,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -37660,7 +39670,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + @@ -37674,12 +39684,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -+if test "x$ac_cv_func_shl_load" = x""yes; then : ++if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then : ++if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -37713,16 +39723,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -+if test "x$ac_cv_func_dlopen" = x""yes; then : ++if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -37756,12 +39766,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then : ++if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -37795,12 +39805,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : ++if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then : ++if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -37834,7 +39844,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : ++if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + @@ -37875,7 +39885,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } -+if test "${lt_cv_dlopen_self+set}" = set; then : ++if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : @@ -37928,10 +39938,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); +#endif + -+void fnord () { int i=42; } ++int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -37981,7 +39991,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -+if test "${lt_cv_dlopen_self_static+set}" = set; then : ++if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : @@ -38034,10 +40044,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); +#endif + -+void fnord () { int i=42; } ++int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -38199,11 +40209,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + +fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +CC="$lt_save_CC" + @@ -38218,7 +40228,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then : ++ if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded @@ -38248,7 +40258,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Broken: fails on valid input. +continue +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. @@ -38264,11 +40274,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_preproc_ok=: +break +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi @@ -38307,7 +40317,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Broken: fails on valid input. +continue +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. @@ -38323,11 +40333,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_preproc_ok=: +break +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else @@ -38337,11 +40347,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +See \`config.log' for more details" "$LINENO" 5; } +fi + -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +else + _lt_caught_CXX_error=yes @@ -38429,6 +40439,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX @@ -38446,6 +40457,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do @@ -38519,7 +40531,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi -+if test "${lt_cv_path_LD+set}" = set; then : ++if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then @@ -38559,7 +40571,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -+if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -38585,8 +40597,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -38728,7 +40740,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath__CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int @@ -38741,22 +40759,29 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath__CXX ++fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + @@ -38769,7 +40794,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + else + # Determine the default libpath from the value encoded in an + # empty executable. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath__CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int @@ -38782,22 +40813,29 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath__CXX ++fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, @@ -38840,29 +40878,75 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ;; + + cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX=' ' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=yes ++ file_list_spec_CXX='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' ++ enable_shared_with_static_runtimes_CXX=yes ++ # Don't use ranlib ++ old_postinstall_cmds_CXX='chmod 644 $oldlib' ++ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + + @@ -38968,7 +41052,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ;; + *) + if test "$GXX" = yes; then -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no @@ -39039,10 +41123,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi @@ -39083,9 +41167,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + link_all_deplibs_CXX=yes @@ -39363,7 +41447,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + @@ -39450,9 +41534,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when @@ -39587,6 +41671,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +}; +_LT_EOF + ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -39600,7 +41691,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do -+ case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. @@ -39609,13 +41700,22 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + test $p = "-R"; then + prev=$p + continue -+ else -+ prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. @@ -39635,8 +41735,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. @@ -39672,6 +41774,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi + +$RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +case $host_os in @@ -39772,8 +41875,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then @@ -39877,6 +41978,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ++ ;; + dgux*) + case $cc_basename in + ec++*) @@ -40094,10 +42200,17 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -+ + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if ${lt_cv_prog_compiler_pic_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } ++lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + +# +# Check to make sure the PIC flag actually works. @@ -40105,7 +42218,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +if test -n "$lt_prog_compiler_pic_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : ++if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works_CXX=no @@ -40155,13 +42268,15 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + + ++ ++ +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : ++if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works_CXX=no @@ -40201,7 +42316,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : ++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no @@ -40253,7 +42368,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : ++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no @@ -40332,6 +42447,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + case $host_os in + aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. @@ -40346,15 +42462,20 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" -+ ;; ++ ;; + cygwin* | mingw* | cegcc*) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' ++ ;; ++ esac ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; ++ ;; + esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } @@ -40386,7 +42507,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -+if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then : ++if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* @@ -40617,8 +42738,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + need_version=no + need_lib_prefix=no + -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ @@ -40650,13 +42772,71 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac -+ dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; @@ -40869,7 +43049,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH -+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : ++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no @@ -41214,6 +43394,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC @@ -41224,11 +43405,11 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + @@ -41265,7 +43446,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF @@ -41293,14 +43474,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +fi + + -+# Set default language to C++ -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ +# Check for exceptions switch +# Check whether --enable-exceptions was given. +if test "${enable_exceptions+set}" = set; then : @@ -41668,7 +43841,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Filesystem library is available" >&5 +$as_echo_n "checking whether the Boost::Filesystem library is available... " >&6; } -+if test "${ax_cv_boost_filesystem+set}" = set; then : ++if ${ax_cv_boost_filesystem+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -41712,14 +43885,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_FILESYSTEM /**/" >>confdefs.h + + BN=boost_filesystem -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -41766,7 +43941,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5 +$as_echo_n "checking whether the Boost::System library is available... " >&6; } -+if test "${ax_cv_boost_system+set}" = set; then : ++if ${ax_cv_boost_system+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -41810,13 +43985,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h + + BN=boost_system -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \ -+ $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -41863,7 +44041,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Program_Options library is available" >&5 +$as_echo_n "checking whether the Boost::Program_Options library is available... " >&6; } -+if test "${ax_cv_boost_program_options+set}" = set; then : ++if ${ax_cv_boost_program_options+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -41873,7 +44051,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int @@ -41906,15 +44084,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS /**/" >>confdefs.h + + BN=boost_program_options -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -41961,7 +44140,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Thread library is available" >&5 +$as_echo_n "checking whether the Boost::Thread library is available... " >&6; } -+if test "${ax_cv_boost_thread+set}" = set; then : ++if ${ax_cv_boost_thread+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42023,16 +44202,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_THREAD /**/" >>confdefs.h + + BN=boost_thread -+ for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt \ -+ $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42079,7 +44258,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::IOStreams library is available" >&5 +$as_echo_n "checking whether the Boost::IOStreams library is available... " >&6; } -+if test "${ax_cv_boost_iostreams+set}" = set; then : ++if ${ax_cv_boost_iostreams+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42092,15 +44271,14 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -+ #include -+ ++ #include +int +main () +{ +std::string input = "Hello World!"; -+ namespace io = boost::iostreams; -+ io::filtering_istream in(boost::make_iterator_range(input)); -+ return 0; ++ namespace io = boost::iostreams; ++ io::filtering_istream in (boost::make_iterator_range(input)); ++ return 0; + + ; + return 0; @@ -42127,15 +44305,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_IOSTREAMS /**/" >>confdefs.h + + BN=boost_iostreams -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42182,7 +44361,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Serialization library is available" >&5 +$as_echo_n "checking whether the Boost::Serialization library is available... " >&6; } -+if test "${ax_cv_boost_serialization+set}" = set; then : ++if ${ax_cv_boost_serialization+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42195,15 +44374,15 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -+ #include -+ #include ++ #include ++ #include + +int +main () +{ +std::ofstream ofs("filename"); -+ boost::archive::text_oarchive oa(ofs); -+ return 0; ++ boost::archive::text_oarchive oa(ofs); ++ return 0; + + ; + return 0; @@ -42230,15 +44409,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_SERIALIZATION /**/" >>confdefs.h + + BN=boost_serialization -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42275,15 +44455,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + done + BN=boost_wserialization -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42330,7 +44511,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Signals library is available" >&5 +$as_echo_n "checking whether the Boost::Signals library is available... " >&6; } -+if test "${ax_cv_boost_signals+set}" = set; then : ++if ${ax_cv_boost_signals+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42375,15 +44556,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_SIGNALS /**/" >>confdefs.h + + BN=boost_signals -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42430,7 +44612,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Date_Time library is available" >&5 +$as_echo_n "checking whether the Boost::Date_Time library is available... " >&6; } -+if test "${ax_cv_boost_date_time+set}" = set; then : ++if ${ax_cv_boost_date_time+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42475,15 +44657,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_DATE_TIME /**/" >>confdefs.h + + BN=boost_date_time -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42530,7 +44713,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Regex library is available" >&5 +$as_echo_n "checking whether the Boost::Regex library is available... " >&6; } -+if test "${ax_cv_boost_regex+set}" = set; then : ++if ${ax_cv_boost_regex+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42573,15 +44756,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_REGEX /**/" >>confdefs.h + + BN=boost_regex -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ -+ $BN-mgw-mt-s $BN-mgw-s \ -+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42629,7 +44813,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Asio library is available" >&5 +$as_echo_n "checking whether the Boost::Asio library is available... " >&6; } -+if test "${ax_cv_boost_asio+set}" = set; then : ++if ${ax_cv_boost_asio+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42680,6 +44864,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_DATE_TIME_LIB}" + BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_REGEX_LIB}" + BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_SERIALIZATION_LIB}" ++ + fi + +# @@ -42702,7 +44887,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Python library is available" >&5 +$as_echo_n "checking whether the Boost::Python library is available... " >&6; } -+if test "${ax_cv_boost_python+set}" = set; then : ++if ${ax_cv_boost_python+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42752,7 +44937,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Mpi library is available" >&5 +$as_echo_n "checking whether the Boost::Mpi library is available... " >&6; } -+if test "${ax_cv_boost_mpi+set}" = set; then : ++if ${ax_cv_boost_mpi+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42796,15 +44981,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +$as_echo "#define HAVE_BOOST_MPI /**/" >>confdefs.h + + BN=boost_mpi -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do -+ ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42853,7 +45039,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Mpi_Python library is available" >&5 +$as_echo_n "checking whether the Boost::Mpi_Python library is available... " >&6; } -+if test "${ax_cv_boost_mpi_python+set}" = set; then : ++if ${ax_cv_boost_mpi_python+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -42899,14 +45085,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + BN=boost_mpi_python +# BN=boost_mpi_python-py25 -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -42964,7 +45152,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::UnitTestFramework library is available" >&5 +$as_echo_n "checking whether the Boost::UnitTestFramework library is available... " >&6; } -+if test "${ax_cv_boost_unit_test_framework+set}" = set; then : ++if ${ax_cv_boost_unit_test_framework+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -43008,14 +45196,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + BN=boost_unit_test_framework + saved_ldflags="${LDFLAGS}" -+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ -+ lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ -+ lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ -+ $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do ++ for ax_lib in \ ++ $BN-mt $BN $BN-$CC-mt $BN-$CC \ ++ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \ ++ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \ ++ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \ ++ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + LDFLAGS="${LDFLAGS} -l$ax_lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name of the Boost::UnitTestFramework library" >&5 +$as_echo_n "checking the name of the Boost::UnitTestFramework library... " >&6; } -+if test "${ax_cv_boost_unit_test_framework+set}" = set; then : ++if ${ax_cv_boost_unit_test_framework+:} false; then : + $as_echo_n "(cached) " >&6 +else + @@ -43261,7 +45451,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_C_LIB''_mysql_store_result" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_store_result in -l$MYSQL_C_LIB" >&5 +$as_echo_n "checking for mysql_store_result in -l$MYSQL_C_LIB... " >&6; } -+if eval "test \"\${$as_ac_Lib+set}\"" = set; then : ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS @@ -43472,8 +45662,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+ -+ #include ++#include +int +main () +{ @@ -43535,8 +45724,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+ -+ #include ++#include +int +main () +{ @@ -43702,7 +45890,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy pg_config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_PG_CONFIG+set}" = set; then : ++if ${ac_cv_path_PG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PG_CONFIG in @@ -43835,7 +46023,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi - fi ++ fi + + + @@ -43878,7 +46066,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy doxygen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_doxygen_ok+set}" = set; then : ++if ${ac_cv_prog_doxygen_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$doxygen_ok"; then @@ -43916,7 +46104,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy latex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_latex_ok+set}" = set; then : ++if ${ac_cv_prog_latex_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$latex_ok"; then @@ -43954,7 +46142,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy dvips; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_dvips_ok+set}" = set; then : ++if ${ac_cv_prog_dvips_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$dvips_ok"; then @@ -43992,7 +46180,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy gs; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_gs_ok+set}" = set; then : ++if ${ac_cv_prog_gs_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$gs_ok"; then @@ -44035,7 +46223,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_PERL+set}" = set; then : ++if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PERL in @@ -44087,7 +46275,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy diff; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_diff_ok+set}" = set; then : ++if ${ac_cv_prog_diff_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$diff_ok"; then @@ -44125,7 +46313,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +set dummy sed; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_sed_ok+set}" = set; then : ++if ${ac_cv_prog_sed_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$sed_ok"; then @@ -44176,7 +46364,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44288,7 +46476,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -+if test "${ac_cv_header_time+set}" = set; then : ++if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44417,10 +46605,21 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && ++ if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} -+ cat confcache >$cache_file ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -44512,7 +46711,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + -+: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -44613,6 +46812,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. ++as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -44920,7 +47120,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# values after options handling. +ac_log=" +This file was extended by SOCI $as_me 3.0.0, which was -+generated by GNU Autoconf 2.66. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS @@ -44986,7 +47186,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +SOCI config.status 3.0.0 -+configured by $0, generated by GNU Autoconf 2.66, ++configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2010 Free Software Foundation, Inc. @@ -45007,11 +47207,16 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +while test $# != 0 +do + case $1 in -+ --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 @@ -45033,6 +47238,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; @@ -45136,13 +47342,20 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' ++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' ++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -45157,14 +47370,17 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' ++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' ++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -45197,12 +47413,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' ++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -45241,8 +47457,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' @@ -45269,12 +47485,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -+fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' ++postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' @@ -45312,8 +47528,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ ++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ ++archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ @@ -45323,12 +47544,14 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++nm_file_list_spec \ +lt_prog_compiler_no_builtin_flag \ -+lt_prog_compiler_wl \ +lt_prog_compiler_pic \ ++lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ ++MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ @@ -45344,7 +47567,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ +hardcode_libdir_separator \ -+fix_srcfile_path \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ @@ -45366,8 +47588,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +reload_flag_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ -+lt_prog_compiler_wl_CXX \ +lt_prog_compiler_pic_CXX \ ++lt_prog_compiler_wl_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ @@ -45379,7 +47601,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_flag_spec_ld_CXX \ +hardcode_libdir_separator_CXX \ -+fix_srcfile_path_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ @@ -45413,6 +47634,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ ++postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ @@ -45427,7 +47649,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ -+prelink_cmds_CXX; do ++prelink_cmds_CXX \ ++postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" @@ -45516,9 +47739,10 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ -+ tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} @@ -45526,12 +47750,13 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. @@ -45553,7 +47778,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + ac_cs_awk_cr=$ac_cr +fi + -+echo 'BEGIN {' >"$tmp/subs1.awk" && ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + @@ -45581,7 +47806,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h @@ -45629,7 +47854,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + @@ -45661,7 +47886,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + @@ -45686,30 +47911,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +s/\n// +s/^[^=]*=[ ]*$// +}' - fi - --mkdir -p build/unix/local --path="build/unix/local/parameters" --rm -f $path --touch $path --for param in $* --do -- echo $param >> $path --done -- --printf 'Trying to find the Tcl interpreter... ' --tcl_found=0 -- --for path in "/usr/bin/tclsh" \ -- "/usr/local/bin/tclsh8.5" \ -- "/usr/local/bin/tclsh8.4" \ -- "/usr/local/bin/tclsh8.3"; do -- if [ -x $path ] -- then -- echo $path > build/unix/local/tcl -- echo $path -- tcl_found=1 -- break ++fi ++ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + @@ -45717,7 +47920,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then -+cat >"$tmp/defines.awk" <<\_ACAWK || ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + @@ -45729,8 +47932,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do -+ ac_t=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_t"; then ++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -45850,7 +48053,7 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + for ac_f + do + case $ac_f in -+ -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. @@ -45875,7 +48078,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} -+ fi + fi +-fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) @@ -45883,9 +48087,31 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac -+ + +-mkdir -p build/unix/local +-path="build/unix/local/parameters" +-rm -f $path +-touch $path +-for param in $* +-do +- echo $param >> $path +-done +- +-printf 'Trying to find the Tcl interpreter... ' +-tcl_found=0 +- +-for path in "/usr/bin/tclsh" \ +- "/usr/local/bin/tclsh8.5" \ +- "/usr/local/bin/tclsh8.4" \ +- "/usr/local/bin/tclsh8.3"; do +- if [ -x $path ] +- then +- echo $path > build/unix/local/tcl +- echo $path +- tcl_found=1 +- break + case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin" \ ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; @@ -46022,21 +48248,22 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + -+ rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; @@ -46047,20 +48274,20 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -+ } >"$tmp/config.h" \ ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" ++ } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" -+ mv "$tmp/config.h" "$ac_file" \ ++ mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi + else + $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. @@ -46331,19 +48558,42 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP + ++# convert \$build file names to \$host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert \$build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++ +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + -+# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd + ++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++ +# The archiver. +AR=$lt_AR ++ ++# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS + ++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++ +# A symbol stripping program. +STRIP=$lt_STRIP + @@ -46373,6 +48623,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + ++# Specify filename containing input files for \$NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++ +# The name of the directory that contains temporary libtool files. +objdir=$objdir + @@ -46382,6 +48638,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + ++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++ +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL + @@ -46496,12 +48755,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + @@ -46588,9 +48847,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path -+ +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols + @@ -46606,6 +48862,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + ++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++ +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + @@ -46652,210 +48911,169 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $* )) -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" + -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} + ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} + -+# sed scripts: -+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[^=]*=//' ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -+} + -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} + -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$@"` -+} ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -+} ++fi + -+_LT_EOF -+esac ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" + -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$1+=\$2" -+} -+_LT_EOF -+ ;; -+ *) -+ cat << \_LT_EOF >> "$cfgfile" ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: + -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$1=\$$1\$2" -+} + -+_LT_EOF -+ ;; -+ esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi + -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) + -+ mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + @@ -46883,12 +49101,12 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX + ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX ++ +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + @@ -46975,9 +49193,6 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX + -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path_CXX -+ +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + @@ -46993,6 +49208,9 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_CXX + ++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds_CXX ++ +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX + @@ -47142,8 +49360,8 @@ diff -Nur soci-3.0.0_4-pack/configure soci-3.0.0_trep300/configure +" diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac --- soci-3.0.0_4-pack/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/configure.ac 2011-02-08 22:39:34.000000000 +0100 -@@ -0,0 +1,397 @@ ++++ soci-3.0.0_trep300/configure.ac 2011-07-03 18:24:50.000000000 +0200 +@@ -0,0 +1,398 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- +AC_PREREQ(2.59) @@ -47189,6 +49407,10 @@ diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac + ;; +esac + ++# Set default language to C++ ++AC_LANG([C++]) ++AC_LANG_CPLUSPLUS ++ +# Checks for programs +save_CXXFLAGS="$CXXFLAGS" +AC_PROG_CXX @@ -47199,9 +49421,6 @@ diff -Nur soci-3.0.0_4-pack/configure.ac soci-3.0.0_trep300/configure.ac +AC_PROG_LN_S +AC_PROG_MAKE_SET + -+# Set default language to C++ -+AC_LANG([C++]) -+ +# Check for exceptions switch +AC_ARG_ENABLE(exceptions, + [AS_HELP_STRING([--enable-exceptions], @@ -47563,8 +49782,8 @@ diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.am soci-3.0.0_trep300/doc/back +#pkgdatadir = $(html_bck_sources) diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/backends/Makefile.in --- soci-3.0.0_4-pack/doc/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/backends/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,628 @@ ++++ soci-3.0.0_trep300/doc/backends/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,632 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -47670,6 +49889,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/back +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -47703,6 +49923,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/back +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -47727,6 +49948,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/back +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -47771,6 +49993,7 @@ diff -Nur soci-3.0.0_4-pack/doc/backends/Makefile.in soci-3.0.0_trep300/doc/back +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -48218,8 +50441,8 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile.am soci-3.0.0_trep300/doc/Makefile.am +EXTRA_DIST = $(EXTRA_DIST_FOR_SOCI_COMPATIBILITY) diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in --- soci-3.0.0_4-pack/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/doc/Makefile.in 2011-02-08 22:39:55.000000000 +0100 -@@ -0,0 +1,631 @@ ++++ soci-3.0.0_trep300/doc/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,635 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -48325,6 +50548,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -48358,6 +50582,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -48382,6 +50607,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -48426,6 +50652,7 @@ diff -Nur soci-3.0.0_4-pack/doc/Makefile.in soci-3.0.0_trep300/doc/Makefile.in +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -48874,7 +51101,7 @@ diff -Nur soci-3.0.0_4-pack/doc/sources.mk soci-3.0.0_trep300/doc/sources.mk +img_local_sources = $(top_srcdir)/doc/structure.png + diff -Nur soci-3.0.0_4-pack/Makefile soci-3.0.0_trep300/Makefile ---- soci-3.0.0_4-pack/Makefile 2011-02-09 00:30:32.600916392 +0100 +--- soci-3.0.0_4-pack/Makefile 2011-07-03 18:55:06.374877281 +0200 +++ soci-3.0.0_trep300/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -build_libs : @@ -48971,8 +51198,8 @@ diff -Nur soci-3.0.0_4-pack/Makefile.common soci-3.0.0_trep300/Makefile.common +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in --- soci-3.0.0_4-pack/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/Makefile.in 2011-02-08 22:39:57.000000000 +0100 -@@ -0,0 +1,920 @@ ++++ soci-3.0.0_trep300/Makefile.in 2011-07-03 18:44:28.000000000 +0200 +@@ -0,0 +1,924 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -49121,6 +51348,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -49154,6 +51382,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -49178,6 +51407,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -49222,6 +51452,7 @@ diff -Nur soci-3.0.0_4-pack/Makefile.in soci-3.0.0_trep300/Makefile.in +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -49903,8 +52134,8 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile.am soci-3.0.0_trep300/man/Makefile.am +EXTRA_DIST = $(man_MANS) diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in --- soci-3.0.0_4-pack/man/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,493 @@ ++++ soci-3.0.0_trep300/man/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,497 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -49994,6 +52225,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -50027,6 +52259,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -50051,6 +52284,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -50095,6 +52329,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -50400,7 +52635,7 @@ diff -Nur soci-3.0.0_4-pack/man/Makefile.in soci-3.0.0_trep300/man/Makefile.in +.NOEXPORT: diff -Nur soci-3.0.0_4-pack/man/soci-config.1 soci-3.0.0_trep300/man/soci-config.1 --- soci-3.0.0_4-pack/man/soci-config.1 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/man/soci-config.1 2009-04-16 19:37:09.000000000 +0200 ++++ soci-3.0.0_trep300/man/soci-config.1 2011-02-09 01:01:44.000000000 +0100 @@ -0,0 +1,39 @@ +.TH SOCI 1 "28 March 2009" +.SH NAME @@ -50456,8 +52691,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.am soci-3.0.0_trep300/soci/ba +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/backends/Makefile.in --- soci-3.0.0_4-pack/soci/backends/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,616 @@ ++++ soci-3.0.0_trep300/soci/backends/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,620 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -50563,6 +52798,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/ba +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -50596,6 +52832,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/ba +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -50620,6 +52857,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/ba +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -50664,6 +52902,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/Makefile.in soci-3.0.0_trep300/soci/ba +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -51105,7 +53344,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.am soci-3.0.0_trep300/s +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2011-02-09 00:30:32.599916373 +0100 +--- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic 2011-07-03 18:55:06.414877071 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -51207,8 +53446,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.basic soci-3.0.0_trep30 - rm -f libsoci_mysql.a libsoci_mysql.so diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,897 @@ ++++ soci-3.0.0_trep300/soci/backends/mysql/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,901 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -51396,6 +53635,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/s +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -51429,6 +53669,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/s +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -51453,6 +53694,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/s +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -51497,6 +53739,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/Makefile.in soci-3.0.0_trep300/s +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -52147,7 +54390,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.am soci-3.0.0_trep + +#nodist_pkginclude_HEADERS = $(mysql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2011-02-09 00:30:32.599916373 +0100 +--- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic 2011-07-03 18:55:06.411877086 +0200 +++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variables are specific to this backend and their correct @@ -52174,8 +54417,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.basic soci-3.0.0_t - rm -f test-mysql diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,557 @@ ++++ soci-3.0.0_trep300/soci/backends/mysql/test/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,561 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -52266,6 +54509,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -52299,6 +54543,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -52323,6 +54568,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -52367,6 +54613,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/mysql/test/Makefile.in soci-3.0.0_trep +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -52771,7 +55018,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.am soci-3.0.0_trep300/ +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2011-02-09 00:30:32.598916355 +0100 +--- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic 2011-07-03 18:55:06.408877103 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -52871,8 +55118,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.basic soci-3.0.0_trep3 - rm -f *.o libsoci_oracle.a libsoci_oracle.so diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,902 @@ ++++ soci-3.0.0_trep300/soci/backends/oracle/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,906 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -53060,6 +55307,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -53093,6 +55341,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -53117,6 +55366,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -53161,6 +55411,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/Makefile.in soci-3.0.0_trep300/ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -53820,7 +56071,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.am soci-3.0.0_tre + +#nodist_pkginclude_HEADERS = $(oracle_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2011-02-09 00:30:32.597916336 +0100 +--- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic 2011-07-03 18:55:06.404877123 +0200 +++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -53848,8 +56099,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.basic soci-3.0.0_ - rm -f *.o test-oracle diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,561 @@ ++++ soci-3.0.0_trep300/soci/backends/oracle/test/Makefile.in 2011-07-03 18:44:28.000000000 +0200 +@@ -0,0 +1,565 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -53943,6 +56194,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_tre +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -53976,6 +56228,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_tre +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -54000,6 +56253,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_tre +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -54044,6 +56298,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/oracle/test/Makefile.in soci-3.0.0_tre +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -54452,7 +56707,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.am soci-3.0.0_trep +endif +pkgincludedir = $(soci_include_dir) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2011-02-09 00:30:32.596916317 +0100 +--- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic 2011-07-03 18:55:06.402877133 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -54552,8 +56807,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.basic soci-3.0.0_t - rm -f libsoci_postgresql.a libsoci_postgresql.so diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2011-02-08 22:39:57.000000000 +0100 -@@ -0,0 +1,903 @@ ++++ soci-3.0.0_trep300/soci/backends/postgresql/Makefile.in 2011-07-03 18:44:28.000000000 +0200 +@@ -0,0 +1,907 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -54744,6 +56999,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -54777,6 +57033,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -54801,6 +57058,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -54845,6 +57103,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/Makefile.in soci-3.0.0_trep +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -55498,7 +57757,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.am soci-3.0.0 + +#nodist_pkginclude_HEADERS = $(postgresql_test_h_sources) diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic ---- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2011-02-09 00:30:32.595916298 +0100 +--- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic 2011-07-03 18:55:06.399877150 +0200 +++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# The following variable is specific to this backend and its correct @@ -55525,8 +57784,8 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.basic soci-3. - rm -f test-postgresql diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in --- soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2011-02-08 22:39:57.000000000 +0100 -@@ -0,0 +1,558 @@ ++++ soci-3.0.0_trep300/soci/backends/postgresql/test/Makefile.in 2011-07-03 18:44:28.000000000 +0200 +@@ -0,0 +1,562 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -55618,6 +57877,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0 +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -55651,6 +57911,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0 +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -55675,6 +57936,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0 +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -55719,6 +57981,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/Makefile.in soci-3.0.0 +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -56093,7 +58356,7 @@ diff -Nur soci-3.0.0_4-pack/soci/backends/postgresql/test/sources.mk soci-3.0.0_ +postgresql_test_cc_sources = $(top_srcdir)/soci/backends/postgresql/test/test-postgresql.cpp diff -Nur soci-3.0.0_4-pack/soci/config.h.in soci-3.0.0_trep300/soci/config.h.in --- soci-3.0.0_4-pack/soci/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/config.h.in 2011-02-08 22:39:54.000000000 +0100 ++++ soci-3.0.0_trep300/soci/config.h.in 2011-07-03 18:44:26.000000000 +0200 @@ -0,0 +1,158 @@ +/* soci/config.h.in. Generated from configure.ac by autoheader. */ + @@ -56287,7 +58550,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.am soci-3.0.0_trep300/soci/core/M +pkgincludedir = $(soci_include_dir) + diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/core/Makefile.basic ---- soci-3.0.0_4-pack/soci/core/Makefile.basic 2011-02-09 00:30:32.592916242 +0100 +--- soci-3.0.0_4-pack/soci/core/Makefile.basic 2011-07-03 18:55:06.392877187 +0200 +++ soci-3.0.0_trep300/soci/core/Makefile.basic 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -COMPILER = g++ @@ -56368,8 +58631,8 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.basic soci-3.0.0_trep300/soci/cor - rm -f libsoci_core.a libsoci_core.so diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/Makefile.in --- soci-3.0.0_4-pack/soci/core/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/Makefile.in 2011-02-08 22:39:57.000000000 +0100 -@@ -0,0 +1,995 @@ ++++ soci-3.0.0_trep300/soci/core/Makefile.in 2011-07-03 18:44:28.000000000 +0200 +@@ -0,0 +1,999 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -56544,6 +58807,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/M +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -56577,6 +58841,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/M +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -56601,6 +58866,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/M +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -56645,6 +58911,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/Makefile.in soci-3.0.0_trep300/soci/core/M +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -57459,8 +59726,8 @@ diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.am soci-3.0.0_trep300/soci/c + diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/core/test/Makefile.in --- soci-3.0.0_4-pack/soci/core/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2011-02-08 22:39:57.000000000 +0100 -@@ -0,0 +1,563 @@ ++++ soci-3.0.0_trep300/soci/core/test/Makefile.in 2011-07-03 18:44:28.000000000 +0200 +@@ -0,0 +1,567 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -57572,6 +59839,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/c +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -57605,6 +59873,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/c +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -57629,6 +59898,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/c +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -57673,6 +59943,7 @@ diff -Nur soci-3.0.0_4-pack/soci/core/test/Makefile.in soci-3.0.0_trep300/soci/c +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -58045,8 +60316,8 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefile.am soci-3.0.0_trep300/soci/Makefile.am +EXTRA_DIST = diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in --- soci-3.0.0_4-pack/soci/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ soci-3.0.0_trep300/soci/Makefile.in 2011-02-08 22:39:56.000000000 +0100 -@@ -0,0 +1,634 @@ ++++ soci-3.0.0_trep300/soci/Makefile.in 2011-07-03 18:44:27.000000000 +0200 +@@ -0,0 +1,638 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + @@ -58152,6 +60423,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ ++BOOST_ASIO_LIB = @BOOST_ASIO_LIB@ +BOOST_CFLAGS = @BOOST_CFLAGS@ +BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ @@ -58185,6 +60457,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ @@ -58209,6 +60482,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MYSQL_CFLAGS = @MYSQL_CFLAGS@ +MYSQL_C_LIB = @MYSQL_C_LIB@ @@ -58253,6 +60527,7 @@ diff -Nur soci-3.0.0_4-pack/soci/Makefile.in soci-3.0.0_trep300/soci/Makefile.in +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/soci.spec b/soci.spec index f5dfc41..b256deb 100644 --- a/soci.spec +++ b/soci.spec @@ -18,7 +18,7 @@ # Name: soci Version: 3.0.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: The database access library for C++ programmers @@ -50,36 +50,36 @@ the C++ standard. %{?with_mysql:%package mysql -Summary: MySQL backend for %{name} +Summary: MySQL back-end for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: mysql-devel >= 5.0 %description mysql -This package contains the MySQL backend for SOCI, i.e., +This package contains the MySQL back-end for SOCI, i.e., dynamic library specific to the MySQL database. If you would like to use SOCI in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql -Summary: PostGreSQL backend for %{name} +Summary: PostGreSQL back-end for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: postgresql-devel >= 7.1 %description postgresql -This package contains the PostGreSQL backend for SOCI, i.e., +This package contains the PostGreSQL back-end for SOCI, i.e., dynamic library specific to the PostGreSQL database. If you would like to use SOCI in your programs with PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle -Summary: Oracle backend for %{name} +Summary: Oracle back-end for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description oracle -This package contains the Oracle backend for SOCI, i.e., +This package contains the Oracle back-end for SOCI, i.e., dynamic library specific to the Oracle database. If you would like to use SOCI in your programs with Oracle, you will need to install %{name}-oracle.} @@ -97,39 +97,39 @@ development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. %{?with_mysql:%package mysql-devel -Summary: MySQL backend for %{name} +Summary: MySQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} Requires: mysql-devel >= 5.0 %description mysql-devel -This package contains the MySQL backend for %{name}, i.e., header +This package contains the MySQL back-end for %{name}, i.e., header files and dynamic libraries specific to the MySQL database. If you would like to develop programs using %{name} and MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql-devel -Summary: PostGreSQL backend for %{name} +Summary: PostGreSQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} Requires: postgresql-devel >= 7.1 %description postgresql-devel -This package contains the PostGreSQL backend for %{name}, i.e., header +This package contains the PostGreSQL back-end for %{name}, i.e., header files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} %{?with_oracle:%package oracle-devel -Summary: Oracle backend for %{name} +Summary: Oracle back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-oracle = %{version}-%{release} %description oracle-devel -This package contains the Oracle backend for %{name}, i.e., header +This package contains the Oracle back-end for %{name}, i.e., header files and dynamic libraries specific to the Oracle database. If you would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} @@ -170,7 +170,7 @@ rm -f src/backends/postgresql/._*.h rm -f doc/._*.html # Rename the source code directory, so that the files (e.g, header -# files) can be exported correctly into {_standard_dir}/%{name} +# files) can be exported correctly into {_standard_dir}/%%{name} mv src %{name} # Apply the buried headers patch @@ -299,6 +299,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 03 2011 Denis Arnaud - 3.0.0-22 +- Now links with the multi-threaded versions of the Boost libraries + * Mon Apr 25 2011 Denis Arnaud - 3.0.0-21 - Rebuild for Boost-1.46.1-2