diff --git a/campcaster/bin/dist.sh b/campcaster/bin/dist.sh index 9ae150da2..2b3b904e6 100755 --- a/campcaster/bin/dist.sh +++ b/campcaster/bin/dist.sh @@ -149,7 +149,7 @@ cxxunit_version=cppunit-1.10.2 cxxunit_tmpdir=$tools_tmpdir/cppunit libodbcxx_dir=$toolsdir/libodbc++ -libodbcxx_version=libodbc++-0.2.3-20050404 +libodbcxx_version=libodbc++-0.2.4pre4 libodbcxx_tmpdir=$tools_tmpdir/libodbc++ xmlrpcxx_dir=$toolsdir/xmlrpc++ diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index e2a079c78..8eddd49d6 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -104,7 +104,7 @@ TOOLS_DIR = ${SRC_DIR}/tools CPPUNIT_DIR = ${TOOLS_DIR}/cppunit CPPUNIT_VERSION = cppunit-1.10.2 LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++ -LIBODBCXX_VERSION = libodbc++-0.2.3-20050404 +LIBODBCXX_VERSION = libodbc++-0.2.4pre4 XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++ XMLRPCXX_VERSION = xmlrpc++-20040713 TAGLIB_DIR = ${TOOLS_DIR}/taglib diff --git a/campcaster/etc/configure.ac b/campcaster/etc/configure.ac index edaae11c3..f46b5c799 100644 --- a/campcaster/etc/configure.ac +++ b/campcaster/etc/configure.ac @@ -372,7 +372,7 @@ AC_MSG_NOTICE( by Campcaster: cppunit 1.10.2 ${COMPILE_CPPUNIT} - libodbc++ 0.2.3 yes + libodbc++ 0.2.4pre4 yes taglib 1.4 yes xmlrpc++ 2004-07-13 yes diff --git a/campcaster/etc/portage/dev-db/libodbc++/Manifest b/campcaster/etc/portage/dev-db/libodbc++/Manifest index d01a40bfe..253540a6a 100644 --- a/campcaster/etc/portage/dev-db/libodbc++/Manifest +++ b/campcaster/etc/portage/dev-db/libodbc++/Manifest @@ -1,6 +1,2 @@ MD5 9dd6a3434f7eaef06fb2956937bbfe2c libodbc++-0.2.3-r2.ebuild 2335 -MD5 178bef12f773384d7586dd35c1ec0125 files/libodbc++-no-thread-dmaccess-mutex-fix.patch 498 -MD5 fe58a608d688d22afe285174f283a89e files/libodbc++-no-namespace-closing-colon.patch 4840 -MD5 398c2a40f5ea13cadbb9c297488ef43f files/libodbc++-0.2.3-to-cvs-20050404.patch 3249529 -MD5 0aab8e76fcf033af346511bb1fef5f90 files/libodbc++-dont-install-some-docs.patch 6037 MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r2 67 diff --git a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-0.2.3-to-cvs-20050404.patch b/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-0.2.3-to-cvs-20050404.patch deleted file mode 100644 index eb1722815..000000000 --- a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-0.2.3-to-cvs-20050404.patch +++ /dev/null @@ -1,72067 +0,0 @@ -diff -Naur libodbc++-0.2.3/acinclude.m4 libodbc++-0.2.3-20050404/acinclude.m4 ---- libodbc++-0.2.3/acinclude.m4 2003-04-06 12:42:36.000000000 +0200 -+++ libodbc++-0.2.3-20050404/acinclude.m4 2003-12-05 11:16:41.000000000 +0100 -@@ -165,6 +165,14 @@ - - if test "x$pthreads_ok" != xyes - then -+# hpux 11 uses macros for pthread_create so test another function -+AC_CHECK_LIB(pthread,pthread_join, -+ pthreads_ok=yes -+ THREAD_LIBS="-lpthread",pthreads_ok=no) -+fi -+ -+if test "x$pthreads_ok" != xyes -+then - - # try libc_r (*BSD) - AC_CHECK_LIB(c_r,pthread_create, -diff -Naur libodbc++-0.2.3/aclocal.m4 libodbc++-0.2.3-20050404/aclocal.m4 ---- libodbc++-0.2.3/aclocal.m4 2003-06-17 12:20:47.000000000 +0200 -+++ libodbc++-0.2.3-20050404/aclocal.m4 2005-04-04 18:21:06.000000000 +0200 -@@ -1,6 +1,6 @@ --# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.7.9 -*- Autoconf -*- - --# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - # Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -178,6 +178,14 @@ - - if test "x$pthreads_ok" != xyes - then -+# hpux 11 uses macros for pthread_create so test another function -+AC_CHECK_LIB(pthread,pthread_join, -+ pthreads_ok=yes -+ THREAD_LIBS="-lpthread",pthreads_ok=no) -+fi -+ -+if test "x$pthreads_ok" != xyes -+then - - # try libc_r (*BSD) - AC_CHECK_LIB(c_r,pthread_create, -@@ -313,7 +321,7 @@ - # This macro actually does too much some checks are only needed if - # your package does certain things. But this isn't really a big deal. - --# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -@@ -331,16 +339,9 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --# serial 8 -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -+# serial 10 - --AC_PREREQ([2.52]) -+AC_PREREQ([2.54]) - - # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow - # the ones we care about. -@@ -366,6 +367,16 @@ - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi - -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) -+ - # Define the identity of the package. - dnl Distinguish between old-style and new-style calls. - m4_ifval([$2], -@@ -373,8 +384,8 @@ - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], - [_AM_SET_OPTIONS([$1])dnl -- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl -- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - - _AM_IF_OPTION([no-define],, - [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -@@ -395,19 +406,41 @@ - # some platforms. - AC_REQUIRE([AC_PROG_AWK])dnl - AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl - - _AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_][CC], -+[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_][CC], -- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_][CXX], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_][CXX], -- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl - ]) - ]) - -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $1 | $1:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+ - # Copyright 2002 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -@@ -428,14 +461,14 @@ - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been - # generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) -+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - - # AM_SET_CURRENT_AUTOMAKE_VERSION - # ------------------------------- - # Call AM_AUTOMAKE_VERSION so it can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.6.3])]) -+ [AM_AUTOMAKE_VERSION([1.7.9])]) - - # Helper functions for option handling. -*- Autoconf -*- - -@@ -721,9 +754,42 @@ - INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# serial 4 -*- Autoconf -*- -+# -*- Autoconf -*- -+# Copyright (C) 2003 Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 1 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) -+ -+# serial 5 -*- Autoconf -*- - --# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -784,18 +850,32 @@ - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ : > sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) -@@ -813,13 +893,20 @@ - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_$1_dependencies_compiler_type=$depmode -- break -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi - fi - done - -@@ -830,6 +917,9 @@ - fi - ]) - AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) - ]) - - -@@ -838,16 +928,8 @@ - # Choose a directory name for dependency files. - # This macro is AC_REQUIREd in _AM_DEPENDENCIES - AC_DEFUN([AM_SET_DEPDIR], --[rm -f .deps 2>/dev/null --mkdir .deps 2>/dev/null --if test -d .deps; then -- DEPDIR=.deps --else -- # MS-DOS does not allow filenames that begin with a dot. -- DEPDIR=_deps --fi --rmdir .deps 2>/dev/null --AC_SUBST([DEPDIR]) -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl - ]) - - -@@ -949,7 +1031,9 @@ - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) - ]) - --# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- -+# Check to see how 'make' treats includes. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -974,8 +1058,9 @@ - AC_DEFUN([AM_MAKE_INCLUDE], - [am_make=${MAKE-make} - cat > confinc << 'END' --doit: -+am__doit: - @echo done -+.PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. - AC_MSG_CHECKING([for style of include used by $am_make]) -@@ -989,7 +1074,7 @@ - # In particular we don't look at `^make:' because GNU make might - # be invoked under some other name (usually "gmake"), in which - # case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -@@ -1003,9 +1088,9 @@ - _am_result=BSD - fi - fi --AC_SUBST(am__include) --AC_SUBST(am__quote) --AC_MSG_RESULT($_am_result) -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) - rm -f confinc confmf - ]) - -@@ -1049,7 +1134,7 @@ - fi - AC_CONFIG_COMMANDS_PRE( - [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([conditional \"$1\" was never defined. -+ AC_MSG_ERROR([conditional "$1" was never defined. - Usually this means the macro was only invoked conditionally.]) - fi])]) - -@@ -1076,67 +1161,66 @@ - - # serial 6 - --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. We must strip everything past the first ":", --# and everything past the last "/". -- --# _AM_DIRNAME(PATH) --# ----------------- --# Like AS_DIRNAME, only do it during macro expansion --AC_DEFUN([_AM_DIRNAME], -- [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, -- m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, -- m4_if(regexp([$1], [^/.*]), -1, -- [.], -- patsubst([$1], [^\(/\).*], [\1])), -- patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), -- patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl --])# _AM_DIRNAME -- -- --# The stamp files are numbered to have different names. --# We could number them on a directory basis, but that's additional --# complications, let's have a unique counter. --m4_define([_AM_STAMP_Count], [0]) -- -+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - --# _AM_STAMP(HEADER) --# ----------------- --# The name of the stamp file for HEADER. --AC_DEFUN([_AM_STAMP], --[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl --AS_ESCAPE(_AM_DIRNAME(patsubst([$1], -- [:.*])))/stamp-h[]_AM_STAMP_Count]) -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -+# serial 47 AC_PROG_LIBTOOL - --# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) --# ------------------------------------------------------------ --# We used to try to get a real timestamp in stamp-h. But the fear is that --# that will cause unnecessary cvs conflicts. --AC_DEFUN([_AM_CONFIG_HEADER], --[# Add the stamp file to the list of files AC keeps track of, --# along with our hook. --AC_CONFIG_HEADERS([$1], -- [# update the timestamp --echo 'timestamp for $1' >"_AM_STAMP([$1])" --$2], -- [$3]) --])# _AM_CONFIG_HEADER -- -- --# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) --# -------------------------------------------------------------- --AC_DEFUN([AM_CONFIG_HEADER], --[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) --])# AM_CONFIG_HEADER - --# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If this macro is not defined by Autoconf, define it here. -+m4_ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [m4_define([AC_PROVIDE_IFELSE], -+ [m4_ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) - --# serial 46 AC_PROG_LIBTOOL - -+# AC_PROG_LIBTOOL -+# --------------- - AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -+ AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [AC_LIBTOOL_CXX], -+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -+ ])]) -+dnl And a similar setup for Fortran 77 support -+ AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [AC_LIBTOOL_F77], -+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -+])]) -+ -+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -+ AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [ifdef([AC_PROG_GCJ], -+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([A][M_PROG_GCJ], -+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([LT_AC_PROG_GCJ], -+ [define([LT_AC_PROG_GCJ], -+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -+])])# AC_PROG_LIBTOOL -+ -+ -+# _AC_PROG_LIBTOOL -+# ---------------- -+AC_DEFUN([_AC_PROG_LIBTOOL], - [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -@@ -1147,10 +1231,13 @@ - - # Prevent multiple expansion - define([AC_PROG_LIBTOOL], []) --]) -+])# _AC_PROG_LIBTOOL - -+ -+# AC_LIBTOOL_SETUP -+# ---------------- - AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.13)dnl -+[AC_PREREQ(2.50)dnl - AC_REQUIRE([AC_ENABLE_SHARED])dnl - AC_REQUIRE([AC_ENABLE_STATIC])dnl - AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -@@ -1160,340 +1247,229 @@ - AC_REQUIRE([AC_PROG_LD])dnl - AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl - AC_REQUIRE([AC_PROG_NM])dnl -+ - AC_REQUIRE([AC_PROG_LN_S])dnl - AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl - -+AC_LIBTOOL_SYS_MAX_CMD_LEN -+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+AC_LIBTOOL_OBJDIR -+ -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - _LT_AC_PROG_ECHO_BACKSLASH --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- AC_PATH_MAGIC -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES - fi - ;; - esac - -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] -+ -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Constants: -+rm="rm -f" -+ -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except M$VC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+AC_CHECK_TOOL(AR, ar, false) - AC_CHECK_TOOL(RANLIB, ranlib, :) - AC_CHECK_TOOL(STRIP, strip, :) - --ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" - --AC_ARG_ENABLE(libtool-lock, -- [ --disable-libtool-lock avoid locking (might break parallel builds)]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --*-*-irix6*) -- # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -- [AC_LANG_SAVE -- AC_LANG_C -- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -- AC_LANG_RESTORE]) -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -+ ;; -+ *) -+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi - --ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], --[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -- AC_CHECK_TOOL(DLLTOOL, dlltool, false) -- AC_CHECK_TOOL(AS, as, false) -- AC_CHECK_TOOL(OBJDUMP, objdump, false) -+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one -- AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, -- [AC_TRY_LINK([], -- [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); -- DllMain (0, 0, 0);], -- [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) -- -- case $host/$CC in -- *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) -- # old mingw systems require "-dll" to link a DLL, while more recent ones -- # require "-mdll" -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -mdll" -- AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, -- [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) -- CFLAGS="$SAVE_CFLAGS" ;; -- *-*-cygwin* | *-*-pw32*) -- # cygwin systems need to pass --dll to the linker, and not link -- # crt.o which will require a WinMain@16 definition. -- lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; -- esac -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC -+ fi - ;; -- ]) - esac - --_LT_AC_LTCONFIG_HACK -- --]) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+enable_win32_dll=yes, enable_win32_dll=no) - --# AC_LIBTOOL_HEADER_ASSERT --# ------------------------ --AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], --[AC_CACHE_CHECK([whether $CC supports assert without backlinking], -- [lt_cv_func_assert_works], -- [case $host in -- *-*-solaris*) -- if test "$GCC" = yes && test "$with_gnu_ld" != yes; then -- case `$CC --version 2>/dev/null` in -- [[12]].*) lt_cv_func_assert_works=no ;; -- *) lt_cv_func_assert_works=yes ;; -- esac -- fi -- ;; -- esac]) -+AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --if test "x$lt_cv_func_assert_works" = xyes; then -- AC_CHECK_HEADERS(assert.h) --fi --])# AC_LIBTOOL_HEADER_ASSERT -+AC_ARG_WITH([pic], -+ [AC_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+test -z "$pic_mode" && pic_mode=default - --# _LT_AC_CHECK_DLFCN --# -------------------- --AC_DEFUN([_LT_AC_CHECK_DLFCN], --[AC_CHECK_HEADERS(dlfcn.h) --])# _LT_AC_CHECK_DLFCN -+# Check if we have a version mismatch between libtool.m4 and ltmain.sh. -+# -+# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. -+# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually -+# calls AC_LIBTOOL_CONFIG and creates libtool. -+# -+_LT_VERSION_CHECK - --# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --# --------------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], --[AC_REQUIRE([AC_CANONICAL_HOST]) --AC_REQUIRE([AC_PROG_NM]) --AC_REQUIRE([AC_OBJEXT]) --# Check for command to grab the raw symbol name followed by C symbol from nm. --AC_MSG_CHECKING([command to parse $NM output]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP - --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] - --# Character class describing NM global symbol codes. --symcode='[[BCDEGRST]]' -+# _LT_VERSION_CHECK -+# ----------------- -+AC_DEFUN([_LT_VERSION_CHECK], -+[AC_MSG_CHECKING([for correct ltmain.sh version]) -+if test -z "$ltmain"; then -+ AC_MSG_RESULT(no) -+ echo -+ echo "*** [Gentoo] sanity check failed! ***" -+ echo "*** \$ltmain is not defined, please check the patch for consistency! ***" -+ echo -+ exit 1 -+fi -+gentoo_lt_version="1.5.10" -+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` -+if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then -+ AC_MSG_RESULT(no) -+ echo -+ echo "*** [Gentoo] sanity check failed! ***" -+ echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***" -+ echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***" -+ echo -+ echo "Please run:" -+ echo -+ echo " libtoolize --copy --force" -+ echo -+ echo "if appropriate, please contact the maintainer of this" -+ echo "package (or your distribution) for help." -+ echo -+ exit 1 -+else -+ AC_MSG_RESULT(yes) -+fi -+])# _LT_VERSION_CHECK - --# Regexp to match symbols that can be accessed directly from C. --sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl - --# Transform an extracted symbol line into a proper C declaration --lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_AC_SYS_COMPILER - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[[BCDT]]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[[ABCDGISTW]]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --irix*) -- symcode='[[BCDEGRST]]' -- ;; --solaris* | sysv5*) -- symcode='[[BDT]]' -- ;; --sysv4) -- symcode='[[DFNSTU]]' -- ;; --esac - --# Handle CRLF in mingw tool chain --opt_cr= --case $host_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac -+# _LT_AC_SYS_LIBPATH_AIX -+# ---------------------- -+# 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. -+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_AC_SYS_LIBPATH_AIX - --# If we're using GNU nm, then use its standard symbol codes. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- symcode='[[ABCDGISTW]]' --fi - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -+# _LT_AC_SHELL_INIT(ARG) -+# ---------------------- -+AC_DEFUN([_LT_AC_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_AC_SHELL_INIT - -- # Write the raw and C identifiers. --lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- rm -f conftest* -- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -- -- # Make sure that we snagged all the symbols we need. -- if egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -- --EOF -- # Now generate the symbol file. -- eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' -- -- cat <> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -- --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr address; --} --lt_preloaded_symbols[[]] = --{ --EOF -- sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr) 0} --}; -- --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$no_builtin_flag" -- if AC_TRY_EVAL(ac_link) && test -s conftest; then -- pipe_works=yes -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&AC_FD_CC -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&AC_FD_CC -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC -- fi -- else -- echo "$progname: failed program was:" >&AC_FD_CC -- cat conftest.$ac_ext >&5 -- fi -- rm -f conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done --]) --global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- global_symbol_to_cdecl= -- global_symbol_to_c_name_address= --else -- global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -- global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" --fi --if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; --then -- AC_MSG_RESULT(failed) --else -- AC_MSG_RESULT(ok) --fi --]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -- --# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR --# --------------------------------- --AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], --[# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac -- PATH_SEPARATOR=$lt_cv_sys_path_separator --fi --])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR - - # _LT_AC_PROG_ECHO_BACKSLASH - # -------------------------- - # Add some code to the start of the generated configure script which - # will find an echo command which doesn't interpret backslashes. - AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], --[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -- -+[_LT_AC_SHELL_INIT([ - # Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} - -@@ -1511,7 +1487,7 @@ - elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : - else -@@ -1523,14 +1499,14 @@ - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then -@@ -1557,8 +1533,9 @@ - # - # So, first we look for a working echo in the user's PATH. - -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -@@ -1567,7 +1544,7 @@ - break - fi - done -- IFS="$save_ifs" -+ IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. -@@ -1640,17 +1617,326 @@ - fi - - AC_SUBST(ECHO) --AC_DIVERT_POP --])# _LT_AC_PROG_ECHO_BACKSLASH -+])])# _LT_AC_PROG_ECHO_BACKSLASH -+ -+ -+# _LT_AC_LOCK -+# ----------- -+AC_DEFUN([_LT_AC_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case "`/usr/bin/file conftest.o`" in -+ *32-bit*) -+ case $host in -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-linux*) -+ # Test if the compiler is 64bit -+ echo 'int i;' > conftest.$ac_ext -+ lt_cv_cc_64bit_output=no -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *"ELF 64"*) -+ lt_cv_cc_64bit_output=yes -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+ ]) -+esac -+ -+need_locks="$enable_libtool_lock" -+ -+])# _LT_AC_LOCK -+ -+ -+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+]) -+ -+if test x"[$]$2" = xyes; then -+ ifelse([$5], , :, [$5]) -+else -+ ifelse([$6], , :, [$6]) -+fi -+])# AC_LIBTOOL_COMPILER_OPTION -+ -+ -+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ------------------------------------------------------------ -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -+[AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ else -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) -+ -+if test x"[$]$2" = xyes; then -+ ifelse([$4], , :, [$4]) -+else -+ ifelse([$5], , :, [$5]) -+fi -+])# AC_LIBTOOL_LINKER_OPTION -+ -+ -+# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# -------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -+[# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* ) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ ;; -+ -+ *) -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+])# AC_LIBTOOL_SYS_MAX_CMD_LEN -+ -+ -+# _LT_AC_CHECK_DLFCN -+# -------------------- -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h)dnl -+])# _LT_AC_CHECK_DLFCN -+ - - # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, - # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) - # ------------------------------------------------------------------ - AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], --[if test "$cross_compiling" = yes; then : -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : - [$4] - else -- AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext </dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s out/conftest.err; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+]) -+])# AC_LIBTOOL_PROG_CC_C_O - --# All known linkers require a `.a' archive for static linking (except M$VC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" --need_locks="$enable_libtool_lock" - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -+# ----------------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -+[AC_REQUIRE([_LT_AC_LOCK])dnl -+ -+hard_links="nottested" -+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o - --if test x"$host" != x"$build"; then -- ac_tool_prefix=${host_alias}- -+# AC_LIBTOOL_OBJDIR -+# ----------------- -+AC_DEFUN([AC_LIBTOOL_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs - else -- ac_tool_prefix= -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs - fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR - --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case $host_os in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` --esac - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- -+# Check hardcoding attributes. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_AC_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -- ;; --esac -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - --if test -n "$RANLIB"; then -+ -+# AC_LIBTOOL_SYS_LIB_STRIP -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -+[striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in -- openbsd*) -- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -- ;; -- *) -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) - ;; - esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi -+])# AC_LIBTOOL_SYS_LIB_STRIP - --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="[$]2" - --AC_MSG_CHECKING([for objdir]) --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_MSG_CHECKING([dynamic linker characteristics]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ 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 - else -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi --rmdir .libs 2>/dev/null --AC_MSG_RESULT($objdir) -- -+need_lib_prefix=unknown -+hardcode_into_libs=no - --AC_ARG_WITH(pic, --[ --with-pic try to use only PIC/non-PIC objects [default=use both]], --pic_mode="$withval", pic_mode=default) --test -z "$pic_mode" && pic_mode=default -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown - --# We assume here that the value for lt_cv_prog_cc_pic will not be cached --# in isolation, and that seeing it set (from the cache) indicates that --# the associated values are set (in the cache) correctly too. --AC_MSG_CHECKING([for $compiler option to produce PIC]) --AC_CACHE_VAL(lt_cv_prog_cc_pic, --[ lt_cv_prog_cc_pic= -- lt_cv_prog_cc_shlib= -- lt_cv_prog_cc_wl= -- lt_cv_prog_cc_static= -- lt_cv_prog_cc_no_builtin= -- lt_cv_prog_cc_can_build_shared=$can_build_shared -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH - -- if test "$GCC" = yes; then -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-static' -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; - -- case $host_os in -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # not sure about C++ programs. -- lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_cv_prog_cc_pic='-fno-common' -- ;; -- cygwin* | mingw* | pw32* | os2*) -- # 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_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_cv_prog_cc_pic=-Kconform_pic -- fi -- ;; -- *) -- lt_cv_prog_cc_pic='-fPIC' -- ;; -- esac -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH - else -- # PORTME Check for PIC flags for the system compiler. -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. - case $host_os in -- aix3* | aix4* | aix5*) -- lt_cv_prog_cc_wl='-Wl,' -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_cv_prog_cc_static='-Bstatic' -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : - else -- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' -+ can_build_shared=no - fi - ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; - -- hpux9* | hpux10* | hpux11*) -- # Is there a better lt_cv_prog_cc_static that works with the bundled CC? -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" -- lt_cv_prog_cc_pic='+Z' -- ;; -- -- irix5* | irix6*) -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- # PIC (with -KPIC) is the default. -- ;; -- -- cygwin* | mingw* | pw32* | os2*) -- # 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_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - -- newsos6) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - -- osf3* | osf4* | osf5*) -- # All OSF/1 code is PIC. -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- ;; -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - -- sco3.2v5*) -- lt_cv_prog_cc_pic='-Kpic' -- lt_cv_prog_cc_static='-dn' -- lt_cv_prog_cc_shlib='-belf' -- ;; -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - -- solaris*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Wl,' -- ;; -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # 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 - -- sunos4*) -- lt_cv_prog_cc_pic='-PIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Qoption ld ' -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- if test "x$host_vendor" = xsni; then -- lt_cv_prog_cc_wl='-LD' -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else -- lt_cv_prog_cc_wl='-Wl,' -- fi -- ;; -- -- uts4*) -- lt_cv_prog_cc_pic='-pic' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_cv_prog_cc_pic='-Kconform_pic' -- lt_cv_prog_cc_static='-Bstatic' -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; -- -- *) -- lt_cv_prog_cc_can_build_shared=no -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -- fi --]) --if test -z "$lt_cv_prog_cc_pic"; then -- AC_MSG_RESULT([none]) --else -- AC_MSG_RESULT([$lt_cv_prog_cc_pic]) -+ ;; - -- # Check to make sure the pic_flag actually works. -- AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works]) -- AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" -- AC_TRY_COMPILE([], [], [dnl -- case $host_os in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then -- # they create non-PIC objects. So, if there were any warnings, we -- # assume that PIC is not supported. -- if test -s conftest.err; then -- lt_cv_prog_cc_pic_works=no -- else -- lt_cv_prog_cc_pic_works=yes -- fi -- ;; -- *) -- lt_cv_prog_cc_pic_works=yes -- ;; -+ linux*) -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; - esac -- ], [dnl -- lt_cv_prog_cc_pic_works=no -- ]) -- CFLAGS="$save_CFLAGS" -- ]) -- -- if test "X$lt_cv_prog_cc_pic_works" = Xno; then -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_can_build_shared=no -- else -- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" -- fi -- -- AC_MSG_RESULT([$lt_cv_prog_cc_pic_works]) --fi -- --# Check for any special shared library compilation flags. --if test -n "$lt_cv_prog_cc_shlib"; then -- AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) -- if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : -- else -- AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) -- lt_cv_prog_cc_can_build_shared=no -- fi --fi -- --AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works]) --AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl -- lt_cv_prog_cc_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" -- AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes]) -- LDFLAGS="$save_LDFLAGS" --]) -- --# Belt *and* braces to stop my trousers falling down: --test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= --AC_MSG_RESULT([$lt_cv_prog_cc_static_works]) -- --pic_flag="$lt_cv_prog_cc_pic" --special_shlib_compile_flags="$lt_cv_prog_cc_shlib" --wl="$lt_cv_prog_cc_wl" --link_static_flag="$lt_cv_prog_cc_static" --no_builtin_flag="$lt_cv_prog_cc_no_builtin" --can_build_shared="$lt_cv_prog_cc_can_build_shared" -- -- --# Check to see if options -o and -c are simultaneously supported by compiler --AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext]) --AC_CACHE_VAL([lt_cv_compiler_c_o], [ --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --echo "int some_variable = 0;" > conftest.$ac_ext --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" --compiler_c_o=no --if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s out/conftest.err; then -- lt_cv_compiler_c_o=no -- else -- lt_cv_compiler_c_o=yes -- fi --else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&AC_FD_CC -- lt_cv_compiler_c_o=no --fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null --]) --compiler_c_o=$lt_cv_compiler_c_o --AC_MSG_RESULT([$compiler_c_o]) -- --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- AC_MSG_CHECKING([if $compiler supports -c -o file.lo]) -- AC_CACHE_VAL([lt_cv_compiler_o_lo], [ -- lt_cv_compiler_o_lo=no -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- save_objext="$ac_objext" -- ac_objext=lo -- AC_TRY_COMPILE([], [int some_variable = 0;], [dnl -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- lt_cv_compiler_o_lo=no -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ $archive_expsym_cmds="$archive_cmds" -+ fi - else -- lt_cv_compiler_o_lo=yes -+ ld_shlibs=no - fi -- ]) -- ac_objext="$save_objext" -- CFLAGS="$save_CFLAGS" -- ]) -- compiler_o_lo=$lt_cv_compiler_o_lo -- AC_MSG_RESULT([$compiler_o_lo]) --else -- compiler_o_lo=no --fi -- --# Check to see if we can do hard links to lock some files if needed --hard_links="nottested" --if test "$compiler_c_o" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- AC_MSG_CHECKING([if we can lock with hard links]) -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- AC_MSG_RESULT([$hard_links]) -- if test "$hard_links" = no; then -- AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe]) -- need_locks=warn -- fi --else -- need_locks=no --fi -+ ;; - --if test "$GCC" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions]) -- echo "int some_variable = 0;" > conftest.$ac_ext -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" -- compiler_rtti_exceptions=no -- AC_TRY_COMPILE([], [int some_variable = 0;], [dnl -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- compiler_rtti_exceptions=no -- else -- compiler_rtti_exceptions=yes -- fi -- ]) -- CFLAGS="$save_CFLAGS" -- AC_MSG_RESULT([$compiler_rtti_exceptions]) -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; - -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -+ if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else -- no_builtin_flag=' -fno-builtin' -+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi --fi -- --# See if the linker supports building shared libraries. --AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries]) -- --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --archive_cmds= --archive_expsym_cmds= --old_archive_from_new_cmds= --old_archive_from_expsyms_cmds= --export_dynamic_flag_spec= --whole_archive_flag_spec= --thread_safe_flag_spec= --hardcode_into_libs=no --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --link_all_deplibs=unknown --always_export_symbols=no --export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' --# include_expsyms should be a list of space-separated symbols to be *always* --# included in the symbol list --include_expsyms= --# exclude_expsyms can be an egrep regular expression of symbols to exclude --# it will be wrapped by ` (' and `)$', so one must not match beginning or --# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', --# as well as any symbol that contains `d'. --exclude_expsyms="_GLOBAL_OFFSET_TABLE_" --# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out --# platforms (ab)use it in PIC code, but their linkers get confused if --# the symbol is explicitly referenced. Since portable code cannot --# rely on this symbol name, it's probably fine to never include it in --# preloaded symbol tables. --extract_expsyms_cmds= -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; - --case $host_os in --cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH - ;; --openbsd*) -- with_gnu_ld=no -+ -+freebsd1*) -+ dynamic_linker=no - ;; --esac - --ld_shlibs=yes --if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+kfreebsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; - -- # See if GNU ld supports shared libraries. -+freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- aix3* | aix4* | aix5*) -- # On AIX, the GNU linker is very broken -- # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. -- ld_shlibs=no -- cat <&2 -- --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -- --EOF -+ freebsd2*) -+ shlibpath_overrides_runpath=yes - ;; -- -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- -- # Samuel A. Falvo II reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can use -- # them. -- ld_shlibs=no -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes - ;; -- -- beos*) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs=no -- fi -+ *) # from 3.2 on -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes - ;; -+ esac -+ ;; - -- cygwin* | mingw* | pw32*) -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec='-L$libdir' -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- -- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ -- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ -- test -f $output_objdir/impgen.exe || (cd $output_objdir && \ -- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ -- else $CC -o impgen impgen.c ; fi)~ -- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' -- -- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' -- -- # cygwin and mingw dlls have different entry points and sets of symbols -- # to exclude. -- # FIXME: what about values for MSVC? -- dll_entry=__cygwin_dll_entry@12 -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ -- case $host_os in -- mingw*) -- # mingw values -- dll_entry=_DllMainCRTStartup@12 -- dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ -- ;; -- esac -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; - -- # mingw and cygwin differ, and it's simplest to just exclude the union -- # of the two symbol sets. -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 -- -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one (in ltdll.c) -- if test "x$lt_cv_need_dllmain" = "xyes"; then -- ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " -- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ -- test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case "$host_cpu" in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else -- ltdll_obj= -- ltdll_cmds= -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi -- -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- # Be careful not to strip the DATA tag left be newer dlltools. -- export_symbols_cmds="$ltdll_cmds"' -- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ -- sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' -- -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is. -- # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname-def; -- else -- echo EXPORTS > $output_objdir/$soname-def; -- _lt_hint=1; -- cat $export_symbols | while read symbol; do -- set dummy \$symbol; -- case \[$]# in -- 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; -- *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; -- esac; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done; -- fi~ -- '"$ltdll_cmds"' -- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ -- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ -- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; - -- solaris* | sysv5*) -- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -- ld_shlibs=no -- cat <&2 -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - --EOF -- elif $LD --help 2>&1 | egrep ': 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' -- else -- ld_shlibs=no -- fi -- ;; -+# This must be Linux ELF. -+linux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi - -- *) -- if $LD --help 2>&1 | egrep ': 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' -- else -- ld_shlibs=no -- fi -+ case $host_cpu:$lt_cv_cc_64bit_output in -+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" -+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" - ;; - esac - -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- case $host_os in -- cygwin* | mingw* | pw32*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -- ;; -- *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -- ;; -- esac -- fi --else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L=yes -- if test "$GCC" = yes && test -z "$link_static_flag"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct=unsupported -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ -+ # Find out which ABI we are using (multilib Linux x86_64 hack). -+ libsuff= -+ case "$host_cpu" in -+ x86_64*) -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ ;; -+ esac - fi -+ rm -rf conftest* - ;; -+ *) -+ ;; -+ esac -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ ;; - -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -+knetbsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- esac -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - -- hardcode_direct=yes -- archive_cmds='' -- hardcode_libdir_separator=':' -- if test "$GCC" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- hardcode_direct=yes -- else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -- fi -+openbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; - esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; - -- shared_flag='-shared' -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- shared_flag='${wl}-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - -- # It seems that -bexpall can do strange things, so it is better to -- # generate a list of symbols to export. -- always_export_symbols=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='-berok' -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' -- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -- else -- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='${wl}-berok' -- # This is a bit strange, but is similar to how AIX traditionally builds -- # it's shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' -- fi -- fi -- ;; -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs=no -- ;; -+sco3.2v5*) -+ version_type=osf -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # 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 -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''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"`' -- ;; -- -- darwin* | rhapsody*) -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- allow_undefined_flag='-undefined suppress' -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH - ;; -- *) # Darwin 1.3 on -- allow_undefined_flag='-flat_namespace -undefined suppress' -+ siemens) -+ need_lib_prefix=no - ;; -- esac -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' -- # We need to add '_' to the symbols in $export_symbols first -- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- whole_archive_flag_spec='-all_load $convenience' -- ;; -- -- freebsd1*) -- ld_shlibs=no -- ;; -- -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; - -- hpux9* | hpux10* | hpux11*) -- case $host_os in -- hpux9*) 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' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; - -- irix5* | irix6*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -+*) -+ dynamic_linker=no -+ ;; -+esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no -+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; - -- newsos6) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_shlibpath_var=no -- ;; -+# _LT_AC_TAGCONFIG -+# ---------------- -+AC_DEFUN([_LT_AC_TAGCONFIG], -+[AC_ARG_WITH([tags], -+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -+ [include additional configurations @<:@automatic@:>@])], -+ [tagnames="$withval"]) -+ -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ AC_MSG_WARN([output file `$ofile' does not exist]) -+ fi - -- openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else -- case "$host_os" in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -- esac -+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi -- ;; -+ fi - -- os2*) -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -+ "") ;; -+ *) AC_MSG_ERROR([invalid tag name: $tagname]) -+ ;; -+ esac - -- osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; - -- 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" && echo ${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 \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -- -- #Both c and cxx compiler support -rpath directly -- hardcode_libdir_flag_spec='-rpath $libdir' -- fi -- hardcode_libdir_separator=: -- ;; -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_LIBTOOL_LANG_CXX_CONFIG -+ else -+ tagname="" -+ fi -+ ;; - -- sco3.2v5*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- ;; -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ AC_LIBTOOL_LANG_F77_CONFIG -+ else -+ tagname="" -+ fi -+ ;; - -- solaris*) -- # gcc --version < 3.0 without binutils cannot create self contained -- # shared libraries reliably, requiring libgcc.a to resolve some of -- # the object symbols generated in some cases. Libraries that use -- # assert need libgcc.a to resolve __eprintf, for example. Linking -- # a copy of libgcc.a into every shared library to guarantee resolving -- # such symbols causes other problems: According to Tim Van Holder -- # , C++ libraries end up with a separate -- # (to the application) exception stack for one thing. -- no_undefined_flag=' -z defs' -- if test "$GCC" = yes; then -- case `$CC --version 2>/dev/null` in -- [[12]].*) -- cat <&2 -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ AC_LIBTOOL_LANG_GCJ_CONFIG -+ else -+ tagname="" -+ fi -+ ;; - --*** Warning: Releases of GCC earlier than version 3.0 cannot reliably --*** create self contained shared libraries on Solaris systems, without --*** introducing a dependency on libgcc.a. Therefore, libtool is disabling --*** -no-undefined support, which will at least allow you to build shared --*** libraries. However, you may find that when you link such libraries --*** into an application without using GCC, you have to manually add --*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to --*** upgrade to a newer version of GCC. Another option is to rebuild your --*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. -+ RC) -+ AC_LIBTOOL_LANG_RC_CONFIG -+ ;; - --EOF -- no_undefined_flag= -+ *) -+ AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac -- fi -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_shlibpath_var=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- esac -- link_all_deplibs=yes -- ;; - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" - fi -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -- -- sysv4) -- if test "x$host_vendor" = xsno; then -- archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -- else -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -- -- sysv4.3*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- export_dynamic_flag_spec='-Bexport' -- ;; -- -- sysv5*) -- no_undefined_flag=' -z text' -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec= -- hardcode_shlibpath_var=no -- runpath_var='LD_RUN_PATH' -- ;; -- -- uts4*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -+ done -+ IFS="$lt_save_ifs" - -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ld_shlibs=yes -- fi -- ;; -- -- sysv4.2uw2*) -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=no -- hardcode_shlibpath_var=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -- -- sysv5uw7* | unixware7*) -- no_undefined_flag='${wl}-z ${wl}text' -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -- -- *) -- ld_shlibs=no -- ;; -- esac --fi --AC_MSG_RESULT([$ld_shlibs]) --test "$ld_shlibs" = no && can_build_shared=no -- --# Check hardcoding attributes. --AC_MSG_CHECKING([how to hardcode library paths into programs]) --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var"; then -- -- # We can hardcode non-existant directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$hardcode_shlibpath_var" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" - else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -+ rm -f "${ofile}T" -+ AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported - fi --AC_MSG_RESULT([$hardcode_action]) -+])# _LT_AC_TAGCONFIG - --striplib= --old_striplib= --AC_MSG_CHECKING([whether stripping libraries is possible]) --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- AC_MSG_RESULT([yes]) --else -- AC_MSG_RESULT([no]) --fi - --reload_cmds='$LD$reload_flag -o $output$reload_objs' --test -z "$deplibs_check_method" && deplibs_check_method=unknown -+# AC_LIBTOOL_DLOPEN -+# ----------------- -+# enable checks for dlopen support -+AC_DEFUN([AC_LIBTOOL_DLOPEN], -+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_DLOPEN - --# PORTME Fill in your ld.so characteristics --AC_MSG_CHECKING([dynamic linker characteristics]) --library_names_spec= --libname_spec='lib$name' --soname_spec= --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix $libname.a' -- shlibpath_var=LIBPATH -+# AC_LIBTOOL_WIN32_DLL -+# -------------------- -+# declare package support for building win32 dll's -+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_WIN32_DLL - -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -- ;; - --aix4* | aix5*) -- version_type=linux -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[[01]] | aix4.[[01]].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -+# AC_ENABLE_SHARED([DEFAULT]) -+# --------------------------- -+# implement the --enable-shared flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_SHARED], -+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([shared], -+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes - fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can -- # not hardcode correct soname into executable. Probably we can -- # add versioning support to collect2, so additional links can -- # be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib.so -- # instead of lib.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}.so$major' -- fi -- shlibpath_var=LIBPATH -- fi -- ;; -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -+])# AC_ENABLE_SHARED - --amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -- ;; - --beos*) -- library_names_spec='${libname}.so' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- ;; -+# AC_DISABLE_SHARED -+# ----------------- -+#- set the default shared flag to --disable-shared -+AC_DEFUN([AC_DISABLE_SHARED], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_SHARED(no) -+])# AC_DISABLE_SHARED - --bsdi4*) -- version_type=linux -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; - --cygwin* | mingw* | pw32*) -- version_type=windows -- need_version=no -- need_lib_prefix=no -- case $GCC,$host_os in -- yes,cygwin*) -- library_names_spec='$libname.dll.a' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' -- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog .libs/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $rm \$dlpath' -- ;; -- yes,mingw*) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` -- ;; -- yes,pw32*) -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- ;; -- *) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; -+# AC_ENABLE_STATIC([DEFAULT]) -+# --------------------------- -+# implement the --enable-static flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_STATIC], -+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([static], -+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]AC_ENABLE_STATIC_DEFAULT) -+])# AC_ENABLE_STATIC - --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -- soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- ;; - --freebsd1*) -- dynamic_linker=no -- ;; -+# AC_DISABLE_STATIC -+# ----------------- -+# set the default static flag to --disable-static -+AC_DEFUN([AC_DISABLE_STATIC], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_STATIC(no) -+])# AC_DISABLE_STATIC - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -- version_type=freebsd-$objformat -- case $version_type in -- freebsd-elf*) -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -+ -+# AC_ENABLE_FAST_INSTALL([DEFAULT]) -+# --------------------------------- -+# implement the --enable-fast-install flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_FAST_INSTALL], -+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([fast-install], -+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" - ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- *) -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- esac -- ;; -+ esac], -+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -+])# AC_ENABLE_FAST_INSTALL - --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- ;; - --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- dynamic_linker="$host_os dld.sl" -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -- ;; -+# AC_DISABLE_FAST_INSTALL -+# ----------------------- -+# set the default to --disable-fast-install -+AC_DEFUN([AC_DISABLE_FAST_INSTALL], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_FAST_INSTALL(no) -+])# AC_DISABLE_FAST_INSTALL - --irix5* | irix6*) -- version_type=irix -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' -- case $host_os in -- irix5*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- ;; - --# No shared lib support for Linux oldld, aout, or coff. --linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -- dynamic_linker=no -- ;; -+# AC_LIBTOOL_PICMODE([MODE]) -+# -------------------------- -+# implement the --with-pic flag -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+AC_DEFUN([AC_LIBTOOL_PICMODE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+pic_mode=ifelse($#,1,$1,default) -+])# AC_LIBTOOL_PICMODE - --# This must be Linux ELF. --linux-gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes - -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -+# AC_PROG_EGREP -+# ------------- -+# This is predefined starting with Autoconf 2.54, so this conditional -+# definition can be removed once we require Autoconf 2.54 or later. -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi]) -+ EGREP=$ac_cv_prog_egrep -+ AC_SUBST([EGREP]) -+])]) - --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -+ -+# AC_PATH_TOOL_PREFIX -+# ------------------- -+# find a file program which can recognise shared library -+AC_DEFUN([AC_PATH_TOOL_PREFIX], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="ifelse([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 - --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+])# AC_PATH_TOOL_PREFIX - --openbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case "$host_os" in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ -+# AC_PATH_MAGIC -+# ------------- -+# find a file program which can recognise a shared library -+AC_DEFUN([AC_PATH_MAGIC], -+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else -- shlibpath_overrides_runpath=yes -+ MAGIC_CMD=: - fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+fi -+])# AC_PATH_MAGIC - --os2*) -- libname_spec='$name' -- need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; - --osf3* | osf4* | osf5*) -- version_type=osf -- need_version=no -- soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -+# AC_PROG_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([AC_PROG_LD], -+[AC_ARG_WITH([gnu-ld], -+ [AC_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no]) -+AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some GNU ld's only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; -+ -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case "$host_cpu" in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; -+ *) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ ;; -+ esac -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -+ fi -+ ;; -+ -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; -+ -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; -+ -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; -+ -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sco3.2v5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac -+ ;; -+ -+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac -+]) -+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 -+])# AC_DEPLIBS_CHECK_METHOD -+ -+ -+# AC_PROG_NM -+# ---------- -+# find the pathname to a BSD-compatible name lister -+AC_DEFUN([AC_PROG_NM], -+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/${ac_tool_prefix}nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+fi]) -+NM="$lt_cv_path_NM" -+])# AC_PROG_NM -+ -+ -+# AC_CHECK_LIBM -+# ------------- -+# check for math library -+AC_DEFUN([AC_CHECK_LIBM], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it -+ ;; -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ ;; -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") -+ ;; -+esac -+])# AC_CHECK_LIBM -+ -+ -+# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl convenience library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -+# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and -+# top_srcdir appropriately in the Makefiles. -+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ case $enable_ltdl_convenience in -+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -+ "") enable_ltdl_convenience=yes -+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -+ esac -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_CONVENIENCE -+ -+ -+# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl installable library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-install to the configure arguments. Note that LIBLTDL -+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -+# DIRECTORY is not provided and an installed libltdl is not found, it is -+# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -+# quotes!). If your package is not flat and you're not using automake, -+# define top_builddir and top_srcdir appropriately in the Makefiles. -+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ AC_CHECK_LIB(ltdl, lt_dlinit, -+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -+ [if test x"$enable_ltdl_install" = xno; then -+ AC_MSG_WARN([libltdl not installed, but installation disabled]) -+ else -+ enable_ltdl_install=yes -+ fi -+ ]) -+ if test x"$enable_ltdl_install" = x"yes"; then -+ ac_configure_args="$ac_configure_args --enable-ltdl-install" -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ else -+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -+ LIBLTDL="-lltdl" -+ LTDLINCL= -+ fi -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_INSTALLABLE -+ -+ -+# AC_LIBTOOL_CXX -+# -------------- -+# enable support for C++ libraries -+AC_DEFUN([AC_LIBTOOL_CXX], -+[AC_REQUIRE([_LT_AC_LANG_CXX]) -+])# AC_LIBTOOL_CXX -+ -+ -+# _LT_AC_LANG_CXX -+# --------------- -+AC_DEFUN([_LT_AC_LANG_CXX], -+[AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -+])# _LT_AC_LANG_CXX -+ -+# _LT_AC_PROG_CXXCPP -+# --------------- -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+fi -+])# _LT_AC_PROG_CXXCPP -+ -+# AC_LIBTOOL_F77 -+# -------------- -+# enable support for Fortran 77 libraries -+AC_DEFUN([AC_LIBTOOL_F77], -+[AC_REQUIRE([_LT_AC_LANG_F77]) -+])# AC_LIBTOOL_F77 -+ -+ -+# _LT_AC_LANG_F77 -+# --------------- -+AC_DEFUN([_LT_AC_LANG_F77], -+[AC_REQUIRE([AC_PROG_F77]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -+])# _LT_AC_LANG_F77 -+ -+ -+# AC_LIBTOOL_GCJ -+# -------------- -+# enable support for GCJ libraries -+AC_DEFUN([AC_LIBTOOL_GCJ], -+[AC_REQUIRE([_LT_AC_LANG_GCJ]) -+])# AC_LIBTOOL_GCJ -+ -+ -+# _LT_AC_LANG_GCJ -+# --------------- -+AC_DEFUN([_LT_AC_LANG_GCJ], -+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -+])# _LT_AC_LANG_GCJ -+ -+ -+# AC_LIBTOOL_RC -+# -------------- -+# enable support for Windows resource files -+AC_DEFUN([AC_LIBTOOL_RC], -+[AC_REQUIRE([LT_AC_PROG_RC]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -+])# AC_LIBTOOL_RC -+ -+ -+# AC_LIBTOOL_LANG_C_CONFIG -+# ------------------------ -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -+AC_DEFUN([_LT_AC_LANG_C_CONFIG], -+[lt_save_CC="$CC" -+AC_LANG_PUSH(C) -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}\n' -+ -+_LT_AC_SYS_COMPILER -+ -+# -+# Check for any special shared library compilation flags. -+# -+_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -+if test "$GCC" = no; then -+ case $host_os in -+ sco3.2v5*) -+ _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' -+ ;; -+ esac -+fi -+if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then -+ AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) -+ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : -+ else -+ AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) -+ _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no -+ fi -+fi -+ -+ -+# -+# Check to make sure the static flag actually works. -+# -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], -+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), -+ [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+ -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF($1) -+ -+# Report which librarie types wil actually be built -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) -+ -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case "$host_os" in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+AC_MSG_RESULT([$enable_shared]) -+ -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_C_CONFIG -+ -+ -+# AC_LIBTOOL_LANG_CXX_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -+[AC_LANG_PUSH(C++) -+AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+ -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Dependencies to place before and after the object being linked: -+_LT_AC_TAGVAR(predep_objects, $1)= -+_LT_AC_TAGVAR(postdep_objects, $1)= -+_LT_AC_TAGVAR(predeps, $1)= -+_LT_AC_TAGVAR(postdeps, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+ -+# Source file extension for C++ test sources. -+ac_ext=cc -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+ -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+else -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+fi -+ -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ AC_PROG_LD -+ -+ # 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+fi -+ -+# PORTME: fill in a description of your system's C++ link characteristics -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+_LT_AC_TAGVAR(ld_shlibs, $1)=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ esac -+ shared_flag='-shared' -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_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. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # -bexpall does not export symbols beginning with underscore (_) -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds it's shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_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}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ case "$host_os" in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case "$cc_basename" in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ freebsd[12]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ freebsd-elf*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ freebsd* | kfreebsd*-gnu) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${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' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_AC_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' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ case "$host_cpu" in -+ hppa*64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case "$host_cpu" in -+ hppa*64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC) -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case "$host_cpu" in -+ ia64*|hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' -+ ;; -+ *) -+ _LT_AC_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' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC) -+ # SGI C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ linux*) -+ case $cc_basename in -+ KCC) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ cxx) -+ # Compaq C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ esac -+ ;; -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ -+ ;; -+ RCC) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ sco*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ case $cc_basename in -+ CC) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The C++ compiler is used as linker so we must use $wl -+ # flag to pass the commands to the underlying system -+ # linker. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_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' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -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 -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ fi -+ ;; -+ esac -+ ;; -+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+esac -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+_LT_AC_TAGVAR(GCC, $1)="$GXX" -+_LT_AC_TAGVAR(LD, $1)="$LD" -+ -+AC_LIBTOOL_POSTDEP_PREDEP($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF($1) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+])# AC_LIBTOOL_LANG_CXX_CONFIG -+ -+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -+# ------------------------ -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext - -- if AC_TRY_EVAL(ac_compile); then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_cv_prog_cc_wl -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -- then -- lt_cv_archive_cmds_need_lc=no -- else -- lt_cv_archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi]) -- AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc]) -- ;; -- esac --fi --need_lc=${lt_cv_archive_cmds_need_lc-yes} -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_F77_CONFIG -+ -+ -+# AC_LIBTOOL_LANG_GCJ_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -+[AC_LANG_SAVE -+ -+# Source file extension for Java test sources. -+ac_ext=java -+ -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF($1) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_GCJ_CONFIG -+ - --# The second clause should only fire when bootstrapping the -+# AC_LIBTOOL_LANG_RC_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the Windows resource compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -+AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -+[AC_LANG_SAVE -+ -+# Source file extension for RC test sources. -+ac_ext=rc -+ -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_RC_CONFIG -+ -+ -+# AC_LIBTOOL_CONFIG([TAGNAME]) -+# ---------------------------- -+# If TAGNAME is not passed, then create an initial libtool script -+# with a default configuration from the untagged config vars. Otherwise -+# add code to config.status for appending the configuration named by -+# TAGNAME from the matching tagged config vars. -+AC_DEFUN([AC_LIBTOOL_CONFIG], -+[# The else clause should only fire when bootstrapping the - # libtool distribution, otherwise you forgot to ship ltmain.sh - # with your package, and you will get complaints that there are - # no rules to generate ltmain.sh. - if test -f "$ltmain"; then -- : --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- test -f Makefile && make "$ltmain" --fi -- --if test -f "$ltmain"; then -- trap "$rm \"${ofile}T\"; exit 1" 1 2 15 -- $rm -f "${ofile}T" -- -- echo creating $ofile -- -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS \ -- AR AR_FLAGS CC LD LN_S NM SHELL \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ -- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ -- old_striplib striplib file_magic_cmd export_symbols_cmds \ -- deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- global_symbol_to_c_name_address \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -+ old_postinstall_cmds old_postuninstall_cmds \ -+ _LT_AC_TAGVAR(compiler, $1) \ -+ _LT_AC_TAGVAR(CC, $1) \ -+ _LT_AC_TAGVAR(LD, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -+ _LT_AC_TAGVAR(predep_objects, $1) \ -+ _LT_AC_TAGVAR(postdep_objects, $1) \ -+ _LT_AC_TAGVAR(predeps, $1) \ -+ _LT_AC_TAGVAR(postdeps, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(archive_cmds, $1) \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(postinstall_cmds, $1) \ -+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(no_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -+ _LT_AC_TAGVAR(hardcode_automatic, $1) \ -+ _LT_AC_TAGVAR(module_cmds, $1) \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -+ _LT_AC_TAGVAR(exclude_expsyms, $1) \ -+ _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; -@@ -3533,14 +5185,31 @@ - esac - done - -- cat <<__EOF__ > "${ofile}T" --#! $SHELL -+ case $lt_echo in -+ *'\[$]0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -+ ;; -+ esac -+ -+ifelse([$1], [], -+ [cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ AC_MSG_NOTICE([creating $ofile])], -+ [cfgfile="$ofile"]) -+ -+ cat <<__EOF__ >> "$cfgfile" -+ifelse([$1], [], -+[#! $SHELL - --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996-2000 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: - # Originally by Gordon Matzigkeit , 1996 - # - # This program is free software; you can redistribute it and/or modify -@@ -3562,14 +5231,21 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+# A sed program that does not truncate output. -+SED=$lt_SED -+ - # Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="sed -e s/^X//" -+Xsed="$SED -e s/^X//" - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# The names of the tagged configurations supported by this script. -+available_tags= - --# ### BEGIN LIBTOOL CONFIG -+# ### BEGIN LIBTOOL CONFIG], -+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - - # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -@@ -3583,7 +5259,10 @@ - build_old_libs=$enable_static - - # Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$need_lc -+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install -@@ -3599,14 +5278,20 @@ - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS - --# The default C compiler. --CC=$lt_CC -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# A language-specific compiler. -+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - - # Is the compiler the GNU C compiler? --with_gcc=$GCC -+with_gcc=$_LT_AC_TAGVAR(GCC, $1) -+ -+# An ERE matcher. -+EGREP=$lt_EGREP - - # The linker used to build libraries. --LD=$lt_LD -+LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - - # Whether we need hard or soft links. - LN_S=$lt_LN_S -@@ -3615,7 +5300,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -3637,7 +5322,7 @@ - reload_cmds=$lt_reload_cmds - - # How to pass a linker flag through the compiler. --wl=$lt_wl -+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - - # Object file suffix (normally "o"). - objext="$ac_objext" -@@ -3645,18 +5330,21 @@ - # Old archive suffix (normally "a"). - libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ - # Executable file suffix (normally ""). - exeext="$exeext" - - # Additional compiler flags for building library objects. --pic_flag=$lt_pic_flag -+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - pic_mode=$pic_mode - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_compiler_c_o -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# Can we write directly to a .lo ? --compiler_o_lo=$lt_compiler_o_lo -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - - # Must we lock files when doing compilation ? - need_locks=$lt_need_locks -@@ -3677,939 +5365,1794 @@ - dlopen_self_static=$enable_dlopen_self_static - - # Compiler flag to prevent dynamic linking. --link_static_flag=$lt_link_static_flag -+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - - # Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_no_builtin_flag -+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - - # Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - - # Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec -+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - - # Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec -+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -+ -+# 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. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) -+ -+ifelse([$1],[], -+[# ### END LIBTOOL CONFIG], -+[# ### END LIBTOOL TAG CONFIG: $tagname]) -+ -+__EOF__ -+ -+ifelse([$1],[], [ -+ case $host_os in -+ aix3*) -+ cat <<\EOF >> "$cfgfile" -+ -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF -+ ;; -+ esac -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+]) -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi -+])# AC_LIBTOOL_CONFIG -+ -+ -+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+ -+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ -+if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -+fi -+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI -+ -+ -+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -+[AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([AC_PROG_NM]) -+AC_REQUIRE([AC_OBJEXT]) -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ -+# Transform the above into a raw symbol and a C symbol. -+symxfrm='\1 \2\3 \3' -+ -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - --# Library versioning type. --version_type=$version_type -+# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - --# Format of library name prefix. --libname_spec=$lt_libname_spec -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+linux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDGIRSTW]]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris* | sysv5*) -+ symcode='[[BDRT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac - --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ # Check to see that the pipe works correctly. -+ pipe_works=no - --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -+ rm -f conftest* -+ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif - --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif - --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[[]] = -+{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_AC_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" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -f conftest* conftst* - --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_global_symbol_pipe - --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_global_symbol_to_cdecl -+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -+# --------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+ ifelse([$1],[CXX],[ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - --# This is the shared library runtime path variable. --runpath_var=$runpath_var -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | os2* | pw32*) -+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix4* | aix5*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68) -+ # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case "$cc_basename" in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ ghcx) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | kfreebsd*-gnu) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ fi -+ ;; -+ aCC) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux*) -+ case $cc_basename in -+ KCC) -+ # KAI C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ icpc) -+ # Intel C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ cxx) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd*) -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ ;; -+ RCC) -+ # Rational C++ 2.4.1 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ cxx) -+ # Digital/Compaq C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ sco*) -+ case $cc_basename in -+ CC) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.x -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc) -+ # Lucid -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC) -+ # NonStop-UX NCC 3.20 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ unixware*) -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+ mingw* | pw32* | os2*) -+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; - --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; - --# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; - --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; - --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case "$cc_basename" in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -+ mingw* | pw32* | os2*) -+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -+ hpux9* | hpux10* | hpux11*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; - --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ irix5* | irix6* | nonstopux*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ newsos6) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -+ linux*) -+ case $CC in -+ icc* | ecc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ ccc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ esac -+ ;; - --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -+ osf3* | osf4* | osf5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+ sco3.2v5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' -+ ;; - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ solaris*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -+ sunos4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# ### END LIBTOOL CONFIG -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - --__EOF__ -+ uts4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - -- case $host_os in -- aix3*) -- cat <<\EOF >> "${ofile}T" -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) - fi --EOF -+case "$host_os" in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -- esac -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac -+]) - -+ -+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -+# ------------------------------------ -+# See if the linker supports building shared libraries. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ifelse([$1],[CXX],[ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- cat <<'EOF' >> "${ofile}T" -- # This is a source program that is used to create dlls on Windows -- # Don't remove nor modify the starting and closing comments --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include --# #undef WIN32_LEAN_AND_MEAN --# #include --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ -- # This is a source program that is used to create import libraries -- # on Windows for dlls which lack them. Don't remove nor modify the -- # starting and closing comments --# /* impgen.c starts here */ --# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. --# --# This file is part of GNU libtool. --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# */ --# --# #include /* for printf() */ --# #include /* for open(), lseek(), read() */ --# #include /* for O_RDONLY, O_BINARY */ --# #include /* for strdup() */ --# --# /* O_BINARY isn't required (or even defined sometimes) under Unix */ --# #ifndef O_BINARY --# #define O_BINARY 0 --# #endif --# --# static unsigned int --# pe_get16 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[2]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 2); --# return b[0] + (b[1]<<8); --# } --# --# static unsigned int --# pe_get32 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[4]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 4); --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# static unsigned int --# pe_as32 (ptr) --# void *ptr; --# { --# unsigned char *b = ptr; --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# int --# main (argc, argv) --# int argc; --# char *argv[]; --# { --# int dll; --# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; --# unsigned long export_rva, export_size, nsections, secptr, expptr; --# unsigned long name_rvas, nexp; --# unsigned char *expdata, *erva; --# char *filename, *dll_name; --# --# filename = argv[1]; --# --# dll = open(filename, O_RDONLY|O_BINARY); --# if (dll < 1) --# return 1; --# --# dll_name = filename; --# --# for (i=0; filename[i]; i++) --# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') --# dll_name = filename + i +1; --# --# pe_header_offset = pe_get32 (dll, 0x3c); --# opthdr_ofs = pe_header_offset + 4 + 20; --# num_entries = pe_get32 (dll, opthdr_ofs + 92); --# --# if (num_entries < 1) /* no exports */ --# return 1; --# --# export_rva = pe_get32 (dll, opthdr_ofs + 96); --# export_size = pe_get32 (dll, opthdr_ofs + 100); --# nsections = pe_get16 (dll, pe_header_offset + 4 +2); --# secptr = (pe_header_offset + 4 + 20 + --# pe_get16 (dll, pe_header_offset + 4 + 16)); --# --# expptr = 0; --# for (i = 0; i < nsections; i++) --# { --# char sname[8]; --# unsigned long secptr1 = secptr + 40 * i; --# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); --# unsigned long vsize = pe_get32 (dll, secptr1 + 16); --# unsigned long fptr = pe_get32 (dll, secptr1 + 20); --# lseek(dll, secptr1, SEEK_SET); --# read(dll, sname, 8); --# if (vaddr <= export_rva && vaddr+vsize > export_rva) --# { --# expptr = fptr + (export_rva - vaddr); --# if (export_rva + export_size > vaddr + vsize) --# export_size = vsize - (export_rva - vaddr); --# break; --# } --# } --# --# expdata = (unsigned char*)malloc(export_size); --# lseek (dll, expptr, SEEK_SET); --# read (dll, expdata, export_size); --# erva = expdata - export_rva; --# --# nexp = pe_as32 (expdata+24); --# name_rvas = pe_as32 (expdata+32); --# --# printf ("EXPORTS\n"); --# for (i = 0; i&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; -+ cygwin* | mingw*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ *) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+],[ -+ runpath_var= -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)= -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no -+ _LT_AC_TAGVAR(module_cmds, $1)= -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_AC_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= - --EOF -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ openbsd*) -+ with_gnu_ld=no - ;; - esac - -- # We use sed instead of cat because bash on DJGPP gets confused if -- # 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 '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - -- mv -f "${ofile}T" "$ofile" || \ -- (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") -- chmod +x "$ofile" --fi -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 - --])# _LT_AC_LTCONFIG_HACK -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. - --# AC_LIBTOOL_DLOPEN - enable checks for dlopen support --AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) -+EOF -+ fi -+ ;; - --# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's --AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# AC_ENABLE_SHARED - implement the --enable-shared flag --# Usage: AC_ENABLE_SHARED[(DEFAULT)] --# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to --# `yes'. --AC_DEFUN([AC_ENABLE_SHARED], --[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE(shared, --changequote(<<, >>)dnl --<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], --changequote([, ])dnl --[p=${PACKAGE-default} --case $enableval in --yes) enable_shared=yes ;; --no) enable_shared=no ;; --*) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl --]) -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# AC_DISABLE_SHARED - set the default shared flag to --disable-shared --AC_DEFUN([AC_DISABLE_SHARED], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_SHARED(no)]) -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; - --# AC_ENABLE_STATIC - implement the --enable-static flag --# Usage: AC_ENABLE_STATIC[(DEFAULT)] --# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to --# `yes'. --AC_DEFUN([AC_ENABLE_STATIC], --[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE(static, --changequote(<<, >>)dnl --<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], --changequote([, ])dnl --[p=${PACKAGE-default} --case $enableval in --yes) enable_static=yes ;; --no) enable_static=no ;; --*) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_static=AC_ENABLE_STATIC_DEFAULT)dnl --]) -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - --# AC_DISABLE_STATIC - set the default static flag to --disable-static --AC_DEFUN([AC_DISABLE_STATIC], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_STATIC(no)]) -+ solaris* | sysv5*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ sunos4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" -+ fi -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac - --# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag --# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] --# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to --# `yes'. --AC_DEFUN([AC_ENABLE_FAST_INSTALL], --[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE(fast-install, --changequote(<<, >>)dnl --<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], --changequote([, ])dnl --[p=${PACKAGE-default} --case $enableval in --yes) enable_fast_install=yes ;; --no) enable_fast_install=no ;; --*) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi - fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl --]) -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$link_static_flag"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; - --# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install --AC_DEFUN([AC_DISABLE_FAST_INSTALL], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_FAST_INSTALL(no)]) -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no - --# AC_LIBTOOL_PICMODE - implement the --with-pic flag --# Usage: AC_LIBTOOL_PICMODE[(MODE)] --# Where MODE is either `yes' or `no'. If omitted, it defaults to --# `both'. --AC_DEFUN([AC_LIBTOOL_PICMODE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --pic_mode=ifelse($#,1,$1,default)]) -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ esac - -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library --AC_DEFUN([AC_PATH_TOOL_PREFIX], --[AC_MSG_CHECKING([for $1]) --AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, --[case $MAGIC_CMD in -- /*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" --dnl $ac_dummy forces splitting on constant user-supplied paths. --dnl POSIX.2 word splitting is done only on the output of word expansions, --dnl not every word. This closes a longstanding sh security hole. -- ac_dummy="ifelse([$2], , $PATH, [$2])" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$1; then -- lt_cv_path_MAGIC_CMD="$ac_dir/$1" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else -- cat <&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -- --EOF -- fi ;; -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi - esac -+ shared_flag='-shared' -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi - fi -- break -- fi -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; --esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- AC_MSG_RESULT($MAGIC_CMD) --else -- AC_MSG_RESULT(no) --fi --]) - -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_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. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # -bexpall does not export symbols beginning with underscore (_) -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds it's shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# AC_PATH_MAGIC - find a file program which can recognise a shared library --AC_DEFUN([AC_PATH_MAGIC], --[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl --AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH) -- else -- MAGIC_CMD=: -- fi --fi --]) -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ # see comment about different semantics on the GNU ld section -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - -+ bsdi[[45]]*) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; - --# AC_PROG_LD - find the path to the GNU or non-GNU linker --AC_DEFUN([AC_PROG_LD], --[AC_ARG_WITH(gnu-ld, --[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], --test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by GCC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) -- re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) --else -- AC_MSG_CHECKING([for non-GNU ld]) --fi --AC_CACHE_VAL(lt_cv_path_LD, --[if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -- test "$with_gnu_ld" != no && break -- else -- test "$with_gnu_ld" != yes && break -- fi -+ -+ darwin* | rhapsody*) -+ case "$host_os" in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case "$cc_basename" in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - fi -- done -- IFS="$ac_save_ifs" --else -- lt_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$lt_cv_path_LD" --if test -n "$LD"; then -- AC_MSG_RESULT($LD) --else -- AC_MSG_RESULT(no) --fi --test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --AC_PROG_LD_GNU --]) -+ ;; - --# AC_PROG_LD_GNU - --AC_DEFUN([AC_PROG_LD_GNU], --[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -- lt_cv_prog_gnu_ld=yes --else -- lt_cv_prog_gnu_ld=no --fi]) --with_gnu_ld=$lt_cv_prog_gnu_ld --]) -+ dgux*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker --# -- PORTME Some linkers may need a different reload flag. --AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], --[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, --[lt_cv_ld_reload_flag='-r']) --reload_flag=$lt_cv_ld_reload_flag --test -n "$reload_flag" && reload_flag=" $reload_flag" --]) -+ freebsd1*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies --# -- PORTME fill in with the dynamic library characteristics --AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], --[AC_CACHE_CHECK([how to recognise dependant libraries], --lt_cv_deplibs_check_method, --[lt_cv_file_magic_cmd='$MAGIC_CMD' --lt_cv_file_magic_test_file= --lt_cv_deplibs_check_method='unknown' --# Need to set the preceding variable on all platforms that support --# interlibrary dependencies. --# 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. --# 'pass_all' -- all dependencies passed with no checks. --# 'test_compile' -- check by making test program. --# 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given egrep regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --case $host_os in --aix4* | aix5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --beos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | kfreebsd*-gnu) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --bsdi4*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- lt_cv_file_magic_test_file=/shlib/libc.so -- ;; -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_AC_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' -+ else -+ _LT_AC_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 -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; - --cygwin* | mingw* | pw32*) -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -- ;; -+ hpux10* | hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; - --darwin* | rhapsody*) -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac -- ;; -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --freebsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- case $host_cpu in -- i*86 ) -- # Not sure whether the presence of OpenBSD here was a mistake. -- # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ newsos6) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ openbsd*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ -+ os2*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; -- esac -- else -- lt_cv_deplibs_check_method=pass_all -- fi -- ;; - --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - --hpux10.20*|hpux11*) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -+ # Both c and cxx compiler support -rpath directly -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --irix5* | irix6*) -- case $host_os in -- irix5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -- ;; -- *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" -- ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` -- lt_cv_deplibs_check_method=pass_all -- ;; -+ sco3.2v5*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ;; - --# This must be Linux ELF. --linux-gnu*) -- case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -- ;; -+ solaris*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' -- fi -- ;; -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' -- else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -- fi -- ;; -+ sysv4.3*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; - --osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so -- lt_cv_deplibs_check_method=pass_all -- ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; - --sco3.2v5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ sysv4.2uw2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ hardcode_runpath_var=yes -+ runpath_var=LD_RUN_PATH -+ ;; - --solaris*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ runpath_var='LD_RUN_PATH' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --sysv5uw[[78]]* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ sysv5*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ # $CC -shared without GNU ld will not create a library from C++ -+ # object files and a static libstdc++, better avoid it by now -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ ;; - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- case $host_vendor in -- motorola) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -- ;; -- ncr) -- lt_cv_deplibs_check_method=pass_all -- ;; -- sequent) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -- ;; -- sni) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- esac -- ;; --esac --]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method -+ uts4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi - ]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi - --# AC_PROG_NM - find the path to a BSD-compatible name lister --AC_DEFUN([AC_PROG_NM], --[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl --AC_MSG_CHECKING([for BSD-compatible nm]) --AC_CACHE_VAL(lt_cv_path_NM, --[if test -n "$NM"; then -- # Let the user override the test. -- lt_cv_path_NM="$NM" --else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -- test -z "$ac_dir" && ac_dir=. -- tmp_nm=$ac_dir/${ac_tool_prefix}nm -- if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- # Tru64's nm complains that /dev/null is an invalid object file -- if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then -- lt_cv_path_NM="$tmp_nm -B" -- break -- elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- lt_cv_path_NM="$tmp_nm -p" -- break -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_AC_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $rm conftest* -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -+ cat conftest.err 1>&5 - fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm --fi]) --NM="$lt_cv_path_NM" --AC_MSG_RESULT([$NM]) --]) -- --# AC_CHECK_LIBM - check for math library --AC_DEFUN([AC_CHECK_LIBM], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --LIBM= --case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32*) -- # These system don't have libm -- ;; --*-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") -- ;; --*) -- AC_CHECK_LIB(m, main, LIBM="-lm") -+ $rm conftest* -+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi - ;; - esac --]) -+])# AC_LIBTOOL_PROG_LD_SHLIBS - --# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for --# the libltdl convenience library and INCLTDL to the include flags for --# the libltdl header and adds --enable-ltdl-convenience to the --# configure arguments. Note that LIBLTDL and INCLTDL are not --# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not --# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed --# with '${top_builddir}/' and INCLTDL will be prefixed with --# '${top_srcdir}/' (note the single quotes!). If your package is not --# flat and you're not using automake, define top_builddir and --# top_srcdir appropriately in the Makefiles. --AC_DEFUN([AC_LIBLTDL_CONVENIENCE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- case $enable_ltdl_convenience in -- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -- esac -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) --]) - --# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for --# the libltdl installable library and INCLTDL to the include flags for --# the libltdl header and adds --enable-ltdl-install to the configure --# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is --# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed --# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will --# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed --# with '${top_srcdir}/' (note the single quotes!). If your package is --# not flat and you're not using automake, define top_builddir and --# top_srcdir appropriately in the Makefiles. --# In the future, this macro may have to be called after AC_PROG_LIBTOOL. --AC_DEFUN([AC_LIBLTDL_INSTALLABLE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- AC_CHECK_LIB(ltdl, main, -- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -- [if test x"$enable_ltdl_install" = xno; then -- AC_MSG_WARN([libltdl not installed, but installation disabled]) -- else -- enable_ltdl_install=yes -- fi -- ]) -- if test x"$enable_ltdl_install" = x"yes"; then -- ac_configure_args="$ac_configure_args --enable-ltdl-install" -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- else -- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- INCLTDL= -- fi --]) -+# _LT_AC_FILE_LTDLL_C -+# ------------------- -+# Be careful that the start marker always follows a newline. -+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -+# /* ltdll.c starts here */ -+# #define WIN32_LEAN_AND_MEAN -+# #include -+# #undef WIN32_LEAN_AND_MEAN -+# #include -+# -+# #ifndef __CYGWIN__ -+# # ifdef __CYGWIN32__ -+# # define __CYGWIN__ __CYGWIN32__ -+# # endif -+# #endif -+# -+# #ifdef __cplusplus -+# extern "C" { -+# #endif -+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -+# #ifdef __cplusplus -+# } -+# #endif -+# -+# #ifdef __CYGWIN__ -+# #include -+# DECLARE_CYGWIN_DLL( DllMain ); -+# #endif -+# HINSTANCE __hDllInstance_base; -+# -+# BOOL APIENTRY -+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -+# { -+# __hDllInstance_base = hInst; -+# return TRUE; -+# } -+# /* ltdll.c ends here */ -+])# _LT_AC_FILE_LTDLL_C -+ -+ -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+ - - # old names - AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -@@ -4623,6 +7166,77 @@ - # This is just to silence aclocal about the macro not being used - ifelse([AC_DISABLE_FAST_INSTALL]) - -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) -+ -+AC_DEFUN([LT_AC_PROG_RC], -+[AC_CHECK_TOOL(RC, windres, no) -+]) -+ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_SED. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && break -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_MSG_RESULT([$SED]) -+]) -+ - dnl Available from the GNU Autoconf Macro Archive at: - dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_c_long_long.html - dnl -@@ -4655,7 +7269,7 @@ - fi - odbc_libraries_dir="$odbc_dir/lib" - odbc_includes_dir="$odbc_dir/include" --]) -+], [ odbc_dir=yes ] ) - - AC_ARG_WITH(odbc-includes, - [ --with-odbc-includes=DIR Find unixODBC headers in DIR], -@@ -4667,27 +7281,31 @@ - [odbc_libraries_dir=$withval] - ) - --save_CPPFLAGS="$CPPFLAGS" --save_LIBS="$LIBS" -- --if test "x$odbc_includes_dir" != "x" -a "x$odbc_includes_dir" != "x/usr/include" --then -- CPPFLAGS="$CPPFLAGS -I$odbc_includes_dir" --fi -- --if test "x$odbc_libraries_dir" != "x" --then -- LIBS="$LIBS -L$odbc_libraries_dir" --fi -+if test "x$odbc_dir" != "xno"; then -+ save_CPPFLAGS="$CPPFLAGS" -+ save_LIBS="$LIBS" -+ -+ if test "x$odbc_includes_dir" != "x" -a "x$odbc_includes_dir" != "x/usr/include" -+ then -+ CPPFLAGS="$CPPFLAGS -I$odbc_includes_dir" -+ fi - --AC_CHECK_HEADERS([sql.h sqlext.h sqlucode.h], --[odbc_ok=yes; odbc_headers="$odbc_headers $ac_hdr"], --[odbc_ok=no; break] --) -+ if test "x$odbc_libraries_dir" != "x" -+ then -+ LIBS="$LIBS -L$odbc_libraries_dir" -+ fi - --if test "x$odbc_ok" = "xyes" --then -- AC_CHECK_LIB(odbc,SQLConnect,[odbc_ok=yes],[odbc_ok=no]) -+ AC_CHECK_HEADERS([sql.h sqlext.h sqlucode.h], -+ [odbc_ok=yes; odbc_headers="$odbc_headers $ac_hdr"], -+ [odbc_ok=no; break] -+ ) -+ -+ if test "x$odbc_ok" = "xyes" -+ then -+ AC_CHECK_LIB(odbc,SQLConnect,[odbc_ok=yes],[odbc_ok=no]) -+ fi -+else -+ odbc_ok=no - fi - - AC_MSG_CHECKING([whether unixODBC should be used]) -diff -Naur libodbc++-0.2.3/AUTHORS libodbc++-0.2.3-20050404/AUTHORS ---- libodbc++-0.2.3/AUTHORS 2001-06-12 12:38:10.000000000 +0200 -+++ libodbc++-0.2.3-20050404/AUTHORS 2003-11-27 17:38:25.000000000 +0100 -@@ -1,3 +1,5 @@ - Authors of libodbc++ - --Manush Dodunekov -+Manush Dodunekov - Original author and maintainer -+ -+Other contributors are listed in the THANKS file. -diff -Naur libodbc++-0.2.3/ChangeLog libodbc++-0.2.3-20050404/ChangeLog ---- libodbc++-0.2.3/ChangeLog 2003-06-17 12:11:05.000000000 +0200 -+++ libodbc++-0.2.3-20050404/ChangeLog 2003-12-16 11:45:14.000000000 +0100 -@@ -1,3 +1,27 @@ -+2003-12-16 Alex Hornby -+ -+ * src/datastream.h: correct return type of showmanyc -+ -+2003-12-16 Alex Hornby -+ -+ * src/drivermanager.cpp: don't rely on static -+ constructor/destructor for mutex. -+ -+2003-12-05 Alex Hornby -+ -+ * acinclude.m4: update pthread test to work on hpux 11.11 -+ -+2003-12-02 Alex Hornby -+ -+ * m4/ac_check_odbc.m4: allow user to deselect unixODBC even when -+ it has been installed on the system (e.g. as an RPM). -+ -+2003-06-17 Alex Hornby -+ -+ * NEWS: update for 0.2.3 release -+ -+ * configure.ac: update for 0.2.3 release -+ - 2003-06-17 Alex Hornby - - * src/resultset.cpp: Add tests for stricmp defines. Should fix -diff -Naur libodbc++-0.2.3/config.guess libodbc++-0.2.3-20050404/config.guess ---- libodbc++-0.2.3/config.guess 2003-06-17 12:20:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/config.guess 2005-04-04 18:10:50.000000000 +0200 -@@ -1,9 +1,9 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - --timestamp='2001-09-04' -+timestamp='2005-02-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -24,8 +24,9 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Written by Per Bothner . --# Please send patches to . -+# Originally written by Per Bothner . -+# Please send patches to . Submit a context -+# diff and a properly formatted ChangeLog entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and -@@ -52,7 +53,7 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -87,30 +88,42 @@ - exit 1 - fi - -+trap 'exit 1' 1 2 15 - --dummy=dummy-$$ --trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -+# compiler to aid in system detection is discouraged as it requires -+# temporary files to be created and, as you can see below, it is a -+# headache to deal with in a portable fashion. - --# CC_FOR_BUILD -- compiler used by this script. - # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still - # use `HOST_CC' if defined, but it is deprecated. - --set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in -- ,,) echo "int dummy(){}" > $dummy.c ; -- for c in cc gcc c89 ; do -- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; -- if test $? = 0 ; then -+# Portable tmp directory creation inspired by the Autoconf team. -+ -+set_cc_for_build=' -+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -+: ${TMPDIR=/tmp} ; -+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || -+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -+dummy=$tmp/dummy ; -+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -+case $CC_FOR_BUILD,$HOST_CC,$CC in -+ ,,) echo "int x;" > $dummy.c ; -+ for c in cc gcc c89 c99 ; do -+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; -- rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac' -+esac ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -123,33 +136,51 @@ - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then -+ eval $set_cc_for_build -+ cat << EOF > $dummy.c -+ #include -+ #ifdef __UCLIBC__ -+ # ifdef __UCLIBC_CONFIG_VERSION__ -+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__ -+ # else -+ LIBC=uclibc -+ # endif -+ #else -+ LIBC=gnu -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` -+fi -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) -- # Netbsd (nbsd) targets should (where applicable) match one or -+ # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. -- # Determine the machine/vendor (is the vendor relevant). -- case "${UNAME_MACHINE}" in -- amiga) machine=m68k-unknown ;; -- arm32) machine=arm-unknown ;; -- atari*) machine=m68k-atari ;; -- sun3*) machine=m68k-sun ;; -- mac68k) machine=m68k-apple ;; -- macppc) machine=powerpc-apple ;; -- hp3[0-9][05]) machine=m68k-hp ;; -- ibmrt|romp-ibm) machine=romp-ibm ;; -- *) machine=${UNAME_MACHINE}-unknown ;; -+ # -+ # Note: NetBSD doesn't particularly care about the vendor -+ # portion of the name. We always set it to "unknown". -+ sysctl="sysctl -n hw.machine_arch" -+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ -+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` -+ case "${UNAME_MACHINE_ARCH}" in -+ armeb) machine=armeb-unknown ;; -+ arm*) machine=arm-unknown ;; -+ sh3el) machine=shl-unknown ;; -+ sh3eb) machine=sh-unknown ;; -+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. -- case "${UNAME_MACHINE}" in -- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) -+ case "${UNAME_MACHINE_ARCH}" in -+ arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null -@@ -166,74 +197,123 @@ - ;; - esac - # The OS release -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ # Debian GNU/NetBSD machines have a different userland, and -+ # thus, need a distinct triplet. However, they do not need -+ # kernel version information, so it can be replaced with a -+ # suitable tag, in the style of linux-gnu. -+ case "${UNAME_VERSION}" in -+ Debian*) -+ release='-gnu' -+ ;; -+ *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ ;; -+ esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; -+ amd64:OpenBSD:*:*) -+ echo x86_64-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ amiga:OpenBSD:*:*) -+ echo m68k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ cats:OpenBSD:*:*) -+ echo arm-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ hp300:OpenBSD:*:*) -+ echo m68k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ luna88k:OpenBSD:*:*) -+ echo m88k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mac68k:OpenBSD:*:*) -+ echo m68k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ macppc:OpenBSD:*:*) -+ echo powerpc-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mvme68k:OpenBSD:*:*) -+ echo m68k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mvme88k:OpenBSD:*:*) -+ echo m88k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mvmeppc:OpenBSD:*:*) -+ echo powerpc-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ sgi:OpenBSD:*:*) -+ echo mips64-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ sun3:OpenBSD:*:*) -+ echo m68k-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ *:OpenBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit 0 ;; -+ macppc:MirBSD:*:*) -+ echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac -+ # According to Compaq, /usr/sbin/psrinfo has been available on -+ # OSF/1 and Tru64 systems produced since 1995. I hope that -+ # covers most systems running today. This code pipes the CPU -+ # types through head -n 1, so we only detect the type of CPU 0. -+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` -+ case "$ALPHA_CPU_TYPE" in -+ "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; -+ "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; -+ "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; -+ "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; -+ "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; -+ "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; -+ "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; -+ "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; -+ "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; -+ "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; -+ esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- cat <$dummy.s -- .data --\$Lformat: -- .byte 37,100,45,37,120,10,0 # "%d-%x\n" -- -- .text -- .globl main -- .align 4 -- .ent main --main: -- .frame \$30,16,\$26,0 -- ldgp \$29,0(\$27) -- .prologue 1 -- .long 0x47e03d80 # implver \$0 -- lda \$2,-1 -- .long 0x47e20c21 # amask \$2,\$1 -- lda \$16,\$Lformat -- mov \$0,\$17 -- not \$1,\$18 -- jsr \$26,printf -- ldgp \$29,0(\$26) -- mov 0,\$16 -- jsr \$26,exit -- .end main --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null -- if test "$?" = 0 ; then -- case `./$dummy` in -- 0-0) -- UNAME_MACHINE="alpha" -- ;; -- 1-0) -- UNAME_MACHINE="alphaev5" -- ;; -- 1-1) -- UNAME_MACHINE="alphaev56" -- ;; -- 1-101) -- UNAME_MACHINE="alphapca56" -- ;; -- 2-303) -- UNAME_MACHINE="alphaev6" -- ;; -- 2-307) -- UNAME_MACHINE="alphaev67" -- ;; -- 2-1307) -- UNAME_MACHINE="alphaev68" -- ;; -- esac -- fi -- rm -f $dummy.s $dummy -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? -@@ -247,33 +327,21 @@ - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; -- arc64:OpenBSD:*:*) -- echo mips64el-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hkmips:OpenBSD:*:*) -- echo mips-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mips-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -+ *:[Mm]orph[Oo][Ss]:*:*) -+ echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit 0 ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; -@@ -291,6 +359,13 @@ - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit 0 ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -+ case `/usr/bin/uname -p` in -+ sparc) echo sparc-icl-nx7 && exit 0 ;; -+ esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; -@@ -319,7 +394,7 @@ - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - sun*:*:4.2BSD:*) -- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` -+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) -@@ -333,12 +408,6 @@ - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; -- sparc*:NetBSD:*) -- echo `uname -p`-unknown-netbsd${UNAME_RELEASE} -- exit 0 ;; -- atari*:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -365,17 +434,8 @@ - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; -- sun3*:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -@@ -415,15 +475,20 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy \ -- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c \ -+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -+ && exit 0 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; -+ Motorola:*:4.3:PL8-*) -+ echo powerpc-harris-powermax -+ exit 0 ;; -+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) -+ echo powerpc-harris-powermax -+ exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; -@@ -496,8 +561,7 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 -@@ -506,7 +570,7 @@ - fi - exit 0 ;; - *:AIX:*:[45]) -- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` -+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else -@@ -546,10 +610,8 @@ - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) -- case "${HPUX_REV}" in -- 11.[0-9][0-9]) -- if [ -x /usr/bin/getconf ]; then -- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -+ if [ -x /usr/bin/getconf ]; then -+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -@@ -558,13 +620,13 @@ - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; -+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac -- fi ;; -- esac -- if [ "${HP_ARCH}" = "" ]; then -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ fi -+ if [ "${HP_ARCH}" = "" ]; then -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include -@@ -597,11 +659,21 @@ - exit (0); - } - EOF -- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` -- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi -- rm -f $dummy.c $dummy -- fi ;; -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ test -z "$HP_ARCH" && HP_ARCH=hppa -+ fi ;; - esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] -+ then -+ # avoid double evaluation of $set_cc_for_build -+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ then -+ HP_ARCH="hppa2.0w" -+ else -+ HP_ARCH="hppa64" -+ fi -+ fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) -@@ -635,8 +707,7 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) -@@ -664,9 +735,6 @@ - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; -- hppa*:OpenBSD:*:*) -- echo hppa-unknown-openbsd -- exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; -@@ -685,9 +753,6 @@ - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; -- CRAY*X-MP:*:*:*) -- echo xmp-cray-unicos -- exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; -@@ -700,26 +765,25 @@ - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; -- CRAY*T3D:*:*:*) -- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; -- CRAY-2:*:*:*) -- echo cray2-cray-unicos -- exit 0 ;; -+ *:UNICOS/mp:*:*) -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit 0 ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -733,9 +797,6 @@ - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; -- *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -- exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; -@@ -745,15 +806,24 @@ - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; -+ x86:Interix*:[34]*) -+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -+ exit 0 ;; -+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -+ echo i${UNAME_MACHINE}-pc-mks -+ exit 0 ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? -- echo i386-pc-interix -+ echo i586-pc-interix - exit 0 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; -+ amd64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; -@@ -761,31 +831,80 @@ - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit 0 ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-${LIBC} -+ exit 0 ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-${LIBC} -+ exit 0 ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-${LIBC} - exit 0 ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit 0 ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - mips:Linux:*:*) -- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in -- big) echo mips-unknown-linux-gnu && exit 0 ;; -- little) echo mipsel-unknown-linux-gnu && exit 0 ;; -- esac -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips -+ #undef mipsel -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mipsel -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0 -+ ;; -+ mips64:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips64 -+ #undef mips64el -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0 - ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} - exit 0 ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -798,37 +917,41 @@ - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit 0 ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit 0 ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo x86_64-unknown-linux-${LIBC} - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. -- ld_supported_targets=`cd /; ld --help 2>&1 \ -+ # Set LC_ALL=C to ensure ld outputs messages in English. -+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// -@@ -836,48 +959,48 @@ - p'` - case "$ld_supported_targets" in - elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" - ;; - a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" -+ exit 0 ;; - coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" - exit 0 ;; - esac -+ if [ "`echo $LIBC | sed -e 's:uclibc::'`" != "$LIBC" ] ; then echo "$TENTATIVE" && exit 0 ; fi - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build -- cat >$dummy.c < --#ifdef __cplusplus --#include /* for printf() prototype */ -- int main (int argc, char *argv[]) { --#else -- int main (argc, argv) int argc; char *argv[]; { --#endif --#ifdef __ELF__ --# ifdef __GLIBC__ --# if __GLIBC__ >= 2 -- printf ("%s-pc-linux-gnu\n", argv[1]); --# else -- printf ("%s-pc-linux-gnulibc1\n", argv[1]); --# endif --# else -- printf ("%s-pc-linux-gnulibc1\n", argv[1]); --# endif --#else -- printf ("%s-pc-linux-gnuaout\n", argv[1]); --#endif -- return 0; --} -+ sed 's/^ //' << EOF >$dummy.c -+ #include -+ #ifdef __ELF__ -+ # ifdef __GLIBC__ -+ # if __GLIBC__ >= 2 -+ LIBC=gnu -+ # else -+ LIBC=gnulibc1 -+ # endif -+ # else -+ LIBC=gnulibc1 -+ # endif -+ #else -+ #ifdef __INTEL_COMPILER -+ LIBC=gnu -+ #else -+ LIBC=gnuaout -+ #endif -+ #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) -@@ -894,6 +1017,26 @@ - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; -+ i*86:OS/2:*:*) -+ # If we were able to find `uname', then EMX Unix compatibility -+ # is probably installed. -+ echo ${UNAME_MACHINE}-pc-os2-emx -+ exit 0 ;; -+ i*86:XTS-300:*:STOP) -+ echo ${UNAME_MACHINE}-unknown-stop -+ exit 0 ;; -+ i*86:atheos:*:*) -+ echo ${UNAME_MACHINE}-unknown-atheos -+ exit 0 ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit 0 ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ echo i386-unknown-lynxos${UNAME_RELEASE} -+ exit 0 ;; -+ i*86:*DOS:*:*) -+ echo ${UNAME_MACHINE}-pc-msdosdjgpp -+ exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -915,22 +1058,19 @@ - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` -- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ -+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; -- i*86:*DOS:*:*) -- echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about -@@ -954,9 +1094,15 @@ - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; -- M68*:*:R3V[567]*:*) -+ mc68k:UNIX:SYSTEM5:3.51m) -+ echo m68k-convergent-sysv -+ exit 0 ;; -+ M680?0:D-NIX:5.3:*) -+ echo m68k-diab-dnix -+ exit 0 ;; -+ M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -@@ -973,9 +1119,6 @@ - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -- echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; -@@ -1047,6 +1190,9 @@ - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; -+ SX-6:SUPER-UX:*:*) -+ echo sx6-nec-superux${UNAME_RELEASE} -+ exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; -@@ -1054,18 +1200,28 @@ - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) -- echo `uname -p`-apple-darwin${UNAME_RELEASE} -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ *86) UNAME_PROCESSOR=i686 ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac -+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -- if test "${UNAME_MACHINE}" = "x86pc"; then -+ UNAME_PROCESSOR=`uname -p` -+ if test "$UNAME_PROCESSOR" = "x86"; then -+ UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi -- echo `uname -p`-${UNAME_MACHINE}-nto-qnx -+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; -- NSR-[KW]:NONSTOP_KERNEL:*:*) -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit 0 ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) -@@ -1088,11 +1244,6 @@ - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; -- i*86:OS/2:*:*) -- # If we were able to find `uname', then EMX Unix compatibility -- # is probably installed. -- echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; -@@ -1111,11 +1262,21 @@ - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; -- i*86:XTS-300:*:STOP) -- echo ${UNAME_MACHINE}-unknown-stop -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; -- i*86:atheos:*:*) -- echo ${UNAME_MACHINE}-unknown-atheos -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit 0 ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms && exit 0 ;; -+ I*) echo ia64-dec-vms && exit 0 ;; -+ V*) echo vax-dec-vms && exit 0 ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix - exit 0 ;; - esac - -@@ -1237,8 +1398,7 @@ - } - EOF - --$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 --rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 - - # Apollos put the system type in the environment. - -diff -Naur libodbc++-0.2.3/config.sub libodbc++-0.2.3-20050404/config.sub ---- libodbc++-0.2.3/config.sub 2003-06-17 12:20:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/config.sub 2005-04-04 18:10:50.000000000 +0200 -@@ -1,9 +1,9 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - --timestamp='2001-09-07' -+timestamp='2005-02-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -29,7 +29,8 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Please send patches to . -+# Please send patches to . Submit a context -+# diff and a properly formatted ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -69,7 +70,7 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -117,7 +118,8 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -143,7 +145,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -@@ -226,32 +228,46 @@ - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -+ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ -- | d10v | d30v | dsp16xx \ -- | fr30 \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | m32r | m68000 | m68k | m88k | mcore \ -- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ -- | mips64vr4100 | mips64vr4100el | mips64vr4300 \ -- | mips64vr4300el | mips64vr5000 | mips64vr5000el \ -- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ -- | mipsisa32 \ -+ | ip2k | iq2000 \ -+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ -+ | mips64orion | mips64orionel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | msp430 \ - | ns16k | ns32k \ -- | openrisc \ -+ | openrisc | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | s390 | s390x \ -- | sh | sh[34] | sh[34]eb | shbe | shle \ -- | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ -- | stormy16 | strongarm \ -- | tahoe | thumb | tic80 | tron \ -- | v850 \ -+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh64 | sh64le \ -+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ -+ | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ -+ | v850 | v850e \ - | we32k \ -- | x86 | xscale \ -+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -@@ -278,38 +294,57 @@ - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -- | alphapca5[67]-* | arc-* \ -- | arm-* | armbe-* | armle-* | armv*-* \ -+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | avr-* \ - | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c54x-* \ -- | clipper-* | cray2-* | cydra-* \ -- | d10v-* | d30v-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | clipper-* | craynv-* | cydra-* \ -+ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | fx80-* \ -+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | m32r-* \ -- | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ -- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ -- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ -+ | ip2k-* | iq2000-* \ -+ | m32r-* | m32rle-* \ -+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -+ | mips16-* \ -+ | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ -+ | mips64orion-* | mips64orionel-* \ -+ | mips64vr4100-* | mips64vr4100el-* \ -+ | mips64vr4300-* | mips64vr4300el-* \ -+ | mips64vr5000-* | mips64vr5000el-* \ -+ | mipsisa32-* | mipsisa32el-* \ -+ | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64sb1-* | mipsisa64sb1el-* \ -+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | msp430-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | s390-* | s390x-* \ -- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ -- | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ -- | v850-* | vax-* \ -+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | tahoe-* | thumb-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tron-* \ -+ | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ -+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; -@@ -329,6 +364,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -343,6 +381,12 @@ - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -374,6 +418,10 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ c90) -+ basic_machine=c90-cray -+ os=-unicos -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -394,30 +442,45 @@ - basic_machine=c38-convex - os=-bsd - ;; -- cray | ymp) -- basic_machine=ymp-cray -+ cray | j90) -+ basic_machine=j90-cray - os=-unicos - ;; -- cray2) -- basic_machine=cray2-cray -- os=-unicos -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp - ;; -- [cjt]90) -- basic_machine=${basic_machine}-cray -- os=-unicos -+ cr16c) -+ basic_machine=cr16c-unknown -+ os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; -+ decsystem10* | dec10*) -+ basic_machine=pdp10-dec -+ os=-tops10 -+ ;; -+ decsystem20* | dec20*) -+ basic_machine=pdp10-dec -+ os=-tops20 -+ ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola -@@ -426,6 +489,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -598,28 +665,20 @@ - basic_machine=m68k-atari - os=-mint - ;; -- mipsel*-linux*) -- basic_machine=mipsel-unknown -- os=-linux-gnu -- ;; -- mips*-linux*) -- basic_machine=mips-unknown -- os=-linux-gnu -- ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ os=-morphos -+ ;; - msdos) - basic_machine=i386-pc - os=-msdos -@@ -699,6 +758,14 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -+ or32 | or32-*) -+ basic_machine=or32-unknown -+ os=-coff -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -721,49 +788,55 @@ - pbb) - basic_machine=m68k-tti - ;; -- pc532 | pc532-*) -+ pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -- pentium | p5 | k5 | k6 | nexgen) -+ pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -- pentiumpro | p6 | 6x86 | athlon) -+ pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-*) -+ pentium4) -+ basic_machine=i786-pc -+ ;; -+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown -- ;; -+ ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -- ;; -+ ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown -- ;; -+ ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown -- ;; -+ ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -@@ -784,10 +857,26 @@ - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; -+ s390 | s390-*) -+ basic_machine=s390-ibm -+ ;; -+ s390x | s390x-*) -+ basic_machine=s390x-ibm -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; -+ sb1) -+ basic_machine=mipsisa64sb1-unknown -+ ;; -+ sb1el) -+ basic_machine=mipsisa64sb1el-unknown -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -795,7 +884,10 @@ - basic_machine=sh-hitachi - os=-hms - ;; -- sparclite-wrs) -+ sh64) -+ basic_machine=sh64-unknown -+ ;; -+ sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; -@@ -862,22 +954,42 @@ - os=-dynix - ;; - t3e) -- basic_machine=t3e-cray -+ basic_machine=alphaev5-cray -+ os=-unicos -+ ;; -+ t90) -+ basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff -+ ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ os=-tops20 -+ ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -899,8 +1011,8 @@ - os=-vms - ;; - vpp*|vx|vx-*) -- basic_machine=f301-fujitsu -- ;; -+ basic_machine=f301-fujitsu -+ ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks -@@ -921,17 +1033,17 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- windows32) -- basic_machine=i386-pc -- os=-windows32-msvcrt -- ;; -- xmp) -- basic_machine=xmp-cray -- os=-unicos -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 - ;; -- xps | xps100) -+ xps | xps100) - basic_machine=xps100-honeywell - ;; -+ ymp) -+ basic_machine=ymp-cray -+ os=-unicos -+ ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim -@@ -952,16 +1064,12 @@ - op60c) - basic_machine=hppa1.1-oki - ;; -- mips) -- if [ x$os = x-linux-gnu ]; then -- basic_machine=mips-unknown -- else -- basic_machine=mips-mips -- fi -- ;; - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -978,13 +1086,16 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh3eb | sh4eb) -+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sparc | sparcv9 | sparcv9b) -+ sh64) -+ basic_machine=sh64-unknown -+ ;; -+ sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; -- cydra) -+ cydra) - basic_machine=cydra-cydrome - ;; - orion) -@@ -999,10 +1110,6 @@ - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; -- c4x*) -- basic_machine=c4x-none -- os=-coff -- ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; -@@ -1058,17 +1165,20 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ -+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ -- | -os2* | -vos*) -+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ -+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1080,8 +1190,10 @@ - ;; - esac - ;; -+ -nto-qnx*) -+ ;; - -nto*) -- os=-nto-qnx -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -@@ -1090,6 +1202,9 @@ - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1102,6 +1217,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1120,14 +1238,23 @@ - -acis*) - os=-aos - ;; -+ -atheos*) -+ os=-atheos -+ ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; -+ -nova*) -+ os=-rtmk-nova -+ ;; - -ns2 ) -- os=-nextstep2 -+ os=-nextstep2 - ;; - -nsk*) - os=-nsk -@@ -1139,6 +1266,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1166,8 +1296,17 @@ - -xenix) - os=-xenix - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -- os=-mint -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint -+ ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe - ;; - -none) - ;; -@@ -1200,10 +1339,14 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; -- pdp11-*) -+ pdp11-*) - os=-none - ;; - *-dec | vax-*) -@@ -1230,6 +1373,9 @@ - mips*-*) - os=-elf - ;; -+ or32-*) -+ os=-coff -+ ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; -@@ -1242,6 +1388,9 @@ - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1293,19 +1442,19 @@ - *-next) - os=-nextstep3 - ;; -- *-gould) -+ *-gould) - os=-sysv - ;; -- *-highlevel) -+ *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; -- *-sgi) -+ *-sgi) - os=-irix - ;; -- *-siemens) -+ *-siemens) - os=-sysv4 - ;; - *-masscomp) -@@ -1374,10 +1523,16 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -- -vxsim* | -vxworks*) -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) -diff -Naur libodbc++-0.2.3/configure libodbc++-0.2.3-20050404/configure ---- libodbc++-0.2.3/configure 2003-06-17 12:20:57.000000000 +0200 -+++ libodbc++-0.2.3-20050404/configure 2005-04-04 18:21:10.000000000 +0200 -@@ -1,180 +1,12 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.53 for libodbcxx 0.2.3. -+# Generated by GNU Autoconf 2.59 for libodbcxx 0.2.3-20050404. - # - # Report bugs to . - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. -+# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -- --# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac -- PATH_SEPARATOR=$lt_cv_sys_path_separator --fi -- -- --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -- --case X$ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` -- ;; --esac -- --echo=${ECHO-echo} --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "$0" --no-reexec ${1+"$@"} --fi -- --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat </dev/null && -- echo_test_string="`eval $cmd`" && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -- then -- break -- fi -- done --fi -- --if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : --else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$dir/echo" -- break -- fi -- done -- IFS="$save_ifs" -- -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL $0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$CONFIG_SHELL $0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -- -- if test "$prev" != 'sed 50q "$0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -- else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -- fi -- fi -- fi -- fi --fi --fi -- --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --ECHO=$echo --if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" --fi -- -- -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- -- - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -183,46 +15,57 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi -+DUALCASE=1; export DUALCASE # for MKS sh - --# NLS nuisances. - # Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false - fi - --(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && -- { $as_unset LANG || test "${LANG+set}" != set; } || -- { LANG=C; export LANG; } --(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && -- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || -- { LC_ALL=C; export LC_ALL; } --(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && -- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || -- { LC_TIME=C; export LC_TIME; } --(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && -- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || -- { LC_CTYPE=C; export LC_CTYPE; } --(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && -- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || -- { LANGUAGE=C; export LANGUAGE; } --(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && -- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || -- { LC_COLLATE=C; export LC_COLLATE; } --(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && -- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || -- { LC_NUMERIC=C; export LC_NUMERIC; } --(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && -- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || -- { LC_MESSAGES=C; export LC_MESSAGES; } -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi - - - # Name of the executable. --as_me=`(basename "$0") 2>/dev/null || -+as_me=`$as_basename "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ -@@ -233,6 +76,7 @@ - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -+ - # PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' -@@ -243,15 +87,15 @@ - - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conftest.sh -- echo "exit 0" >>conftest.sh -- chmod +x conftest.sh -- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi -- rm -f conftest.sh -+ rm -f conf$$.sh - fi - - -@@ -299,6 +143,8 @@ - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} -@@ -371,13 +217,20 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - # IFS -@@ -387,76 +240,233 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } -- -+$as_unset CDPATH - --# Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --# so uname gets run too. --ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 - --# --# Initializations. --# --ac_default_prefix=/usr/local --cross_compiling=no --subdirs= --MFLAGS= --MAKEFLAGS= -+# Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` -+ ;; -+esac - --# Identity of this package. --PACKAGE_NAME='libodbcxx' --PACKAGE_TARNAME='libodbc++' --PACKAGE_VERSION='0.2.3' --PACKAGE_STRING='libodbcxx 0.2.3' --PACKAGE_BUGREPORT='freeodbc++@orcane.net' -+echo=${ECHO-echo} -+if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "$0" --no-reexec ${1+"$@"} -+fi - --ac_unique_file="src/connection.cpp" --# Factoring default headers for most tests. --ac_includes_default="\ --#include --#if HAVE_SYS_TYPES_H --# include --#endif --#if HAVE_SYS_STAT_H --# include --#endif --#if STDC_HEADERS --# include --# include --#else --# if HAVE_STDLIB_H --# include --# endif --#endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H --# include --# endif --# include --#endif --#if HAVE_STRINGS_H --# include --#endif --#if HAVE_INTTYPES_H --# include --#else --# if HAVE_STDINT_H --# include --# endif --#endif --#if HAVE_UNISTD_H --# include --#endif" -+if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat </dev/null 2>&1 && unset CDPATH -+ -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string="`eval $cmd`") 2>/dev/null && -+ echo_test_string="`eval $cmd`" && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done -+fi -+ -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. -+ -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL $0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL $0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: -+ -+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "$0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi -+ fi -+ fi -+ fi -+fi -+fi -+ -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -+fi -+ -+ -+ -+ -+tagnames=${tagnames+${tagnames},}CXX -+ -+tagnames=${tagnames+${tagnames},}F77 -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+exec 6>&1 -+ -+# -+# Initializations. -+# -+ac_default_prefix=/usr/local -+ac_config_libobj_dir=. -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+# Maximum number of lines to put in a shell here document. -+# This variable seems obsolete. It should probably be removed, and -+# only ac_max_sed_lines should be used. -+: ${ac_max_here_lines=38} -+ -+# Identity of this package. -+PACKAGE_NAME='libodbcxx' -+PACKAGE_TARNAME='libodbc++' -+PACKAGE_VERSION='0.2.3-20050404' -+PACKAGE_STRING='libodbcxx 0.2.3-20050404' -+PACKAGE_BUGREPORT='freeodbc++@orcane.net' -+ -+ac_unique_file="src/connection.cpp" -+# Factoring default headers for most tests. -+ac_includes_default="\ -+#include -+#if HAVE_SYS_TYPES_H -+# include -+#endif -+#if HAVE_SYS_STAT_H -+# include -+#endif -+#if STDC_HEADERS -+# include -+# include -+#else -+# if HAVE_STDLIB_H -+# include -+# endif -+#endif -+#if HAVE_STRING_H -+# if !STDC_HEADERS && HAVE_MEMORY_H -+# include -+# endif -+# include -+#endif -+#if HAVE_STRINGS_H -+# include -+#endif -+#if HAVE_INTTYPES_H -+# include -+#else -+# if HAVE_STDINT_H -+# include -+# endif -+#endif -+#if HAVE_UNISTD_H -+# include -+#endif" - -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot lib_version build build_cpu build_vendor build_os host host_cpu host_vendor host_os sed CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL docdir THREAD_LIBS THREADS_TRUE THREADS_FALSE LIBREADLINE INCLUDES doxygen perl db2html zip bzip2 BUILD_QTSQLXX_TRUE BUILD_QTSQLXX_FALSE QT_INCLUDES QT_LIBS QT_DEFS QT_MOC QT_TRUE QT_FALSE BUILD_ISQLXX_TRUE BUILD_ISQLXX_FALSE BUILD_TESTS_TRUE BUILD_TESTS_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_files='' - - # Initialize some variables set by options. - ac_init_help= -@@ -814,7 +824,7 @@ - - # Be sure to have absolute paths. - for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+ localstatedir libdir includedir oldincludedir infodir mandir - do - eval ac_val=$`echo $ac_var` - case $ac_val in -@@ -854,10 +864,10 @@ - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -880,6 +890,9 @@ - { (exit 1); exit 1; }; } - fi - fi -+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -+ { (exit 1); exit 1; }; } - srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` - ac_env_build_alias_set=${build_alias+set} - ac_env_build_alias_value=$build_alias -@@ -925,6 +938,14 @@ - ac_env_CPP_value=$CPP - ac_cv_env_CPP_set=${CPP+set} - ac_cv_env_CPP_value=$CPP -+ac_env_F77_set=${F77+set} -+ac_env_F77_value=$F77 -+ac_cv_env_F77_set=${F77+set} -+ac_cv_env_F77_value=$F77 -+ac_env_FFLAGS_set=${FFLAGS+set} -+ac_env_FFLAGS_value=$FFLAGS -+ac_cv_env_FFLAGS_set=${FFLAGS+set} -+ac_cv_env_FFLAGS_value=$FFLAGS - - # - # Report the --help message. -@@ -933,7 +954,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures libodbcxx 0.2.3 to adapt to many kinds of systems. -+\`configure' configures libodbcxx 0.2.3-20050404 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -958,9 +979,9 @@ - cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -999,26 +1020,32 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of libodbcxx 0.2.3:";; -+ short | recursive ) echo "Configuration of libodbcxx 0.2.3-20050404:";; - esac - cat <<\_ACEOF - - Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --enable-shared=PKGS build shared libraries default=yes -- --enable-static=PKGS build static libraries default=no -+ --enable-shared[=PKGS] -+ build shared libraries [default=yes] -+ --enable-static[=PKGS] -+ build static libraries [default=no] - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors -- --enable-fast-install=PKGS optimize for fast installation default=yes -+ --enable-fast-install[=PKGS] -+ optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-threads Enable threads - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-gnu-ld assume the C compiler uses GNU ld default=no -- --with-pic try to use only PIC/non-PIC objects default=use both -+ --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-pic try to use only PIC/non-PIC objects [default=use -+ both] -+ --with-tags[=TAGS] -+ include additional configurations [automatic] - --with-docdir=DIR Where to install documentation DATADIR/doc - --with-odbc=DIR Use unixODBC, optionally installed in DIR - --with-odbc-includes=DIR Find unixODBC headers in DIR -@@ -1046,6 +1073,8 @@ - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor -+ F77 Fortran 77 compiler command -+ FFLAGS Fortran 77 compiler flags - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -1084,12 +1113,45 @@ - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. -@@ -1100,7 +1162,7 @@ - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -+ test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else -@@ -1113,11 +1175,10 @@ - test -n "$ac_init_help" && exit 0 - if $ac_init_version; then - cat <<\_ACEOF --libodbcxx configure 0.2.3 --generated by GNU Autoconf 2.53 -+libodbcxx configure 0.2.3-20050404 -+generated by GNU Autoconf 2.59 - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --Free Software Foundation, Inc. -+Copyright (C) 2003 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1128,8 +1189,8 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by libodbcxx $as_me 0.2.3, which was --generated by GNU Autoconf 2.53. Invocation command line was -+It was created by libodbcxx $as_me 0.2.3-20050404, which was -+generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -@@ -1181,27 +1242,54 @@ - - # Keep a trace of the command line. - # Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= - ac_sep= --for ac_arg -+ac_must_keep_next=false -+for ac_pass in 1 2 - do -- case $ac_arg in -- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c | -n ) continue ;; -- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -- continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- ac_sep=" " ;; -- esac -- # Get rid of the leading space. -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -+ # Get rid of the leading space. -+ ac_sep=" " -+ ;; -+ esac -+ done - done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there -@@ -1212,6 +1300,7 @@ - # Save into config.log some information that might help in debugging. - { - echo -+ - cat <<\_ASBOX - ## ---------------- ## - ## Cache variables. ## -@@ -1224,16 +1313,45 @@ - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; - } - echo -+ -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------- ## -+## Output files. ## -+## ------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ fi -+ - if test -s confdefs.h; then - cat <<\_ASBOX - ## ----------- ## -@@ -1241,14 +1359,14 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h -+ sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 -- rm -f core core.* *.core && -+ rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -@@ -1328,7 +1446,7 @@ - # value. - ac_cache_corrupted=false - for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" -@@ -1345,13 +1463,13 @@ - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 - echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 - echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. -@@ -1407,7 +1525,8 @@ - - - --am__api_version="1.6" -+ -+am__api_version="1.7" - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then -@@ -1444,6 +1563,7 @@ - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 - echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -@@ -1460,6 +1580,7 @@ - case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -1467,20 +1588,20 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi - done - done - ;; -@@ -1622,15 +1743,15 @@ - test -n "$AWK" && break - done - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` - if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF - all: -- @echo 'ac_maketemp="${MAKE}"' -+ @echo 'ac_maketemp="$(MAKE)"' - _ACEOF - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -@@ -1651,6 +1772,15 @@ - SET_MAKE="MAKE=${MAKE-make}" - fi - -+rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+ - # test to see if srcdir already configured - if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then -@@ -1659,9 +1789,19 @@ - { (exit 1); exit 1; }; } - fi - -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+ -+ - # Define the identity of the package. -- PACKAGE=libodbc++ -- VERSION=0.2.3 -+ PACKAGE='libodbc++' -+ VERSION='0.2.3-20050404' - - - cat >>confdefs.h <<_ACEOF -@@ -1787,11 +1927,7 @@ - - - --# Add the stamp file to the list of files AC keeps track of, --# along with our hook. --ac_config_headers="$ac_config_headers config.h" -- -- -+ ac_config_headers="$ac_config_headers config.h" - - - # version is current:revision:age -@@ -1808,47 +1944,51 @@ - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} --case $enableval in --yes) enable_shared=yes ;; --no) enable_shared=no ;; --*) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else - enable_shared=yes - fi; -+ - # Check whether --enable-static or --disable-static was given. - if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} --case $enableval in --yes) enable_static=yes ;; --no) enable_static=no ;; --*) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else - enable_static=no - fi; - -+ - # Prevents the Makefile rebuild rules runnning automatically. Use - # autogen.sh instead. - # AM_MAINTAINER_MODE -@@ -2071,15 +2211,12 @@ - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2089,12 +2226,12 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe" -+ac_clean_files="$ac_clean_files a.out a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C++ compiler default output" >&5 --echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 -@@ -2108,26 +2245,39 @@ - # Be careful to initialize this variable, since it used to be cached. - # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. - ac_cv_exeext= --for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; -- ls a.out conftest 2>/dev/null; -- ls a.* conftest.* 2>/dev/null`; do -+# b.out is created by i960 compilers. -+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+do -+ test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; -- a.out ) # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool --akim. -- export ac_cv_exeext -- break;; -- * ) break;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -+ ;; -+ conftest.$ac_ext ) -+ # This is the source file. -+ ;; -+ [ab].out ) -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ # FIXME: I believe we export ac_cv_exeext for Libtool, -+ # but it would be cool to find out if it's true. Does anybody -+ # maintain Libtool? --akim. -+ export ac_cv_exeext -+ break;; -+ * ) -+ break;; - esac - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables" >&5 --echo "$as_me: error: C++ compiler cannot create executables" >&2;} -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C++ compiler cannot create executables -+See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - fi - -@@ -2154,9 +2304,11 @@ - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. --If you meant to cross compile, use \`--host'." >&5 -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run C++ compiled programs. --If you meant to cross compile, use \`--host'." >&2;} -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -@@ -2164,7 +2316,7 @@ - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - --rm -f a.out a.exe conftest$ac_cv_exeext -+rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save - # Check the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. -@@ -2184,18 +2336,21 @@ - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with - # `rm'. --for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext -- break;; -+ export ac_cv_exeext -+ break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2212,15 +2367,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2237,16 +2389,19 @@ - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2262,15 +2417,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2284,11 +2436,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2297,10 +2459,11 @@ - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_compiler_gnu=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi -@@ -2316,15 +2479,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2335,11 +2495,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2348,10 +2518,11 @@ - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_prog_cxx_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 - echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -@@ -2371,8 +2542,7 @@ - fi - fi - for ac_declaration in \ -- ''\ -- '#include ' \ -+ '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -2380,16 +2550,13 @@ - 'void exit (int);' - do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif -+#include - int - main () - { -@@ -2400,11 +2567,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2413,20 +2590,18 @@ - : - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - continue - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2437,11 +2612,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2450,9 +2635,10 @@ - break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - rm -f conftest* - if test -n "$ac_declaration"; then -@@ -2466,24 +2652,16 @@ - 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 --rm -f .deps 2>/dev/null --mkdir .deps 2>/dev/null --if test -d .deps; then -- DEPDIR=.deps --else -- # MS-DOS does not allow filenames that begin with a dot. -- DEPDIR=_deps --fi --rmdir .deps 2>/dev/null -+DEPDIR="${am__leading_dot}deps" - -- --ac_config_commands="$ac_config_commands depfiles" -+ ac_config_commands="$ac_config_commands depfiles" - - - am_make=${MAKE-make} - cat > confinc << 'END' --doit: -+am__doit: - @echo done -+.PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. - echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -@@ -2498,7 +2676,7 @@ - # In particular we don't look at `^make:' because GNU make might - # be invoked under some other name (usually "gmake"), in which - # case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -@@ -2558,18 +2736,32 @@ - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ : > sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) -@@ -2587,13 +2779,20 @@ - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_CXX_dependencies_compiler_type=$depmode -- break -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ am_cv_CXX_dependencies_compiler_type=$depmode -+ break -+ fi - fi - done - -@@ -2609,6 +2808,18 @@ - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -+ -+if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -+ am__fastdepCXX_TRUE= -+ am__fastdepCXX_FALSE='#' -+else -+ am__fastdepCXX_TRUE='#' -+ am__fastdepCXX_FALSE= -+fi -+ -+ - ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2628,24 +2839,34 @@ - do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include -- Syntax error -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -2656,7 +2877,8 @@ - : - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -@@ -2665,20 +2887,24 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -2690,7 +2916,8 @@ - continue - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break -@@ -2719,24 +2946,34 @@ - do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include -- Syntax error -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -2747,7 +2984,8 @@ - : - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -@@ -2756,20 +2994,24 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -2781,7 +3023,8 @@ - continue - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break -@@ -2794,8 +3037,10 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} -+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2815,24 +3060,26 @@ - if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} --case $enableval in --yes) enable_fast_install=yes ;; --no) enable_fast_install=no ;; --*) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else - enable_fast_install=yes - fi; -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -3037,9 +3284,7 @@ - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- set dummy "$as_dir/$ac_word" ${1+"$@"} -- shift -- ac_cv_prog_CC="$@" -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi - fi - fi -@@ -3144,8 +3389,10 @@ - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. -@@ -3174,15 +3421,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3196,11 +3440,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3209,10 +3463,11 @@ - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_compiler_gnu=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi -@@ -3228,15 +3483,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3247,11 +3499,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3260,10 +3522,11 @@ - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_prog_cc_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -@@ -3282,6 +3545,121 @@ - CFLAGS= - fi - fi -+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -+if test "${ac_cv_prog_cc_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_stdc=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; -+{ -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; -+} -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std1 is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std1. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; -+int -+main () -+{ -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF -+# Don't try gcc -ansi; that turns off useful extensions and -+# breaks some systems' header files. -+# AIX -qlanglvl=ansi -+# Ultrix and OSF/1 -std1 -+# HP-UX 10.20 and later -Ae -+# HP-UX older versions -Aa -D_HPUX_SOURCE -+# SVR4 -Xc -D__EXTENSIONS__ -+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_prog_cc_stdc=$ac_arg -+break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext -+done -+rm -f conftest.$ac_ext conftest.$ac_objext -+CC=$ac_save_CC -+ -+fi -+ -+case "x$ac_cv_prog_cc_stdc" in -+ x|xno) -+ echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6 ;; -+ *) -+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -+ CC="$CC $ac_cv_prog_cc_stdc" ;; -+esac -+ - # Some people use a C++ compiler to compile C. Since we use `exit', - # in C++ we need to declare it. In case someone uses the same compiler - # for both compiling C and C++ we need to have the C++ compiler decide -@@ -3293,19 +3671,28 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ -- ''\ -- '#include ' \ -+ '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -3313,16 +3700,13 @@ - 'void exit (int);' - do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif -+#include - int - main () - { -@@ -3333,11 +3717,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3346,20 +3740,18 @@ - : - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - continue - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3370,11 +3762,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3383,9 +3785,10 @@ - break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - rm -f conftest* - if test -n "$ac_declaration"; then -@@ -3396,9 +3799,10 @@ - - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -3423,18 +3827,32 @@ - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ : > sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) -@@ -3452,13 +3870,20 @@ - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_CC_dependencies_compiler_type=$depmode -- break -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi - fi - done - -@@ -3474,16 +3899,89 @@ - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - --# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac -- PATH_SEPARATOR=$lt_cv_sys_path_separator -+ -+if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ -+ -+echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 -+if test "${lt_cv_path_SED+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && break -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+ -+fi -+ -+SED=$lt_cv_path_SED -+echo "$as_me:$LINENO: result: $SED" >&5 -+echo "${ECHO_T}$SED" >&6 -+ -+echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -+if test "${ac_cv_prog_egrep+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi - fi -+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -+echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -+ EGREP=$ac_cv_prog_egrep -+ - - - # Check whether --with-gnu-ld or --without-gnu-ld was given. -@@ -3496,8 +3994,8 @@ - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- echo "$as_me:$LINENO: checking for ld used by GCC" >&5 --echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -3507,12 +4005,12 @@ - esac - case $ac_prog in - # Accept absolute paths. -- [\\/]* | [A-Za-z]:[\\/]*) -+ [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; -@@ -3536,22 +4034,26 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -+ case `"$lt_cv_path_LD" -v 2>&1 &6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -+case `$LD -v 2>&1 &5 - echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -@@ -3595,7 +4100,20 @@ - echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 - echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 - reload_flag=$lt_cv_ld_reload_flag --test -n "$reload_flag" && reload_flag=" $reload_flag" -+case $reload_flag in -+"" | " "*) ;; -+*) reload_flag=" $reload_flag" ;; -+esac -+reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac - - echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 - echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -@@ -3606,35 +4124,42 @@ - # Let the user override the test. - lt_cv_path_NM="$NM" - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. -- tmp_nm=$ac_dir/${ac_tool_prefix}nm -- if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then -+ tmp_nm="$ac_dir/${ac_tool_prefix}nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file -- if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break -- elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- lt_cv_path_NM="$tmp_nm -p" -- break -- else -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -- fi -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ esac - fi - done -- IFS="$ac_save_ifs" -+ IFS="$lt_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm - fi - fi -- -+echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+echo "${ECHO_T}$lt_cv_path_NM" >&6 - NM="$lt_cv_path_NM" --echo "$as_me:$LINENO: result: $NM" >&5 --echo "${ECHO_T}$NM" >&6 - - echo "$as_me:$LINENO: checking whether ln -s works" >&5 - echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -@@ -3647,8 +4172,8 @@ - echo "${ECHO_T}no, using $LN_S" >&6 - fi - --echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 --echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 - if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3662,7 +4187,7 @@ - # 'pass_all' -- all dependencies passed with no checks. - # 'test_compile' -- check by making test program. - # 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given egrep regex. -+# which responds to the $file_magic_cmd with a given extended regex. - # If you have `file' or equivalent on your system and you're not sure - # whether `pass_all' will *always* work, you probably want this one. - -@@ -3675,31 +4200,30 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --bsdi4*) -+bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - --cygwin* | mingw* | pw32*) -+cygwin*) -+ # func_win32_libid is a shell function defined in ltmain.sh -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ ;; -+ -+mingw* | pw32*) -+ # Base MSYS/MinGW do not provide the 'file' command needed by -+ # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - - darwin* | rhapsody*) -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac -+ lt_cv_deplibs_check_method=pass_all - ;; - --freebsd*) -+freebsd* | kfreebsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) -@@ -3719,50 +4243,44 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --hpux10.20*|hpux11*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -- --irix5* | irix6*) -- case $host_os in -- irix5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -+ case "$host_cpu" in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac - lt_cv_deplibs_check_method=pass_all - ;; - - # This must be Linux ELF. --linux-gnu*) -- case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -+linux*) -+ lt_cv_deplibs_check_method=pass_all - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -@@ -3772,20 +4290,19 @@ - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; -+ - openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - - osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -3795,11 +4312,6 @@ - - solaris*) - lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- --sysv5uw[78]* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -@@ -3820,8 +4332,15 @@ - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - ;; -+ -+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - - fi -@@ -3829,208 +4348,228 @@ - echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 - 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 - - - - -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -+# Allow CC to be a program name with arguments. -+compiler=$CC - - -+# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval="$enable_libtool_lock" - --# Check for command to grab the raw symbol name followed by C symbol from nm. --echo "$as_me:$LINENO: checking command to parse $NM output" >&5 --echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 --if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -- --# Character class describing NM global symbol codes. --symcode='[BCDEGRST]' -- --# Regexp to match symbols that can be accessed directly from C. --sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -- --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -- --# Transform an extracted symbol line into a proper C declaration --lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -- --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+fi; -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[BCDT]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[ABCDGISTW]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --irix*) -- symcode='[BCDEGRST]' -- ;; --solaris* | sysv5*) -- symcode='[BDT]' -- ;; --sysv4) -- symcode='[DFNSTU]' -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* - ;; --esac -- --# Handle CRLF in mingw tool chain --opt_cr= --case $host_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '#line 4394 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* - ;; --esac -- --# If we're using GNU nm, then use its standard symbol codes. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- symcode='[ABCDGISTW]' --fi -- --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -- -- # Write the raw and C identifiers. --lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- rm -f conftest* -- cat > conftest.$ac_ext < conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ case "`/usr/bin/file conftest.o`" in -+ *32-bit*) -+ case $host in -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-linux*) -+ # Test if the compiler is 64bit -+ echo 'int i;' > conftest.$ac_ext -+ lt_cv_cc_64bit_output=no -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -- -- # Make sure that we snagged all the symbols we need. -- if egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *"ELF 64"*) -+ lt_cv_cc_64bit_output=yes -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 -+if test "${lt_cv_cc_needs_belf+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ 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 - -- cat <> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr address; --} --lt_preloaded_symbols[] = -+int -+main () - { --EOF -- sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr) 0} --}; - --#ifdef __cplusplus -+ ; -+ return 0; - } --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$no_builtin_flag" -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest; then -- pipe_works=yes -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&5 -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&5 -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -- fi -- else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- fi -- rm -f conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ lt_cv_cc_needs_belf=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+lt_cv_cc_needs_belf=no - fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ 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 - --global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- global_symbol_to_cdecl= -- global_symbol_to_c_name_address= --else -- global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -- global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" --fi --if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; --then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 --else -- echo "$as_me:$LINENO: result: ok" >&5 --echo "${ECHO_T}ok" >&6 - fi -+echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+ -+esac -+ -+need_locks="$enable_libtool_lock" -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -4055,24 +4594,34 @@ - do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include -- Syntax error -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -4083,7 +4632,8 @@ - : - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -@@ -4092,20 +4642,24 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -4117,7 +4671,8 @@ - continue - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break -@@ -4146,24 +4701,34 @@ - do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include -- Syntax error -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -4174,7 +4739,8 @@ - : - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -@@ -4183,20 +4749,24 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -4208,7 +4778,8 @@ - continue - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break -@@ -4221,8 +4792,10 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} -+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -4239,49 +4812,68 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - #include - #include - #include - -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then - ac_cv_header_stdc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_header_stdc=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "memchr" >/dev/null 2>&1; then -+ $EGREP "memchr" >/dev/null 2>&1; then - : - else - ac_cv_header_stdc=no -@@ -4293,13 +4885,16 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "free" >/dev/null 2>&1; then -+ $EGREP "free" >/dev/null 2>&1; then - : - else - ac_cv_header_stdc=no -@@ -4314,16 +4909,20 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) - #else --# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) - # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) - #endif - -@@ -4334,7 +4933,7 @@ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -+ || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); - } -@@ -4354,11 +4953,12 @@ - else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - fi -@@ -4383,7 +4983,7 @@ - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h -+ inttypes.h stdint.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -4392,19 +4992,32 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4413,10 +5026,11 @@ - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - eval "$as_ac_Header=no" - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -4447,18 +5061,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4467,10 +5094,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -4478,20 +5106,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -4502,7 +5134,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -4510,26 +5143,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -4546,195 +5196,258 @@ - - - -- -- --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 --echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cc -+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 -+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -+if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case $MAGIC_CMD in -- /*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/bin:$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/${ac_tool_prefix}file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -- --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; --esac -+ # Double quotes because CXXCPP needs to be expanded -+ for CXXCPP in "$CXX -E" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes - fi -- --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6 -+if test -z "$ac_cpp_err"; then -+ : - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue - fi -+rm -f conftest.err conftest.$ac_ext - --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- echo "$as_me:$LINENO: checking for file" >&5 --echo $ECHO_N "checking for file... $ECHO_C" >&6 --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ # OK, works on sane cases. Now check whether non-existent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -+ else -+ ac_cpp_err= -+ fi - else -- case $MAGIC_CMD in -- /*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/bin:$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/file" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ # Broken: success on invalid input. -+continue -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+rm -f conftest.err conftest.$ac_ext - --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; --esac -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break - fi - --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6 -+ done -+ ac_cv_prog_CXXCPP=$CXXCPP -+ -+fi -+ CXXCPP=$ac_cv_prog_CXXCPP - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ ac_cv_prog_CXXCPP=$CXXCPP - fi -- -+echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+echo "${ECHO_T}$CXXCPP" >&6 -+ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else -- MAGIC_CMD=: -+ ac_cpp_err= - fi -+else -+ ac_cpp_err=yes - fi -+if test -z "$ac_cpp_err"; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- fi -- ;; --esac -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.$ac_ext - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ # OK, works on sane cases. Now check whether non-existent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -+ else -+ ac_cpp_err= -+ fi - else -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ # Broken: success on invalid input. -+continue - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ # Passes both tests. -+ac_preproc_ok=: -+break - fi --fi --RANLIB=$ac_cv_prog_RANLIB --if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } - fi - -+ac_ext=cc -+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 -+ - fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 -+ -+ -+ac_ext=f -+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_f77_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran -+ 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 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -+ if test -n "$F77"; then -+ ac_cv_prog_F77="$F77" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -4743,40 +5456,40 @@ - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_RANLIB="ranlib" -+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+F77=$ac_cv_prog_F77 -+if test -n "$F77"; then -+ echo "$as_me:$LINENO: result: $F77" >&5 -+echo "${ECHO_T}$F77" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -- RANLIB=$ac_ct_RANLIB --else -- RANLIB="$ac_cv_prog_RANLIB" -+ test -n "$F77" && break -+ done - 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 -+if test -z "$F77"; then -+ ac_ct_F77=$F77 -+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_STRIP+set}" = set; then -+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$STRIP"; then -- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+ if test -n "$ac_ct_F77"; then -+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -4785,7 +5498,7 @@ - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ ac_cv_prog_ac_ct_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -4794,709 +5507,10849 @@ - - fi - fi --STRIP=$ac_cv_prog_STRIP --if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+ac_ct_F77=$ac_cv_prog_ac_ct_F77 -+if test -n "$ac_ct_F77"; then -+ echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -+echo "${ECHO_T}$ac_ct_F77" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -+ test -n "$ac_ct_F77" && break -+done -+ -+ F77=$ac_ct_F77 - fi --if test -z "$ac_cv_prog_STRIP"; then -- ac_ct_STRIP=$STRIP -- # Extract the first word of "strip", so it can be a program name with args. --set dummy strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_STRIP"; then -- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_STRIP="strip" -+ -+ -+# Provide some information about the compiler. -+echo "$as_me:5527:" \ -+ "checking for Fortran 77 compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -+ (eval $ac_compiler --version &5) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -+ (eval $ac_compiler -v &5) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -+ (eval $ac_compiler -V &5) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+rm -f a.out -+ -+# If we don't use `.F' as extension, the preprocessor is not run on the -+# input file. (Note that this only needs to work for GNU compilers.) -+ac_save_ext=$ac_ext -+ac_ext=F -+echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 -+if test "${ac_cv_f77_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_compiler_gnu=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_compiler_gnu=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_f77_compiler_gnu=$ac_compiler_gnu -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 -+ac_ext=$ac_save_ext -+ac_test_FFLAGS=${FFLAGS+set} -+ac_save_FFLAGS=$FFLAGS -+FFLAGS= -+echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 -+if test "${ac_cv_prog_f77_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ FFLAGS=-g -+cat >conftest.$ac_ext <<_ACEOF -+ program main -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_prog_f77_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_prog_f77_g=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 -+if test "$ac_test_FFLAGS" = set; then -+ FFLAGS=$ac_save_FFLAGS -+elif test $ac_cv_prog_f77_g = yes; then -+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then -+ FFLAGS="-g -O2" -+ else -+ FFLAGS="-g" -+ fi -+else -+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then -+ FFLAGS="-O2" -+ else -+ FFLAGS= -+ fi -+fi -+ -+G77=`test $ac_compiler_gnu = yes && echo 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 -+ -+ -+ -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -+ -+# find the maximum length of command line arguments -+echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 -+if test "${lt_cv_sys_max_cmd_len+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* ) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ ;; -+ -+ *) -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ ;; -+ esac -+ -+fi -+ -+if test -n $lt_cv_sys_max_cmd_len ; then -+ echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 -+else -+ echo "$as_me:$LINENO: result: none" >&5 -+echo "${ECHO_T}none" >&6 -+fi -+ -+ -+ -+ -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 -+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[BCDEGRST]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -+ -+# Transform the above into a raw symbol and a C symbol. -+symxfrm='\1 \2\3 \3' -+ -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[BCDT]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[ABCDGISTW]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDEGRST]' -+ fi -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+linux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDGIRSTW]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[BCDEGRST]' -+ ;; -+osf*) -+ symcode='[BCDEGQRST]' -+ ;; -+solaris* | sysv5*) -+ symcode='[BDRT]' -+ ;; -+sysv4) -+ symcode='[DFNSTU]' -+ ;; -+esac -+ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac -+ -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[ABCDGIRSTW]' ;; -+esac -+ -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do -+ -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ -+ # Check to see that the pipe works correctly. -+ pipe_works=no -+ -+ rm -f conftest* -+ cat > conftest.$ac_ext <&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi -+ -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' -+ -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif -+ -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[] = -+{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; -+ -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&5 -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&5 -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -+ fi -+ else -+ echo "$progname: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -f conftest* conftst* -+ -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+ -+fi -+ -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ echo "$as_me:$LINENO: result: failed" >&5 -+echo "${ECHO_T}failed" >&6 -+else -+ echo "$as_me:$LINENO: result: ok" >&5 -+echo "${ECHO_T}ok" >&6 -+fi -+ -+echo "$as_me:$LINENO: checking for objdir" >&5 -+echo $ECHO_N "checking for objdir... $ECHO_C" >&6 -+if test "${lt_cv_objdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null -+fi -+echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+echo "${ECHO_T}$lt_cv_objdir" >&6 -+objdir=$lt_cv_objdir -+ -+ -+ -+ -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e s/^X//' -+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Constants: -+rm="rm -f" -+ -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except M$VC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+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 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_AR+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ echo "$as_me:$LINENO: result: $AR" >&5 -+echo "${ECHO_T}$AR" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_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 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_AR="ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" -+fi -+fi -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+echo "${ECHO_T}$ac_ct_AR" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ AR=$ac_ct_AR -+else -+ AR="$ac_cv_prog_AR" -+fi -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ echo "$as_me:$LINENO: result: $RANLIB" >&5 -+echo "${ECHO_T}$RANLIB" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_RANLIB"; then -+ ac_ct_RANLIB=$RANLIB -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_RANLIB="ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -+fi -+fi -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ RANLIB=$ac_ct_RANLIB -+else -+ RANLIB="$ac_cv_prog_RANLIB" -+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 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi --done --done -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ STRIP=$ac_ct_STRIP -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -+ ;; -+ *) -+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+ -+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+ -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/${ac_tool_prefix}file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac -+fi -+ -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ echo "$as_me:$LINENO: checking for file" >&5 -+echo $ECHO_N "checking for file... $ECHO_C" >&6 -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac -+fi -+ -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ else -+ MAGIC_CMD=: -+ fi -+fi -+ -+ fi -+ ;; -+esac -+ -+enable_dlopen=no -+enable_win32_dll=no -+ -+# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval="$enable_libtool_lock" -+ -+fi; -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+ -+# Check whether --with-pic or --without-pic was given. -+if test "${with_pic+set}" = set; then -+ withval="$with_pic" -+ pic_mode="$withval" -+else -+ pic_mode=default -+fi; -+test -z "$pic_mode" && pic_mode=default -+ -+# Check if we have a version mismatch between libtool.m4 and ltmain.sh. -+# -+# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. -+# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually -+# calls AC_LIBTOOL_CONFIG and creates libtool. -+# -+echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5 -+echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6 -+if test -z "$ltmain"; then -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ echo -+ echo "*** Gentoo sanity check failed! ***" -+ echo "*** \$ltmain is not defined, please check the patch for consistency! ***" -+ echo -+ exit 1 -+fi -+gentoo_lt_version="1.5.10" -+gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'` -+if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ echo -+ echo "*** Gentoo sanity check failed! ***" -+ echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***" -+ echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***" -+ echo -+ echo "Please run:" -+ echo -+ echo " libtoolize --copy --force" -+ echo -+ echo "if appropriate, please contact the maintainer of this" -+ echo "package (or your distribution) for help." -+ echo -+ exit 1 -+else -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+fi -+ -+ -+# Use C for the default configuration in the libtool script -+tagname= -+lt_save_CC="$CC" -+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 -+ -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+objext=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}\n' -+ -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# -+# Check for any special shared library compilation flags. -+# -+lt_prog_cc_shlib= -+if test "$GCC" = no; then -+ case $host_os in -+ sco3.2v5*) -+ lt_prog_cc_shlib='-belf' -+ ;; -+ esac -+fi -+if test -n "$lt_prog_cc_shlib"; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 -+echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} -+ if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : -+ else -+ { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -+echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} -+ lt_cv_prog_cc_can_build_shared=no -+ fi -+fi -+ -+ -+# -+# Check to make sure the static flag actually works. -+# -+echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 -+if test "${lt_prog_compiler_static_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_static_works=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_prog_compiler_static" -+ printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ else -+ lt_prog_compiler_static_works=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 -+ -+if test x"$lt_prog_compiler_static_works" = xyes; then -+ : -+else -+ lt_prog_compiler_static= -+fi -+ -+ -+ -+ -+lt_prog_compiler_no_builtin_flag= -+ -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -+ -+ -+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="-fno-rtti -fno-exceptions" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:6625: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:6629: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 -+ -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -+else -+ : -+fi -+ -+fi -+ -+lt_prog_compiler_wl= -+lt_prog_compiler_pic= -+lt_prog_compiler_static= -+ -+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+ -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_static='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # 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='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic='-fno-common' -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' -+ else -+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case "$cc_basename" in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # 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='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ -+ newsos6) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ linux*) -+ case $CC in -+ icc* | ecc*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ -+ sco3.2v5*) -+ lt_prog_compiler_pic='-Kpic' -+ lt_prog_compiler_static='-dn' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl='-Qoption ld ' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic='-Kconform_pic' -+ lt_prog_compiler_static='-Bstatic' -+ fi -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic='-pic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ *) -+ lt_prog_compiler_can_build_shared=no -+ ;; -+ esac -+ fi -+ -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic" >&6 -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic"; then -+ -+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 -+if test "${lt_prog_compiler_pic_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works=no -+ ac_outfile=conftest.$ac_objext -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:6868: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:6872: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ lt_prog_compiler_pic_works=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 -+ -+if test x"$lt_prog_compiler_pic_works" = xyes; then -+ case $lt_prog_compiler_pic in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -+ esac -+else -+ lt_prog_compiler_pic= -+ lt_prog_compiler_can_build_shared=no -+fi -+ -+fi -+case "$host_os" in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic= -+ ;; -+ *) -+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" -+ ;; -+esac -+ -+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:6928: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:6932: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s out/conftest.err; then -+ lt_cv_prog_compiler_c_o=yes -+ fi -+ fi -+ chmod u+w . -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6 -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+ -+ runpath_var= -+ allow_undefined_flag= -+ enable_shared_with_static_runtimes=no -+ archive_cmds= -+ archive_expsym_cmds= -+ old_archive_From_new_cmds= -+ old_archive_from_expsyms_cmds= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= -+ thread_safe_flag_spec= -+ hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld= -+ hardcode_libdir_separator= -+ hardcode_direct=no -+ hardcode_minus_L=no -+ hardcode_shlibpath_var=unsupported -+ link_all_deplibs=unknown -+ hardcode_automatic=no -+ module_cmds= -+ module_expsym_cmds= -+ always_export_symbols=no -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ ld_shlibs=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec='-L$libdir' -+ 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 '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ 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' -+ fi -+ ;; -+ -+ solaris* | sysv5*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+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' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ sunos4*) -+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds="$tmp_archive_cmds" -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ archive_expsym_cmds="$tmp_archive_cmds" -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ *) -+ 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' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ -+ if test "$ld_shlibs" = yes; then -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L=yes -+ if test "$GCC" = yes && test -z "$link_static_flag"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds='' -+ hardcode_direct=yes -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.012|aix4.012.*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ hardcode_direct=yes -+ else -+ # We have old collect2 -+ hardcode_direct=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L=yes -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_libdir_separator= -+ fi -+ esac -+ shared_flag='-shared' -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag="-z nodefs" -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec='${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. -+ no_undefined_flag=' ${wl}-bernotok' -+ allow_undefined_flag=' ${wl}-berok' -+ # -bexpall does not export symbols beginning with underscore (_) -+ always_export_symbols=yes -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec=' ' -+ archive_cmds_need_lc=yes -+ # This is similar to how AIX traditionally builds it's shared libraries. -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs=no -+ ;; -+ -+ bsdi[45]*) -+ export_dynamic_flag_spec=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # 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 `echo "$deplibs" | $SED -e '\''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 -+ ;; -+ -+ darwin* | rhapsody*) -+ case "$host_os" in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc=no -+ hardcode_direct=no -+ hardcode_automatic=yes -+ hardcode_shlibpath_var=unsupported -+ whole_archive_flag_spec='' -+ link_all_deplibs=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case "$cc_basename" in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ freebsd1*) -+ ld_shlibs=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | kfreebsd*-gnu) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ 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' -+ 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 -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ export_dynamic_flag_spec='${wl}-E' -+ ;; -+ -+ hpux10* | hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -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' -+ ;; -+ esac -+ else -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ *) -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*) -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_ld='+b $libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ ;; -+ ia64*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ *) -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ link_all_deplibs=yes -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ newsos6) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_shlibpath_var=no -+ ;; -+ -+ openbsd*) -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ -+ os2*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ allow_undefined_flag=unsupported -+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ -+ 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" && echo ${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 \*' -+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec='-rpath $libdir' -+ fi -+ hardcode_libdir_separator=: -+ ;; -+ -+ sco3.2v5*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ export_dynamic_flag_spec='${wl}-Bexport' -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ;; -+ -+ solaris*) -+ no_undefined_flag=' -z text' -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_shlibpath_var=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) # Supported since Solaris 2.6 (maybe 2.5.1?) -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -+ esac -+ link_all_deplibs=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds='$CC -r -o $output$reload_objs' -+ hardcode_direct=no -+ ;; -+ motorola) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ sysv4.3*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ export_dynamic_flag_spec='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs=yes -+ fi -+ ;; -+ -+ sysv4.2uw2*) -+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_minus_L=no -+ hardcode_shlibpath_var=no -+ hardcode_runpath_var=yes -+ runpath_var=LD_RUN_PATH -+ ;; -+ -+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) -+ no_undefined_flag='${wl}-z ${wl}text' -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ sysv5*) -+ no_undefined_flag=' -z text' -+ # $CC -shared without GNU ld will not create a library from C++ -+ # object files and a static libstdc++, better avoid it by now -+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ hardcode_libdir_flag_spec= -+ hardcode_shlibpath_var=no -+ runpath_var='LD_RUN_PATH' -+ ;; -+ -+ uts4*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ -+echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+echo "${ECHO_T}$ld_shlibs" >&6 -+test "$ld_shlibs" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ $rm conftest* -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc=no -+ else -+ archive_cmds_need_lc=yes -+ fi -+ allow_undefined_flag=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc" >&6 -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ 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 -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # 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 -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ $archive_expsym_cmds="$archive_cmds" -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -+ if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -+ else -+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -+ fi -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+kfreebsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.01* | freebsdelf3.01*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ *) # from 3.2 on -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case "$host_cpu" in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ case $host_cpu:$lt_cv_cc_64bit_output in -+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" -+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" -+ ;; -+ esac -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ -+ # Find out which ABI we are using (multilib Linux x86_64 hack). -+ libsuff= -+ case "$host_cpu" in -+ x86_64*) -+ echo '#line 8308 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ *) -+ ;; -+ esac -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ ;; -+ -+knetbsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+sco3.2v5*) -+ version_type=osf -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6 -+test "$dynamic_linker" = no && can_build_shared=no -+ -+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+hardcode_action= -+if test -n "$hardcode_libdir_flag_spec" || \ -+ test -n "$runpath_var" || \ -+ test "X$hardcode_automatic" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && -+ test "$hardcode_minus_L" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action=unsupported -+fi -+echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+echo "${ECHO_T}$hardcode_action" >&6 -+ -+if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+striplib= -+old_striplib= -+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ ;; -+ *) -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ ;; -+ esac -+fi -+ -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dl_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ -+fi -+ -+ ;; -+ -+ *) -+ echo "$as_me:$LINENO: checking for shl_load" >&5 -+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -+if test "${ac_cv_func_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case declares shl_load. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define shl_load innocuous_shl_load -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shl_load (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef shl_load -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char shl_load (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_shl_load) || defined (__stub___shl_load) -+choke me -+#else -+char (*f) () = shl_load; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != shl_load; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_shl_load=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_shl_load=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -+if test $ac_cv_func_shl_load = yes; then -+ lt_cv_dlopen="shl_load" -+else -+ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char shl_load (); -+int -+main () -+{ -+shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dld_shl_load=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dld_shl_load=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -+if test $ac_cv_lib_dld_shl_load = yes; then -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -+else -+ echo "$as_me:$LINENO: checking for dlopen" >&5 -+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -+if test "${ac_cv_func_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case declares dlopen. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define dlopen innocuous_dlopen -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef dlopen -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_dlopen) || defined (__stub___dlopen) -+choke me -+#else -+char (*f) () = dlopen; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != dlopen; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -+if test $ac_cv_func_dlopen = yes; then -+ lt_cv_dlopen="dlopen" -+else -+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dl_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_svld_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_svld_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -+if test $ac_cv_lib_svld_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+else -+ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dld_link (); -+int -+main () -+{ -+dld_link (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dld_dld_link=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dld_dld_link=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -+if test $ac_cv_lib_dld_dld_link = yes; then -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -+if test "${lt_cv_dlopen_self+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ -+ exit (status); -+} -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_unknown|x*) lt_cv_dlopen_self=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ LDFLAGS="$LDFLAGS $link_static_flag" -+ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -+if test "${lt_cv_dlopen_self_static+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self_static=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ -+ exit (status); -+} -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self_static=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+ -+ -+# Report which librarie types wil actually be built -+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -+echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6 -+ -+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case "$host_os" in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6 -+ -+echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6 -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler \ -+ CC \ -+ LD \ -+ lt_prog_compiler_wl \ -+ lt_prog_compiler_pic \ -+ lt_prog_compiler_static \ -+ lt_prog_compiler_no_builtin_flag \ -+ export_dynamic_flag_spec \ -+ thread_safe_flag_spec \ -+ whole_archive_flag_spec \ -+ enable_shared_with_static_runtimes \ -+ old_archive_cmds \ -+ old_archive_from_new_cmds \ -+ predep_objects \ -+ postdep_objects \ -+ predeps \ -+ postdeps \ -+ compiler_lib_search_path \ -+ archive_cmds \ -+ archive_expsym_cmds \ -+ postinstall_cmds \ -+ postuninstall_cmds \ -+ old_archive_from_expsyms_cmds \ -+ allow_undefined_flag \ -+ no_undefined_flag \ -+ export_symbols_cmds \ -+ hardcode_libdir_flag_spec \ -+ hardcode_libdir_flag_spec_ld \ -+ hardcode_libdir_separator \ -+ hardcode_automatic \ -+ module_cmds \ -+ module_expsym_cmds \ -+ lt_cv_prog_compiler_c_o \ -+ exclude_expsyms \ -+ include_expsyms; do -+ -+ case $var in -+ old_archive_cmds | \ -+ old_archive_from_new_cmds | \ -+ archive_cmds | \ -+ archive_expsym_cmds | \ -+ module_cmds | \ -+ module_expsym_cmds | \ -+ old_archive_from_expsyms_cmds | \ -+ export_symbols_cmds | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ { echo "$as_me:$LINENO: creating $ofile" >&5 -+echo "$as_me: creating $ofile" >&6;} -+ -+ cat <<__EOF__ >> "$cfgfile" -+#! $SHELL -+ -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit , 1996 -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# A sed program that does not truncate output. -+SED=$lt_SED -+ -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e s/^X//" -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# The names of the tagged configurations supported by this script. -+available_tags= -+ -+# ### BEGIN LIBTOOL CONFIG -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# A language-specific compiler. -+CC=$lt_compiler -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o -+ -+# Must we lock files when doing compilation ? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds -+archive_expsym_cmds=$lt_archive_expsym_cmds -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds -+module_expsym_cmds=$lt_module_expsym_cmds -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path -+ -+# 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. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path="$fix_srcfile_path" -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms -+ -+# ### END LIBTOOL CONFIG -+ -+__EOF__ -+ -+ -+ case $host_os in -+ aix3*) -+ cat <<\EOF >> "$cfgfile" -+ -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF -+ ;; -+ esac -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ 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 -+ -+CC="$lt_save_CC" -+ -+ -+# Check whether --with-tags or --without-tags was given. -+if test "${with_tags+set}" = set; then -+ withval="$with_tags" -+ tagnames="$withval" -+fi; -+ -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} -+ fi -+ -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} -+ else -+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} -+ fi -+ fi -+ -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in -+ "") ;; -+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -+echo "$as_me: error: invalid tag name: $tagname" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ esac -+ -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cc -+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 -+ -+ -+ -+ -+archive_cmds_need_lc_CXX=no -+allow_undefined_flag_CXX= -+always_export_symbols_CXX=no -+archive_expsym_cmds_CXX= -+export_dynamic_flag_spec_CXX= -+hardcode_direct_CXX=no -+hardcode_libdir_flag_spec_CXX= -+hardcode_libdir_flag_spec_ld_CXX= -+hardcode_libdir_separator_CXX= -+hardcode_minus_L_CXX=no -+hardcode_automatic_CXX=no -+module_cmds_CXX= -+module_expsym_cmds_CXX= -+link_all_deplibs_CXX=unknown -+old_archive_cmds_CXX=$old_archive_cmds -+no_undefined_flag_CXX= -+whole_archive_flag_spec_CXX= -+enable_shared_with_static_runtimes_CXX=no -+ -+# Dependencies to place before and after the object being linked: -+predep_objects_CXX= -+postdep_objects_CXX= -+predeps_CXX= -+postdeps_CXX= -+compiler_lib_search_path_CXX= -+ -+# Source file extension for C++ test sources. -+ac_ext=cc -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+objext_CXX=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *) { return(0); }\n' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+compiler_CXX=$CC -+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+ -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -+else -+ lt_prog_compiler_no_builtin_flag_CXX= -+fi -+ -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ -+# Check whether --with-gnu-ld or --without-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval="$with_gnu_ld" -+ test "$withval" = no || with_gnu_ld=yes -+else -+ with_gnu_ld=no -+fi; -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -+else -+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -+fi -+if test "${lt_cv_path_LD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some GNU ld's only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &5 -+echo "${ECHO_T}$LD" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -+if test "${lt_cv_prog_gnu_ld+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # I'd rather use --version here, but apparently some GNU ld's only accept -v. -+case `$LD -v 2>&1 &5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -+with_gnu_ld=$lt_cv_prog_gnu_ld -+ -+ -+ -+ # 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' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_CXX= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+fi -+ -+# PORTME: fill in a description of your system's C++ link characteristics -+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+ld_shlibs_CXX=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_CXX='' -+ hardcode_direct_CXX=yes -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.012|aix4.012.*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ hardcode_direct_CXX=yes -+ else -+ # We have old collect2 -+ hardcode_direct_CXX=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_CXX=yes -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ hardcode_libdir_separator_CXX= -+ fi -+ esac -+ shared_flag='-shared' -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_CXX=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_CXX='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_CXX="-z nodefs" -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_CXX='${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. -+ no_undefined_flag_CXX=' ${wl}-bernotok' -+ allow_undefined_flag_CXX=' ${wl}-berok' -+ # -bexpall does not export symbols beginning with underscore (_) -+ always_export_symbols_CXX=yes -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_CXX=' ' -+ archive_cmds_need_lc_CXX=yes -+ # This is similar to how AIX traditionally builds it's shared libraries. -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ 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}--image-base=0x10000000 ${wl}--out-implib,$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}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ case "$host_os" in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes -+ -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case "$cc_basename" in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ ghcx) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ freebsd12*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ ld_shlibs_CXX=no -+ ;; -+ freebsd-elf*) -+ archive_cmds_need_lc_CXX=no -+ ;; -+ freebsd* | kfreebsd*-gnu) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ ld_shlibs_CXX=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC) -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${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' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ 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' -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ case "$host_cpu" in -+ hppa*64*) -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_ld_CXX='+b $libdir' -+ hardcode_libdir_separator_CXX=: -+ ;; -+ ia64*) -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ ;; -+ *) -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ ;; -+ esac -+ fi -+ case "$host_cpu" in -+ hppa*64*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ ;; -+ ia64*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ *) -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC) -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case "$host_cpu" in -+ ia64*|hppa*64*) -+ archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' -+ ;; -+ *) -+ 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' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC) -+ # SGI C++ -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ 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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${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" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ link_all_deplibs_CXX=yes -+ ;; -+ esac -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ ;; -+ linux*) -+ case $cc_basename in -+ KCC) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ cxx) -+ # Compaq C++ -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ esac -+ ;; -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ -+ ;; -+ RCC) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx) -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx) -+ allow_undefined_flag_CXX=' -expect_unresolved \*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ 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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ sco*) -+ archive_cmds_need_lc_CXX=no -+ case $cc_basename in -+ CC) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ lcc) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_shlibpath_var_CXX=no -+ case $host_os in -+ solaris2.0-5 | solaris2.0-5.*) ;; -+ *) -+ # The C++ compiler is used as linker so we must use $wl -+ # flag to pass the commands to the underlying system -+ # linker. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ link_all_deplibs_CXX=yes -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx) -+ # Green Hills C++ Compiler -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ 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_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' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ archive_cmds_CXX='$CC -G -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 -G -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 -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -+ fi -+ ;; -+ esac -+ ;; -+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) -+ archive_cmds_need_lc_CXX=no -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+esac -+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6 -+test "$ld_shlibs_CXX" = no && can_build_shared=no -+ -+GCC_CXX="$GXX" -+LD_CXX="$LD" -+ -+ -+cat > conftest.$ac_ext <&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ # The `*' in the case matches for architectures that use `case' in -+ # $output_verbose_cmd can trigger glob expansion during the loop -+ # eval without this substitution. -+ output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" -+ -+ for p in `eval $output_verbose_link_cmd`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" \ -+ || test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p 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. -+ if test -z "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_path_CXX="${prev}${p}" -+ else -+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$postdeps_CXX"; then -+ postdeps_CXX="${prev}${p}" -+ else -+ postdeps_CXX="${postdeps_CXX} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$predep_objects_CXX"; then -+ predep_objects_CXX="$p" -+ else -+ predep_objects_CXX="$predep_objects_CXX $p" -+ fi -+ else -+ if test -z "$postdep_objects_CXX"; then -+ postdep_objects_CXX="$p" -+ else -+ postdep_objects_CXX="$postdep_objects_CXX $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling CXX test program" -+fi -+ -+$rm -f confest.$objext -+ -+case " $postdeps_CXX " in -+*" -lc "*) archive_cmds_need_lc_CXX=no ;; -+esac -+ -+lt_prog_compiler_wl_CXX= -+lt_prog_compiler_pic_CXX= -+lt_prog_compiler_static_CXX= -+ -+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ fi -+ ;; -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | os2* | pw32*) -+ # 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' -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_CXX='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ lt_prog_compiler_pic_CXX= -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_CXX=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ esac -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix4* | aix5*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ else -+ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68) -+ # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case "$cc_basename" in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++) -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ ghcx) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | kfreebsd*-gnu) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ if test "$host_cpu" != ia64; then -+ lt_prog_compiler_pic_CXX='+Z' -+ fi -+ ;; -+ aCC) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux*) -+ case $cc_basename in -+ KCC) -+ # KAI C++ Compiler -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ icpc) -+ # Intel C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-static' -+ ;; -+ cxx) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx) -+ lt_prog_compiler_pic_CXX='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd*) -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC) -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ ;; -+ RCC) -+ # Rational C++ 2.4.1 -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ cxx) -+ # Digital/Compaq C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ sco*) -+ case $cc_basename in -+ CC) -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ gcx) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC) -+ # Sun C++ 4.x -+ lt_prog_compiler_pic_CXX='-pic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ lcc) -+ # Lucid -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC) -+ # NonStop-UX NCC 3.20 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ unixware*) -+ ;; -+ vxworks*) -+ ;; -+ *) -+ lt_prog_compiler_can_build_shared_CXX=no -+ ;; -+ esac -+ fi -+ -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_CXX"; then -+ -+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 -+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works_CXX=no -+ ac_outfile=conftest.$ac_objext -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:11459: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:11463: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ lt_prog_compiler_pic_works_CXX=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 -+ -+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+ case $lt_prog_compiler_pic_CXX in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -+ esac -+else -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_can_build_shared_CXX=no -+fi -+ -+fi -+case "$host_os" in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_CXX= -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" -+ ;; -+esac -+ -+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_CXX=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:11519: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:11523: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s out/conftest.err; then -+ lt_cv_prog_compiler_c_o_CXX=yes -+ fi -+ fi -+ chmod u+w . -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6 -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+ -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix4* | aix5*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ export_symbols_cmds_CXX="$ltdll_cmds" -+ ;; -+ cygwin* | mingw*) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ -+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6 -+test "$ld_shlibs_CXX" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_CXX" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_CXX=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_CXX in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ $rm conftest* -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_CXX -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -+ allow_undefined_flag_CXX= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_CXX=no -+ else -+ archive_cmds_need_lc_CXX=yes -+ fi -+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ 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 -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # 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 -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ $archive_expsym_cmds="$archive_cmds" -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -+ if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -+ else -+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -+ fi -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+kfreebsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.01* | freebsdelf3.01*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ *) # from 3.2 on -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case "$host_cpu" in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ case $host_cpu:$lt_cv_cc_64bit_output in -+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" -+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" -+ ;; -+ esac -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ -+ # Find out which ABI we are using (multilib Linux x86_64 hack). -+ libsuff= -+ case "$host_cpu" in -+ x86_64*) -+ echo '#line 12075 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ *) -+ ;; -+ esac -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ ;; -+ -+knetbsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+sco3.2v5*) -+ version_type=osf -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6 -+test "$dynamic_linker" = no && can_build_shared=no -+ -+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+hardcode_action_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || \ -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_CXX" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -+ test "$hardcode_minus_L_CXX" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_CXX=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_CXX=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_CXX=unsupported -+fi -+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+echo "${ECHO_T}$hardcode_action_CXX" >&6 -+ -+if test "$hardcode_action_CXX" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+striplib= -+old_striplib= -+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ ;; -+ *) -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ ;; -+ esac -+fi -+ -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dl_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ -+fi -+ -+ ;; -+ -+ *) -+ echo "$as_me:$LINENO: checking for shl_load" >&5 -+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -+if test "${ac_cv_func_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case declares shl_load. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define shl_load innocuous_shl_load -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shl_load (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef shl_load -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char shl_load (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_shl_load) || defined (__stub___shl_load) -+choke me -+#else -+char (*f) () = shl_load; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != shl_load; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_shl_load=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_shl_load=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -+if test $ac_cv_func_shl_load = yes; then -+ lt_cv_dlopen="shl_load" -+else -+ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char shl_load (); -+int -+main () -+{ -+shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dld_shl_load=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dld_shl_load=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -+if test $ac_cv_lib_dld_shl_load = yes; then -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -+else -+ echo "$as_me:$LINENO: checking for dlopen" >&5 -+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -+if test "${ac_cv_func_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case declares dlopen. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define dlopen innocuous_dlopen -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef dlopen -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_dlopen) || defined (__stub___dlopen) -+choke me -+#else -+char (*f) () = dlopen; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != dlopen; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -+if test $ac_cv_func_dlopen = yes; then -+ lt_cv_dlopen="dlopen" -+else -+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dl_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_svld_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_svld_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -+if test $ac_cv_lib_svld_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+else -+ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dld_link (); -+int -+main () -+{ -+dld_link (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dld_dld_link=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dld_dld_link=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -+if test $ac_cv_lib_dld_dld_link = yes; then -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -+if test "${lt_cv_dlopen_self+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ -+ exit (status); -+} -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_unknown|x*) lt_cv_dlopen_self=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ LDFLAGS="$LDFLAGS $link_static_flag" -+ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -+if test "${lt_cv_dlopen_self_static+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self_static=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ -+ exit (status); -+} -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self_static=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_CXX \ -+ CC_CXX \ -+ LD_CXX \ -+ lt_prog_compiler_wl_CXX \ -+ lt_prog_compiler_pic_CXX \ -+ lt_prog_compiler_static_CXX \ -+ lt_prog_compiler_no_builtin_flag_CXX \ -+ export_dynamic_flag_spec_CXX \ -+ thread_safe_flag_spec_CXX \ -+ whole_archive_flag_spec_CXX \ -+ enable_shared_with_static_runtimes_CXX \ -+ old_archive_cmds_CXX \ -+ old_archive_from_new_cmds_CXX \ -+ predep_objects_CXX \ -+ postdep_objects_CXX \ -+ predeps_CXX \ -+ postdeps_CXX \ -+ compiler_lib_search_path_CXX \ -+ archive_cmds_CXX \ -+ archive_expsym_cmds_CXX \ -+ postinstall_cmds_CXX \ -+ postuninstall_cmds_CXX \ -+ old_archive_from_expsyms_cmds_CXX \ -+ allow_undefined_flag_CXX \ -+ no_undefined_flag_CXX \ -+ export_symbols_cmds_CXX \ -+ hardcode_libdir_flag_spec_CXX \ -+ hardcode_libdir_flag_spec_ld_CXX \ -+ hardcode_libdir_separator_CXX \ -+ hardcode_automatic_CXX \ -+ module_cmds_CXX \ -+ module_expsym_cmds_CXX \ -+ lt_cv_prog_compiler_c_o_CXX \ -+ exclude_expsyms_CXX \ -+ include_expsyms_CXX; do -+ -+ case $var in -+ old_archive_cmds_CXX | \ -+ old_archive_from_new_cmds_CXX | \ -+ archive_cmds_CXX | \ -+ archive_expsym_cmds_CXX | \ -+ module_cmds_CXX | \ -+ module_expsym_cmds_CXX | \ -+ old_archive_from_expsyms_cmds_CXX | \ -+ export_symbols_cmds_CXX | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="$ofile" -+ -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# A language-specific compiler. -+CC=$lt_compiler_CXX -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_CXX -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD_CXX -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_CXX -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -+ -+# Must we lock files when doing compilation ? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_CXX -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_CXX -+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_CXX -+module_expsym_cmds=$lt_module_expsym_cmds_CXX -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_CXX -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_CXX -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_CXX -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_CXX -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -+ -+# 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. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_CXX -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_CXX -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_CXX -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_CXX -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_CXX -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_CXX -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_CXX -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path="$fix_srcfile_path_CXX" -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_CXX -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_CXX -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_CXX -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_CXX -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ -+ -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ 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 -+ -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+ -+ else -+ tagname="" -+ fi -+ ;; -+ -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ -+ac_ext=f -+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_f77_compiler_gnu -+ -+ -+archive_cmds_need_lc_F77=no -+allow_undefined_flag_F77= -+always_export_symbols_F77=no -+archive_expsym_cmds_F77= -+export_dynamic_flag_spec_F77= -+hardcode_direct_F77=no -+hardcode_libdir_flag_spec_F77= -+hardcode_libdir_flag_spec_ld_F77= -+hardcode_libdir_separator_F77= -+hardcode_minus_L_F77=no -+hardcode_automatic_F77=no -+module_cmds_F77= -+module_expsym_cmds_F77= -+link_all_deplibs_F77=unknown -+old_archive_cmds_F77=$old_archive_cmds -+no_undefined_flag_F77= -+whole_archive_flag_spec_F77= -+enable_shared_with_static_runtimes_F77=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+objext_F77=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code=" program t\n end\n" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+compiler_F77=$CC -+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+ -+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -+echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6 -+ -+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case "$host_os" in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+aix4* | aix5*) -+ test "$enable_shared" = yes && enable_static=no -+ ;; -+esac -+echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6 -+ -+echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6 -+ -+test "$ld_shlibs_F77" = no && can_build_shared=no -+ -+GCC_F77="$G77" -+LD_F77="$LD" -+ -+lt_prog_compiler_wl_F77= -+lt_prog_compiler_pic_F77= -+lt_prog_compiler_static_F77= -+ -+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+ -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_static_F77='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_F77='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # 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_F77='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_F77='-fno-common' -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared_F77=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_F77=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_F77='-Bstatic' -+ else -+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case "$cc_basename" in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # 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_F77='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_F77='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static_F77='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ newsos6) -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ linux*) -+ case $CC in -+ icc* | ecc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-static' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ sco3.2v5*) -+ lt_prog_compiler_pic_F77='-Kpic' -+ lt_prog_compiler_static_F77='-dn' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl_F77='-Qoption ld ' -+ lt_prog_compiler_pic_F77='-PIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic_F77='-Kconform_pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ fi -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic_F77='-pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ *) -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ esac -+ fi -+ -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_F77"; then -+ -+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 -+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works_F77=no -+ ac_outfile=conftest.$ac_objext -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic_F77" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:13870: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:13874: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ lt_prog_compiler_pic_works_F77=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 -+ -+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+ case $lt_prog_compiler_pic_F77 in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -+ esac -+else -+ lt_prog_compiler_pic_F77= -+ lt_prog_compiler_can_build_shared_F77=no -+fi -+ -+fi -+case "$host_os" in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_F77= -+ ;; -+ *) -+ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" -+ ;; -+esac -+ -+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_F77=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:13930: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:13934: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s out/conftest.err; then -+ lt_cv_prog_compiler_c_o_F77=yes -+ fi -+ fi -+ chmod u+w . -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6 -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+ -+ runpath_var= -+ allow_undefined_flag_F77= -+ enable_shared_with_static_runtimes_F77=no -+ archive_cmds_F77= -+ archive_expsym_cmds_F77= -+ old_archive_From_new_cmds_F77= -+ old_archive_from_expsyms_cmds_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= -+ thread_safe_flag_spec_F77= -+ hardcode_libdir_flag_spec_F77= -+ hardcode_libdir_flag_spec_ld_F77= -+ hardcode_libdir_separator_F77= -+ hardcode_direct_F77=no -+ hardcode_minus_L_F77=no -+ hardcode_shlibpath_var_F77=unsupported -+ link_all_deplibs_F77=unknown -+ hardcode_automatic_F77=no -+ module_cmds_F77= -+ module_expsym_cmds_F77= -+ always_export_symbols_F77=no -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms_F77= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ ld_shlibs_F77=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs_F77=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs_F77=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_F77=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ allow_undefined_flag_F77=unsupported -+ always_export_symbols_F77=no -+ enable_shared_with_static_runtimes_F77=yes -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_F77='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris* | sysv5*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs_F77=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ sunos4*) -+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds_F77="$tmp_archive_cmds" -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ archive_expsym_cmds_F77="$tmp_archive_cmds" -+ fi -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ esac -+ -+ if test "$ld_shlibs_F77" = yes; then -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_F77= -+ fi -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag_F77=unsupported -+ always_export_symbols_F77=yes -+ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L_F77=yes -+ if test "$GCC" = yes && test -z "$link_static_flag"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_F77=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_F77='' -+ hardcode_direct_F77=yes -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.012|aix4.012.*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ hardcode_direct_F77=yes -+ else -+ # We have old collect2 -+ hardcode_direct_F77=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_F77=yes -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_libdir_separator_F77= -+ fi -+ esac -+ shared_flag='-shared' -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_F77=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_F77='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_F77="-z nodefs" -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_F77='${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. -+ no_undefined_flag_F77=' ${wl}-bernotok' -+ allow_undefined_flag_F77=' ${wl}-berok' -+ # -bexpall does not export symbols beginning with underscore (_) -+ always_export_symbols_F77=yes -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_F77=' ' -+ archive_cmds_need_lc_F77=yes -+ # This is similar to how AIX traditionally builds it's shared libraries. -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs_F77=no -+ ;; -+ -+ bsdi[45]*) -+ export_dynamic_flag_spec_F77=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_F77=' ' -+ allow_undefined_flag_F77=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_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_From_new_cmds_F77='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_F77=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case "$host_os" in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_F77=no -+ hardcode_direct_F77=no -+ hardcode_automatic_F77=yes -+ hardcode_shlibpath_var_F77=unsupported -+ whole_archive_flag_spec_F77='' -+ link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case "$cc_basename" in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ freebsd1*) -+ ld_shlibs_F77=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | kfreebsd*-gnu) -+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$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' -+ else -+ archive_cmds_F77='$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 -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_direct_F77=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ ;; -+ -+ hpux10* | hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ *) -+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*) -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_ld_F77='+b $libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ ;; -+ ia64*) -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ ;; -+ *) -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_direct_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ link_all_deplibs_F77=yes -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ newsos6) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ openbsd*) -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ -+ os2*) -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ allow_undefined_flag_F77=unsupported -+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag_F77=' -expect_unresolved \*' -+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag_F77=' -expect_unresolved \*' -+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec_F77='-rpath $libdir' -+ fi -+ hardcode_libdir_separator_F77=: -+ ;; -+ -+ sco3.2v5*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ export_dynamic_flag_spec_F77='${wl}-Bexport' -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ;; -+ -+ solaris*) -+ no_undefined_flag_F77=' -z text' -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_shlibpath_var_F77=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) # Supported since Solaris 2.6 (maybe 2.5.1?) -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; -+ esac -+ link_all_deplibs_F77=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds_F77='$CC -r -o $output$reload_objs' -+ hardcode_direct_F77=no -+ ;; -+ motorola) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ sysv4.3*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ export_dynamic_flag_spec_F77='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs_F77=yes -+ fi -+ ;; -+ -+ sysv4.2uw2*) -+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_runpath_var=yes -+ runpath_var=LD_RUN_PATH -+ ;; -+ -+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) -+ no_undefined_flag_F77='${wl}-z ${wl}text' -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ sysv5*) -+ no_undefined_flag_F77=' -z text' -+ # $CC -shared without GNU ld will not create a library from C++ -+ # object files and a static libstdc++, better avoid it by now -+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ hardcode_libdir_flag_spec_F77= -+ hardcode_shlibpath_var_F77=no -+ runpath_var='LD_RUN_PATH' -+ ;; -+ -+ uts4*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ -+echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -+echo "${ECHO_T}$ld_shlibs_F77" >&6 -+test "$ld_shlibs_F77" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_F77" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_F77=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_F77 in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ $rm conftest* -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_F77 -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_F77 -+ allow_undefined_flag_F77= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_F77=no -+ else -+ archive_cmds_need_lc_F77=yes -+ fi -+ allow_undefined_flag_F77=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ 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 -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # 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 -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ $archive_expsym_cmds="$archive_cmds" -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -+ if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -+ else -+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -+ fi -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+kfreebsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.01* | freebsdelf3.01*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ *) # from 3.2 on -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case "$host_cpu" in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ case $host_cpu:$lt_cv_cc_64bit_output in -+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" -+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" -+ ;; -+ esac -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ -+ # Find out which ABI we are using (multilib Linux x86_64 hack). -+ libsuff= -+ case "$host_cpu" in -+ x86_64*) -+ echo '#line 15290 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ *) -+ ;; -+ esac -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ ;; -+ -+knetbsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+sco3.2v5*) -+ version_type=osf -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6 -+test "$dynamic_linker" = no && can_build_shared=no -+ -+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+hardcode_action_F77= -+if test -n "$hardcode_libdir_flag_spec_F77" || \ -+ test -n "$runpath_var_F77" || \ -+ test "X$hardcode_automatic_F77" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_F77" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && -+ test "$hardcode_minus_L_F77" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_F77=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_F77=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_F77=unsupported -+fi -+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -+echo "${ECHO_T}$hardcode_action_F77" >&6 -+ -+if test "$hardcode_action_F77" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+striplib= -+old_striplib= -+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ ;; -+ *) -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ ;; -+ esac -+fi -+ -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_F77 \ -+ CC_F77 \ -+ LD_F77 \ -+ lt_prog_compiler_wl_F77 \ -+ lt_prog_compiler_pic_F77 \ -+ lt_prog_compiler_static_F77 \ -+ lt_prog_compiler_no_builtin_flag_F77 \ -+ export_dynamic_flag_spec_F77 \ -+ thread_safe_flag_spec_F77 \ -+ whole_archive_flag_spec_F77 \ -+ enable_shared_with_static_runtimes_F77 \ -+ old_archive_cmds_F77 \ -+ old_archive_from_new_cmds_F77 \ -+ predep_objects_F77 \ -+ postdep_objects_F77 \ -+ predeps_F77 \ -+ postdeps_F77 \ -+ compiler_lib_search_path_F77 \ -+ archive_cmds_F77 \ -+ archive_expsym_cmds_F77 \ -+ postinstall_cmds_F77 \ -+ postuninstall_cmds_F77 \ -+ old_archive_from_expsyms_cmds_F77 \ -+ allow_undefined_flag_F77 \ -+ no_undefined_flag_F77 \ -+ export_symbols_cmds_F77 \ -+ hardcode_libdir_flag_spec_F77 \ -+ hardcode_libdir_flag_spec_ld_F77 \ -+ hardcode_libdir_separator_F77 \ -+ hardcode_automatic_F77 \ -+ module_cmds_F77 \ -+ module_expsym_cmds_F77 \ -+ lt_cv_prog_compiler_c_o_F77 \ -+ exclude_expsyms_F77 \ -+ include_expsyms_F77; do -+ -+ case $var in -+ old_archive_cmds_F77 | \ -+ old_archive_from_new_cmds_F77 | \ -+ archive_cmds_F77 | \ -+ archive_expsym_cmds_F77 | \ -+ module_cmds_F77 | \ -+ module_expsym_cmds_F77 | \ -+ old_archive_from_expsyms_cmds_F77 | \ -+ export_symbols_cmds_F77 | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="$ofile" -+ -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_F77 -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# A language-specific compiler. -+CC=$lt_compiler_F77 -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_F77 -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD_F77 -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_F77 -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_F77 -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -+ -+# Must we lock files when doing compilation ? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_F77 -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_F77 -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_F77 -+archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_F77 -+module_expsym_cmds=$lt_module_expsym_cmds_F77 -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_F77 -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_F77 -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_F77 -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_F77 -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -+ -+# 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. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_F77 -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_F77 -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_F77 -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_F77 - -- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" --fi --fi --ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP --if test -n "$ac_ct_STRIP"; then -- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_F77 - -- STRIP=$ac_ct_STRIP --else -- STRIP="$ac_cv_prog_STRIP" --fi -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_F77 - --enable_dlopen=no --enable_win32_dll=no -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - --# Check whether --enable-libtool-lock or --disable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval="$enable_libtool_lock" -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_F77 - --fi; --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --*-*-irix6*) -- # Find out which ABI we are using. -- echo '#line 4866 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 --echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 --if test "${lt_cv_cc_needs_belf+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path="$fix_srcfile_path_F77" - -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_F77 - -- 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 -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_F77 - -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_F77 -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_F77 -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- lt_cv_cc_needs_belf=yes - else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --lt_cv_cc_needs_belf=no -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- ac_ext=c -+ -+ -+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 - --fi --echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 --echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; -+CC="$lt_save_CC" -+ -+ else -+ tagname="" -+ fi -+ ;; - -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - --esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' --sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - --# Same as above, but do not quote variable references. --double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+# Source file extension for Java test sources. -+ac_ext=java - --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+# Object file extension for compiled Java test sources. -+objext=o -+objext_GCJ=$objext - --# Constants: --rm="rm -f" -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}\n" - --# Global variables: --default_ofile=libtool --can_build_shared=yes -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' - --# All known linkers require a `.a' archive for static linking (except M$VC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" --need_locks="$enable_libtool_lock" -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+# Allow CC to be a program name with arguments. -+compiler=$CC - --if test x"$host" != x"$build"; then -- ac_tool_prefix=${host_alias}- --else -- ac_tool_prefix= --fi - --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case $host_os in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` --esac -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+compiler_GCJ=$CC - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+archive_cmds_need_lc_GCJ=no - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -- ;; -- *) -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi -+lt_prog_compiler_no_builtin_flag_GCJ= - --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="$2" -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - --echo "$as_me:$LINENO: checking for objdir" >&5 --echo $ECHO_N "checking for objdir... $ECHO_C" >&6 --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs -+ -+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="-fno-rtti -fno-exceptions" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:16020: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:16024: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* -+ - fi --rmdir .libs 2>/dev/null --echo "$as_me:$LINENO: result: $objdir" >&5 --echo "${ECHO_T}$objdir" >&6 -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 - -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -+else -+ : -+fi - -+fi - --# Check whether --with-pic or --without-pic was given. --if test "${with_pic+set}" = set; then -- withval="$with_pic" -- pic_mode="$withval" --else -- pic_mode=default --fi; --test -z "$pic_mode" && pic_mode=default -+lt_prog_compiler_wl_GCJ= -+lt_prog_compiler_pic_GCJ= -+lt_prog_compiler_static_GCJ= - --# We assume here that the value for lt_cv_prog_cc_pic will not be cached --# in isolation, and that seeing it set (from the cache) indicates that --# the associated values are set (in the cache) correctly too. - echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 - echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 --if test "${lt_cv_prog_cc_pic+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_shlib= -- lt_cv_prog_cc_wl= -- lt_cv_prog_cc_static= -- lt_cv_prog_cc_no_builtin= -- lt_cv_prog_cc_can_build_shared=$can_build_shared - - if test "$GCC" = yes; then -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-static' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_static_GCJ='-static' - - case $host_os in -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # not sure about C++ programs. -- lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ fi - ;; -+ - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. -- lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' -+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -+ -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -+ -+ mingw* | pw32* | os2*) -+ # 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_GCJ='-DDLL_EXPORT' -+ ;; -+ - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files -- lt_cv_prog_cc_pic='-fno-common' -+ lt_prog_compiler_pic_GCJ='-fno-common' - ;; -- cygwin* | mingw* | pw32* | os2*) -- # 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_cv_prog_cc_pic='-DDLL_EXPORT' -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared_GCJ=no -+ enable_shared=no - ;; -+ - sysv4*MP*) - if test -d /usr/nec; then -- lt_cv_prog_cc_pic=-Kconform_pic -+ lt_prog_compiler_pic_GCJ=-Kconform_pic - fi - ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ='-fPIC' -+ ;; -+ esac -+ ;; -+ - *) -- lt_cv_prog_cc_pic='-fPIC' -+ lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - else -- # PORTME Check for PIC flags for the system compiler. -+ # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in -- aix3* | aix4* | aix5*) -- lt_cv_prog_cc_wl='-Wl,' -- # All AIX code is PIC. -+ aix*) -+ lt_prog_compiler_wl_GCJ='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -- lt_cv_prog_cc_static='-Bstatic' -+ lt_prog_compiler_static_GCJ='-Bstatic' - else -- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' -+ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case "$cc_basename" in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # 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_GCJ='-DDLL_EXPORT' -+ ;; - - hpux9* | hpux10* | hpux11*) -- # Is there a better lt_cv_prog_cc_static that works with the bundled CC? -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" -- lt_cv_prog_cc_pic='+Z' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' - ;; - -- irix5* | irix6*) -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl_GCJ='-Wl,' - # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static_GCJ='-non_shared' - ;; - -- cygwin* | mingw* | pw32* | os2*) -- # 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_cv_prog_cc_pic='-DDLL_EXPORT' -+ newsos6) -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -- newsos6) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -+ linux*) -+ case $CC in -+ icc* | ecc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-static' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ esac - ;; - - osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_GCJ='-Wl,' - # All OSF/1 code is PIC. -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -+ lt_prog_compiler_static_GCJ='-non_shared' - ;; - - sco3.2v5*) -- lt_cv_prog_cc_pic='-Kpic' -- lt_cv_prog_cc_static='-dn' -- lt_cv_prog_cc_shlib='-belf' -+ lt_prog_compiler_pic_GCJ='-Kpic' -+ lt_prog_compiler_static_GCJ='-dn' - ;; - - solaris*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Wl,' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sunos4*) -- lt_cv_prog_cc_pic='-PIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Qoption ld ' -+ lt_prog_compiler_wl_GCJ='-Qoption ld ' -+ lt_prog_compiler_pic_GCJ='-PIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- if test "x$host_vendor" = xsni; then -- lt_cv_prog_cc_wl='-LD' -- else -- lt_cv_prog_cc_wl='-Wl,' -- fi -- ;; -- -- uts4*) -- lt_cv_prog_cc_pic='-pic' -- lt_cv_prog_cc_static='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then -- lt_cv_prog_cc_pic='-Kconform_pic' -- lt_cv_prog_cc_static='-Bstatic' -+ lt_prog_compiler_pic_GCJ='-Kconform_pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - -+ uts4*) -+ lt_prog_compiler_pic_GCJ='-pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ - *) -- lt_cv_prog_cc_can_build_shared=no -+ lt_prog_compiler_can_build_shared_GCJ=no - ;; - esac - fi - --fi -- --if test -z "$lt_cv_prog_cc_pic"; then -- echo "$as_me:$LINENO: result: none" >&5 --echo "${ECHO_T}none" >&6 --else -- echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 -- -- # Check to make sure the pic_flag actually works. -- echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 -- if test "${lt_cv_prog_cc_pic_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- case $host_os in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then -- # they create non-PIC objects. So, if there were any warnings, we -- # assume that PIC is not supported. -- if test -s conftest.err; then -- lt_cv_prog_cc_pic_works=no -- else -- lt_cv_prog_cc_pic_works=yes -- fi -- ;; -- *) -- lt_cv_prog_cc_pic_works=yes -- ;; -- esac -- --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -- lt_cv_prog_cc_pic_works=no -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -- --fi -- -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 - -- if test "X$lt_cv_prog_cc_pic_works" = Xno; then -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_can_build_shared=no -- else -- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" -- fi -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_GCJ"; then - -- echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 --fi -+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 -+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works_GCJ=no -+ ac_outfile=conftest.$ac_objext -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:16263: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:16267: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s conftest.err; then -+ lt_prog_compiler_pic_works_GCJ=yes -+ fi -+ fi -+ $rm conftest* - --# Check for any special shared library compilation flags. --if test -n "$lt_cv_prog_cc_shlib"; then -- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 --echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} -- if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : -- else -- { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 --echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} -- lt_cv_prog_cc_can_build_shared=no -- fi - fi -+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 - --echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 --if test "${lt_cv_prog_cc_static_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- lt_cv_prog_cc_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- lt_cv_prog_cc_static_works=yes -+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+ case $lt_prog_compiler_pic_GCJ in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -+ esac - else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+ lt_prog_compiler_pic_GCJ= -+ lt_prog_compiler_can_build_shared_GCJ=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" - - fi -+case "$host_os" in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_GCJ= -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" -+ ;; -+esac - -- --# Belt *and* braces to stop my trousers falling down: --test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= --echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 -- --pic_flag="$lt_cv_prog_cc_pic" --special_shlib_compile_flags="$lt_cv_prog_cc_shlib" --wl="$lt_cv_prog_cc_wl" --link_static_flag="$lt_cv_prog_cc_static" --no_builtin_flag="$lt_cv_prog_cc_no_builtin" --can_build_shared="$lt_cv_prog_cc_can_build_shared" -- -- --# Check to see if options -o and -c are simultaneously supported by compiler - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 - echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 --if test "${lt_cv_compiler_c_o+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --echo "int some_variable = 0;" > conftest.$ac_ext --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" --compiler_c_o=no --if { (eval echo configure:5402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s out/conftest.err; then -- lt_cv_compiler_c_o=no -- else -- lt_cv_compiler_c_o=yes -- fi --else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&5 -- lt_cv_compiler_c_o=no --fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null -- --fi -- --compiler_c_o=$lt_cv_compiler_c_o --echo "$as_me:$LINENO: result: $compiler_c_o" >&5 --echo "${ECHO_T}$compiler_c_o" >&6 -- --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 -- if test "${lt_cv_compiler_o_lo+set}" = set; then -+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- -- lt_cv_compiler_o_lo=no -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- save_objext="$ac_objext" -- ac_objext=lo -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --int some_variable = 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- lt_cv_compiler_o_lo=no -- else -- lt_cv_compiler_o_lo=yes -- fi -- --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- ac_objext="$save_objext" -- CFLAGS="$save_CFLAGS" -+ lt_cv_prog_compiler_c_o_GCJ=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:16323: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:16327: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test ! -s out/conftest.err; then -+ lt_cv_prog_compiler_c_o_GCJ=yes -+ fi -+ fi -+ chmod u+w . -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* - - fi -+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 - -- compiler_o_lo=$lt_cv_compiler_o_lo -- echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 --echo "${ECHO_T}$compiler_o_lo" >&6 --else -- compiler_o_lo=no --fi - --# Check to see if we can do hard links to lock some files if needed - hard_links="nottested" --if test "$compiler_c_o" = no && test "$need_locks" != no; then -+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 - echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -@@ -5517,136 +16370,72 @@ - need_locks=no - fi - --if test "$GCC" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -- echo "int some_variable = 0;" > conftest.$ac_ext -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" -- compiler_rtti_exceptions=no -- cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --int some_variable = 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- compiler_rtti_exceptions=no -- else -- compiler_rtti_exceptions=yes -- fi -- --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -- echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$compiler_rtti_exceptions" >&6 -- -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -- else -- no_builtin_flag=' -fno-builtin' -- fi --fi -- --# See if the linker supports building shared libraries. --echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 - --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --archive_cmds= --archive_expsym_cmds= --old_archive_from_new_cmds= --old_archive_from_expsyms_cmds= --export_dynamic_flag_spec= --whole_archive_flag_spec= --thread_safe_flag_spec= --hardcode_into_libs=no --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --link_all_deplibs=unknown --always_export_symbols=no --export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' --# include_expsyms should be a list of space-separated symbols to be *always* --# included in the symbol list --include_expsyms= --# exclude_expsyms can be an egrep regular expression of symbols to exclude --# it will be wrapped by ` (' and `)$', so one must not match beginning or --# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', --# as well as any symbol that contains `d'. --exclude_expsyms="_GLOBAL_OFFSET_TABLE_" --# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out --# platforms (ab)use it in PIC code, but their linkers get confused if --# the symbol is explicitly referenced. Since portable code cannot --# rely on this symbol name, it's probably fine to never include it in --# preloaded symbol tables. --extract_expsyms_cmds= -+ runpath_var= -+ allow_undefined_flag_GCJ= -+ enable_shared_with_static_runtimes_GCJ=no -+ archive_cmds_GCJ= -+ archive_expsym_cmds_GCJ= -+ old_archive_From_new_cmds_GCJ= -+ old_archive_from_expsyms_cmds_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= -+ thread_safe_flag_spec_GCJ= -+ hardcode_libdir_flag_spec_GCJ= -+ hardcode_libdir_flag_spec_ld_GCJ= -+ hardcode_libdir_separator_GCJ= -+ hardcode_direct_GCJ=no -+ hardcode_minus_L_GCJ=no -+ hardcode_shlibpath_var_GCJ=unsupported -+ link_all_deplibs_GCJ=unknown -+ hardcode_automatic_GCJ=no -+ module_cmds_GCJ= -+ module_expsym_cmds_GCJ= -+ always_export_symbols_GCJ=no -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms_GCJ= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= - --case $host_os in --cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ openbsd*) - with_gnu_ld=no -- fi -- ;; --openbsd*) -- with_gnu_ld=no -- ;; --esac -+ ;; -+ esac - --ld_shlibs=yes --if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+ ld_shlibs_GCJ=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix3* | aix4* | aix5*) -- # On AIX, the GNU linker is very broken -- # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. -- ld_shlibs=no -- cat <&2 -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs_GCJ=no -+ cat <&2 - - *** Warning: the GNU linker, at least up to release 2.9.1, is reported - *** to be unable to reliably create shared libraries on AIX. -@@ -5655,124 +16444,73 @@ - *** so that a non-GNU linker is found, and then restart. - - EOF -- ;; -- -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- -- # Samuel A. Falvo II reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can use -- # them. -- ld_shlibs=no -- ;; -- -- beos*) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- -- cygwin* | mingw* | pw32*) -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec='-L$libdir' -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- -- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ -- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ -- test -f $output_objdir/impgen.exe || (cd $output_objdir && \ -- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ -- else $CC -o impgen impgen.c ; fi)~ -- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' -- -- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' -- -- # cygwin and mingw dlls have different entry points and sets of symbols -- # to exclude. -- # FIXME: what about values for MSVC? -- dll_entry=__cygwin_dll_entry@12 -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ -- case $host_os in -- mingw*) -- # mingw values -- dll_entry=_DllMainCRTStartup@12 -- dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ -+ fi - ;; -- esac - -- # mingw and cygwin differ, and it's simplest to just exclude the union -- # of the two symbol sets. -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 -- -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one (in ltdll.c) -- if test "x$lt_cv_need_dllmain" = "xyes"; then -- ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " -- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ -- test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' -- else -- ltdll_obj= -- ltdll_cmds= -- fi -+ amigaos*) -+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs_GCJ=no -+ ;; - -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- # Be careful not to strip the DATA tag left be newer dlltools. -- export_symbols_cmds="$ltdll_cmds"' -- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ -- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' -- -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is. -- # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname-def; -- else -- echo EXPORTS > $output_objdir/$soname-def; -- _lt_hint=1; -- cat $export_symbols | while read symbol; do -- set dummy \$symbol; -- case \$# in -- 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; -- *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; -- esac; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done; -- fi~ -- '"$ltdll_cmds"' -- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ -- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ -- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' -- ;; -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_GCJ=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ allow_undefined_flag_GCJ=unsupported -+ always_export_symbols_GCJ=no -+ enable_shared_with_static_runtimes_GCJ=yes -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_GCJ='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; - -- solaris* | sysv5*) -- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -- ld_shlibs=no -- cat <&2 -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris* | sysv5*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs_GCJ=no -+ cat <&2 - - *** Warning: The releases 2.8.* of the GNU linker cannot reliably - *** create shared libraries on Solaris systems. Therefore, libtool -@@ -5782,539 +16520,782 @@ - *** used, and then restart. - - EOF -- elif $LD --help 2>&1 | egrep ': 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' -- else -- ld_shlibs=no -- fi -- ;; -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; - -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+ sunos4*) -+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- *) -- if $LD --help 2>&1 | egrep ': 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' -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds_GCJ="$tmp_archive_cmds" -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ archive_expsym_cmds_GCJ="$tmp_archive_cmds" -+ fi - else -- ld_shlibs=no -+ ld_shlibs_GCJ=no - fi - ;; -- esac - -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- case $host_os in -- cygwin* | mingw* | pw32*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -- ;; - *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else -- whole_archive_flag_spec= -+ ld_shlibs_GCJ=no - fi - ;; - esac -- fi --else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L=yes -- if test "$GCC" = yes && test -z "$link_static_flag"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct=unsupported -- fi -- ;; -- -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- esac -- -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -+ if test "$ld_shlibs_GCJ" = yes; then -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_GCJ= -+ fi - fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag_GCJ=unsupported -+ always_export_symbols_GCJ=yes -+ archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L_GCJ=yes -+ if test "$GCC" = yes && test -z "$link_static_flag"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_GCJ=unsupported -+ fi -+ ;; - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -- -- hardcode_direct=yes -- archive_cmds='' -- hardcode_libdir_separator=':' -- if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- hardcode_direct=yes -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -+ export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi -- esac -+ aix_use_runtimelinking=no - -- shared_flag='-shared' -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- shared_flag='${wl}-G' -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_GCJ='' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.012|aix4.012.*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ hardcode_direct_GCJ=yes -+ else -+ # We have old collect2 -+ hardcode_direct_GCJ=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_libdir_separator_GCJ= -+ fi -+ esac -+ shared_flag='-shared' - else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' - else -- shared_flag='${wl}-bM:SRE' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi - fi - fi -- fi - -- # It seems that -bexpall can do strange things, so it is better to -- # generate a list of symbols to export. -- always_export_symbols=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='-berok' -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' -- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -- else -- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' -- # Warning - without using the other run time loading flags, -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_GCJ=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='${wl}-berok' -- # This is a bit strange, but is similar to how AIX traditionally builds -- # it's shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' -- fi -- fi -- ;; -+ allow_undefined_flag_GCJ='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs=no -- ;; -+int -+main () -+{ - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # 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 -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''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"`' -- ;; -- -- darwin* | rhapsody*) -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- allow_undefined_flag='-flat_namespace -undefined suppress' -- ;; -- esac -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' -- # We need to add '_' to the symbols in $export_symbols first -- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- whole_archive_flag_spec='-all_load $convenience' -- ;; -- -- freebsd1*) -- ld_shlibs=no -- ;; -- -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_GCJ="-z nodefs" -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+int -+main () -+{ - -- hpux9* | hpux10* | hpux11*) -- case $host_os in -- hpux9*) 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' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then - -- irix5* | irix6*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_GCJ='${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. -+ no_undefined_flag_GCJ=' ${wl}-bernotok' -+ allow_undefined_flag_GCJ=' ${wl}-berok' -+ # -bexpall does not export symbols beginning with underscore (_) -+ always_export_symbols_GCJ=yes -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_GCJ=' ' -+ archive_cmds_need_lc_GCJ=yes -+ # This is similar to how AIX traditionally builds it's shared libraries. -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+ amigaos*) -+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs_GCJ=no -+ ;; - -- newsos6) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_shlibpath_var=no -- ;; -+ bsdi[45]*) -+ export_dynamic_flag_spec_GCJ=-rdynamic -+ ;; - -- openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -- else -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_GCJ=' ' -+ allow_undefined_flag_GCJ=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_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_From_new_cmds_GCJ='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_GCJ=yes -+ ;; -+ -+ darwin* | rhapsody*) - case "$host_os" in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_GCJ=no -+ hardcode_direct_GCJ=no -+ hardcode_automatic_GCJ=yes -+ hardcode_shlibpath_var_GCJ=unsupported -+ whole_archive_flag_spec_GCJ='' -+ link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case "$cc_basename" in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; - esac - fi -- ;; -+ ;; - -- os2*) -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+ dgux*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; -+ freebsd1*) -+ ld_shlibs_GCJ=no -+ ;; - -- 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" && echo ${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 \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- #Both c and cxx compiler support -rpath directly -- hardcode_libdir_flag_spec='-rpath $libdir' -- fi -- hardcode_libdir_separator=: -- ;; -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | kfreebsd*-gnu) -+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$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' -+ else -+ archive_cmds_GCJ='$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 -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_direct_GCJ=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ ;; -+ -+ hpux10* | hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case "$host_cpu" in -+ hppa*64*|ia64*) -+ archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ case "$host_cpu" in -+ hppa*64*) -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ ia64*) -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ ;; -+ *) -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_direct_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ link_all_deplibs_GCJ=yes -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ newsos6) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ openbsd*) -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ -+ os2*) -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ allow_undefined_flag_GCJ=unsupported -+ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag_GCJ=' -expect_unresolved \*' -+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ ;; - -- sco3.2v5*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- ;; -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag_GCJ=' -expect_unresolved \*' -+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - -- solaris*) -- # gcc --version < 3.0 without binutils cannot create self contained -- # shared libraries reliably, requiring libgcc.a to resolve some of -- # the object symbols generated in some cases. Libraries that use -- # assert need libgcc.a to resolve __eprintf, for example. Linking -- # a copy of libgcc.a into every shared library to guarantee resolving -- # such symbols causes other problems: According to Tim Van Holder -- # , C++ libraries end up with a separate -- # (to the application) exception stack for one thing. -- no_undefined_flag=' -z defs' -- if test "$GCC" = yes; then -- case `$CC --version 2>/dev/null` in -- [12].*) -- cat <&2 -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -+ fi -+ hardcode_libdir_separator_GCJ=: -+ ;; - --*** Warning: Releases of GCC earlier than version 3.0 cannot reliably --*** create self contained shared libraries on Solaris systems, without --*** introducing a dependency on libgcc.a. Therefore, libtool is disabling --*** -no-undefined support, which will at least allow you to build shared --*** libraries. However, you may find that when you link such libraries --*** into an application without using GCC, you have to manually add --*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to --*** upgrade to a newer version of GCC. Another option is to rebuild your --*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. -+ sco3.2v5*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ export_dynamic_flag_spec_GCJ='${wl}-Bexport' -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ;; - --EOF -- no_undefined_flag= -- ;; -+ solaris*) -+ no_undefined_flag_GCJ=' -z text' -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) # Supported since Solaris 2.6 (maybe 2.5.1?) -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - esac -- fi -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_shlibpath_var=no -- case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- esac -- link_all_deplibs=yes -- ;; -+ link_all_deplibs_GCJ=yes -+ ;; - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- sysv4) -- if test "x$host_vendor" = xsno; then -- archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -- else -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=no #Motorola manual says yes, but my tests say they lie -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds_GCJ='$CC -r -o $output$reload_objs' -+ hardcode_direct_GCJ=no -+ ;; -+ motorola) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- sysv4.3*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- export_dynamic_flag_spec='-Bexport' -- ;; -- -- sysv5*) -- no_undefined_flag=' -z text' -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec= -- hardcode_shlibpath_var=no -- runpath_var='LD_RUN_PATH' -- ;; -- -- uts4*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -+ sysv4.3*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ export_dynamic_flag_spec_GCJ='-Bexport' -+ ;; - -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs_GCJ=yes -+ fi -+ ;; - -- sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -+ sysv4.2uw2*) -+ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=no -+ hardcode_shlibpath_var_GCJ=no - hardcode_runpath_var=yes -- ld_shlibs=yes -- fi -- ;; -- -- sysv4.2uw2*) -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=no -- hardcode_shlibpath_var=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ runpath_var=LD_RUN_PATH -+ ;; - -- sysv5uw7* | unixware7*) -- no_undefined_flag='${wl}-z ${wl}text' -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) -+ no_undefined_flag_GCJ='${wl}-z ${wl}text' -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- *) -- ld_shlibs=no -- ;; -- esac --fi --echo "$as_me:$LINENO: result: $ld_shlibs" >&5 --echo "${ECHO_T}$ld_shlibs" >&6 --test "$ld_shlibs" = no && can_build_shared=no -+ sysv5*) -+ no_undefined_flag_GCJ=' -z text' -+ # $CC -shared without GNU ld will not create a library from C++ -+ # object files and a static libstdc++, better avoid it by now -+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ hardcode_libdir_flag_spec_GCJ= -+ hardcode_shlibpath_var_GCJ=no -+ runpath_var='LD_RUN_PATH' -+ ;; - --# Check hardcoding attributes. --echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var"; then -+ uts4*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - -- # We can hardcode non-existant directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$hardcode_shlibpath_var" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac - fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported --fi --echo "$as_me:$LINENO: result: $hardcode_action" >&5 --echo "${ECHO_T}$hardcode_action" >&6 - --striplib= --old_striplib= --echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 --echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -+echo "${ECHO_T}$ld_shlibs_GCJ" >&6 -+test "$ld_shlibs_GCJ" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --reload_cmds='$LD$reload_flag -o $output$reload_objs' --test -z "$deplibs_check_method" && deplibs_check_method=unknown -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_GCJ" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_GCJ=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_GCJ in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ $rm conftest* -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_GCJ -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ -+ allow_undefined_flag_GCJ= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_GCJ=no -+ else -+ archive_cmds_need_lc_GCJ=yes -+ fi -+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 -+ ;; -+ esac -+ fi -+ ;; -+esac - --# PORTME Fill in your ld.so characteristics - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 - echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 - library_names_spec= - libname_spec='lib$name' - soname_spec= -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -6324,23 +17305,45 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ 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 -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown - - case $host_os in - aix3*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix $libname.a' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' - ;; - - aix4* | aix5*) - version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 -- library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file -@@ -6350,29 +17353,28 @@ - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; - esac -- # AIX (on Power*) has no versioning support, so currently we can -- # not hardcode correct soname into executable. Probably we can -- # add versioning support to collect2, so additional links can -- # be useful in future. -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}.so$major' -+ soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi -@@ -6381,25 +17383,24 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -- library_names_spec='${libname}.so' -+ library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs -@@ -6407,29 +17408,79 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no -+ - case $GCC,$host_os in -- yes,cygwin*) -+ yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ -+ # 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 .libs/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ $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 -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac - ;; -- yes,mingw*) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` -- ;; -- yes,pw32*) -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' -+ -+ linux*) -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+$echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ else -+ $archive_expsym_cmds="$archive_cmds" -+ fi -+ else -+ ld_shlibs=no -+ fi - ;; -+ - *) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -6442,30 +17493,56 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -- soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -+ if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -+ else -+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -+ fi -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH - ;; - - freebsd1*) - dynamic_linker=no - ;; - -+kfreebsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ - freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac -@@ -6474,7 +17551,11 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- *) -+ freebsd3.01* | freebsdelf3.01*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ *) # from 3.2 on - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -@@ -6485,8 +17566,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -6494,33 +17575,75 @@ - hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. -- dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -+ case "$host_cpu" in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - --irix5* | irix6*) -- version_type=irix -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in -- irix5*) -+ irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; -@@ -6529,20 +17652,21 @@ - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes - ;; - - # No shared lib support for Linux oldld, aout, or coff. --linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -+linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux*) - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -6551,6 +17675,19 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ case $host_cpu:$lt_cv_cc_64bit_output in -+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" -+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" -+ ;; -+ esac -+ - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, -@@ -6558,6 +17695,42 @@ - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' -+ -+ # Find out which ABI we are using (multilib Linux x86_64 hack). -+ libsuff= -+ case "$host_cpu" in -+ x86_64*) -+ echo '#line 17703 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ *) -+ ;; -+ esac -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ ;; -+ -+knetbsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' - ;; - - netbsd*) -@@ -6565,12 +17738,12 @@ - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -6580,7 +17753,17 @@ - - newsos6) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -6589,36 +17772,38 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case "$host_os" in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac - else - shlibpath_overrides_runpath=yes - fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH - ;; - - os2*) - libname_spec='$name' -+ shrext_cmds=".dll" - need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -+ library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - - osf3* | osf4* | osf5*) - version_type=osf -+ need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -@@ -6626,8 +17811,8 @@ - - sco3.2v5*) - version_type=osf -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -6635,8 +17820,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -6646,7 +17831,7 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -6658,12 +17843,18 @@ - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no -@@ -6674,31 +17865,22 @@ - esac - ;; - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --dgux*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- - sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux -- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' -- soname_spec='$libname.so.$major' -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - *) - dynamic_linker=no - ;; -@@ -6707,44 +17889,35 @@ - echo "${ECHO_T}$dynamic_linker" >&6 - test "$dynamic_linker" = no && can_build_shared=no - --# Report the final consequences. --echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $can_build_shared" >&5 --echo "${ECHO_T}$can_build_shared" >&6 -- --echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case "$host_os" in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+hardcode_action_GCJ= -+if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -+ test -n "$runpath_var_GCJ" || \ -+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then - --aix4*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_GCJ" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && -+ test "$hardcode_minus_L_GCJ" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_GCJ=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_GCJ=immediate - fi -- ;; --esac --echo "$as_me:$LINENO: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6 -- --echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --echo "$as_me:$LINENO: result: $enable_static" >&5 --echo "${ECHO_T}$enable_static" >&6 -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_GCJ=unsupported -+fi -+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -+echo "${ECHO_T}$hardcode_action_GCJ" >&6 - --if test "$hardcode_action" = relink; then -+if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no - elif test "$shlibpath_overrides_runpath" = yes || -@@ -6753,9 +17926,33 @@ - enable_fast_install=needless - fi - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+striplib= -+old_striplib= -+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ ;; -+ *) -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ ;; -+ esac - fi - - if test "x$enable_dlopen" != xyes; then -@@ -6773,11 +17970,94 @@ - lt_cv_dlopen_self=yes - ;; - -- cygwin* | mingw* | pw32*) -+ mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dlopen (); -+int -+main () -+{ -+dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_dl_dlopen=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ -+fi -+ -+ ;; -+ - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 - echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -@@ -6785,49 +18065,73 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case declares shl_load. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define shl_load innocuous_shl_load -+ - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shl_load (); below. */ --#include -+ which can conflict with char shl_load (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef shl_load -+ - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char shl_load (); --char (*f) (); -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_shl_load) || defined (__stub___shl_load) - choke me - #else --f = shl_load; -+char (*f) () = shl_load; -+#endif -+#ifdef __cplusplus -+} - #endif - -+int -+main () -+{ -+return f != shl_load; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6836,10 +18140,12 @@ - ac_cv_func_shl_load=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_func_shl_load=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 - echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -@@ -6854,8 +18160,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -6864,12 +18173,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char shl_load (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6880,11 +18183,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6893,10 +18206,12 @@ - ac_cv_lib_dld_shl_load=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_dld_shl_load=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -@@ -6910,49 +18225,73 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case declares dlopen. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define dlopen innocuous_dlopen -+ - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char dlopen (); below. */ --#include -+ which can conflict with char dlopen (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef dlopen -+ - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char dlopen (); --char (*f) (); -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_dlopen) || defined (__stub___dlopen) - choke me - #else --f = dlopen; -+char (*f) () = dlopen; -+#endif -+#ifdef __cplusplus -+} - #endif - -+int -+main () -+{ -+return f != dlopen; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6961,10 +18300,12 @@ - ac_cv_func_dlopen=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_func_dlopen=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 - echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -@@ -6979,8 +18320,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -6989,12 +18333,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char dlopen (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -7005,11 +18343,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7018,10 +18366,12 @@ - ac_cv_lib_dl_dlopen=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_dl_dlopen=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -@@ -7037,8 +18387,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsvld $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -7047,12 +18400,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char dlopen (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -7063,11 +18410,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7076,10 +18433,12 @@ - ac_cv_lib_svld_dlopen=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_svld_dlopen=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -@@ -7095,8 +18454,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -7105,12 +18467,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char dld_link (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -7121,11 +18477,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7134,10 +18500,12 @@ - ac_cv_lib_dld_dld_link=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_dld_dld_link=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -@@ -7173,7 +18541,7 @@ - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -@@ -7189,10 +18557,10 @@ - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross - else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <&5 --echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -- fi -+fi -+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_GCJ \ -+ CC_GCJ \ -+ LD_GCJ \ -+ lt_prog_compiler_wl_GCJ \ -+ lt_prog_compiler_pic_GCJ \ -+ lt_prog_compiler_static_GCJ \ -+ lt_prog_compiler_no_builtin_flag_GCJ \ -+ export_dynamic_flag_spec_GCJ \ -+ thread_safe_flag_spec_GCJ \ -+ whole_archive_flag_spec_GCJ \ -+ enable_shared_with_static_runtimes_GCJ \ -+ old_archive_cmds_GCJ \ -+ old_archive_from_new_cmds_GCJ \ -+ predep_objects_GCJ \ -+ postdep_objects_GCJ \ -+ predeps_GCJ \ -+ postdeps_GCJ \ -+ compiler_lib_search_path_GCJ \ -+ archive_cmds_GCJ \ -+ archive_expsym_cmds_GCJ \ -+ postinstall_cmds_GCJ \ -+ postuninstall_cmds_GCJ \ -+ old_archive_from_expsyms_cmds_GCJ \ -+ allow_undefined_flag_GCJ \ -+ no_undefined_flag_GCJ \ -+ export_symbols_cmds_GCJ \ -+ hardcode_libdir_flag_spec_GCJ \ -+ hardcode_libdir_flag_spec_ld_GCJ \ -+ hardcode_libdir_separator_GCJ \ -+ hardcode_automatic_GCJ \ -+ module_cmds_GCJ \ -+ module_expsym_cmds_GCJ \ -+ lt_cv_prog_compiler_c_o_GCJ \ -+ exclude_expsyms_GCJ \ -+ include_expsyms_GCJ; do -+ -+ case $var in -+ old_archive_cmds_GCJ | \ -+ old_archive_from_new_cmds_GCJ | \ -+ archive_cmds_GCJ | \ -+ archive_expsym_cmds_GCJ | \ -+ module_cmds_GCJ | \ -+ module_expsym_cmds_GCJ | \ -+ old_archive_from_expsyms_cmds_GCJ | \ -+ export_symbols_cmds_GCJ | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="$ofile" -+ -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_GCJ -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# A language-specific compiler. -+CC=$lt_compiler_GCJ -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_GCJ -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD_GCJ -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_GCJ -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_GCJ -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -+ -+# Must we lock files when doing compilation ? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_GCJ -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_GCJ -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_GCJ -+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_GCJ -+module_expsym_cmds=$lt_module_expsym_cmds_GCJ -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_GCJ -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_GCJ -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_GCJ -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_GCJ -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -+ -+# 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. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_GCJ -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_GCJ -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_GCJ -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_GCJ -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_GCJ -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_GCJ -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_GCJ - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path="$fix_srcfile_path_GCJ" - -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_GCJ - --if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -- if test "${lt_cv_archive_cmds_need_lc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- $rm conftest* -- echo 'static int dummy;' > conftest.$ac_ext -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_GCJ - -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_cv_prog_cc_wl -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- then -- lt_cv_archive_cmds_need_lc=no -- else -- lt_cv_archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi --fi -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_GCJ -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_GCJ -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ - -- echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 --echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 -- ;; -- esac --fi --need_lc=${lt_cv_archive_cmds_need_lc-yes} - --# The second clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- : - else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - --if test -f "$ltmain"; then -- trap "$rm \"${ofile}T\"; exit 1" 1 2 15 -- $rm -f "${ofile}T" - -- echo creating $ofile -+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 -+ -+CC="$lt_save_CC" -+ -+ else -+ tagname="" -+ fi -+ ;; -+ -+ RC) -+ -+ -+ -+# Source file extension for RC test sources. -+ac_ext=rc - -+# Object file extension for compiled RC test sources. -+objext=o -+objext_RC=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+compiler_RC=$CC -+lt_cv_prog_compiler_c_o_RC=yes -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS \ -- AR AR_FLAGS CC LD LN_S NM SHELL \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ -- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ -- old_striplib striplib file_magic_cmd export_symbols_cmds \ -- deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- global_symbol_to_c_name_address \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_RC \ -+ CC_RC \ -+ LD_RC \ -+ lt_prog_compiler_wl_RC \ -+ lt_prog_compiler_pic_RC \ -+ lt_prog_compiler_static_RC \ -+ lt_prog_compiler_no_builtin_flag_RC \ -+ export_dynamic_flag_spec_RC \ -+ thread_safe_flag_spec_RC \ -+ whole_archive_flag_spec_RC \ -+ enable_shared_with_static_runtimes_RC \ -+ old_archive_cmds_RC \ -+ old_archive_from_new_cmds_RC \ -+ predep_objects_RC \ -+ postdep_objects_RC \ -+ predeps_RC \ -+ postdeps_RC \ -+ compiler_lib_search_path_RC \ -+ archive_cmds_RC \ -+ archive_expsym_cmds_RC \ -+ postinstall_cmds_RC \ -+ postuninstall_cmds_RC \ -+ old_archive_from_expsyms_cmds_RC \ -+ allow_undefined_flag_RC \ -+ no_undefined_flag_RC \ -+ export_symbols_cmds_RC \ -+ hardcode_libdir_flag_spec_RC \ -+ hardcode_libdir_flag_spec_ld_RC \ -+ hardcode_libdir_separator_RC \ -+ hardcode_automatic_RC \ -+ module_cmds_RC \ -+ module_expsym_cmds_RC \ -+ lt_cv_prog_compiler_c_o_RC \ -+ exclude_expsyms_RC \ -+ include_expsyms_RC; do - - case $var in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ -+ old_archive_cmds_RC | \ -+ old_archive_from_new_cmds_RC | \ -+ archive_cmds_RC | \ -+ archive_expsym_cmds_RC | \ -+ module_cmds_RC | \ -+ module_expsym_cmds_RC | \ -+ old_archive_from_expsyms_cmds_RC | \ -+ export_symbols_cmds_RC | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; -@@ -7506,43 +19287,16 @@ - esac - done - -- cat <<__EOF__ > "${ofile}T" --#! $SHELL -- --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996-2000 Free Software Foundation, Inc. --# Originally by Gordon Matzigkeit , 1996 --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="sed -e s/^X//" -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac - --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+cfgfile="$ofile" - --# ### BEGIN LIBTOOL CONFIG -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - - # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -@@ -7556,7 +19310,10 @@ - build_old_libs=$enable_static - - # Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$need_lc -+build_libtool_need_lc=$archive_cmds_need_lc_RC -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install -@@ -7572,14 +19329,20 @@ - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS - --# The default C compiler. --CC=$lt_CC -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# A language-specific compiler. -+CC=$lt_compiler_RC - - # Is the compiler the GNU C compiler? --with_gcc=$GCC -+with_gcc=$GCC_RC -+ -+# An ERE matcher. -+EGREP=$lt_EGREP - - # The linker used to build libraries. --LD=$lt_LD -+LD=$lt_LD_RC - - # Whether we need hard or soft links. - LN_S=$lt_LN_S -@@ -7588,7 +19351,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -7610,7 +19373,7 @@ - reload_cmds=$lt_reload_cmds - - # How to pass a linker flag through the compiler. --wl=$lt_wl -+wl=$lt_lt_prog_compiler_wl_RC - - # Object file suffix (normally "o"). - objext="$ac_objext" -@@ -7618,18 +19381,21 @@ - # Old archive suffix (normally "a"). - libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ - # Executable file suffix (normally ""). - exeext="$exeext" - - # Additional compiler flags for building library objects. --pic_flag=$lt_pic_flag -+pic_flag=$lt_lt_prog_compiler_pic_RC - pic_mode=$pic_mode - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_compiler_c_o -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# Can we write directly to a .lo ? --compiler_o_lo=$lt_compiler_o_lo -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - - # Must we lock files when doing compilation ? - need_locks=$lt_need_locks -@@ -7650,19 +19416,19 @@ - dlopen_self_static=$enable_dlopen_self_static - - # Compiler flag to prevent dynamic linking. --link_static_flag=$lt_link_static_flag -+link_static_flag=$lt_lt_prog_compiler_static_RC - - # Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_no_builtin_flag -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC - - # Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC - - # Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC - - # Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC - - # Library versioning type. - version_type=$version_type -@@ -7679,26 +19445,50 @@ - - # Commands used to build and install an old-style archive. - RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds -+old_archive_cmds=$lt_old_archive_cmds_RC - old_postinstall_cmds=$lt_old_postinstall_cmds - old_postuninstall_cmds=$lt_old_postuninstall_cmds - - # Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - - # Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - - # Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds -+archive_cmds=$lt_archive_cmds_RC -+archive_expsym_cmds=$lt_archive_expsym_cmds_RC - postinstall_cmds=$lt_postinstall_cmds - postuninstall_cmds=$lt_postuninstall_cmds - -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_RC -+module_expsym_cmds=$lt_module_expsym_cmds_RC -+ - # Commands to strip libraries. - old_striplib=$lt_old_striplib - striplib=$lt_striplib - -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_RC -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_RC -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_RC -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_RC -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_RC -+ - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - -@@ -7706,10 +19496,10 @@ - file_magic_cmd=$lt_file_magic_cmd - - # Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag -+allow_undefined_flag=$lt_allow_undefined_flag_RC - - # Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -+no_undefined_flag=$lt_no_undefined_flag_RC - - # Commands used to finish a libtool library installation in a directory. - finish_cmds=$lt_finish_cmds -@@ -7718,13 +19508,13 @@ - finish_eval=$lt_finish_eval - - # Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_global_symbol_pipe -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - - # Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_global_symbol_to_cdecl -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - - # Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - - # This is the shared library runtime path variable. - runpath_var=$runpath_var -@@ -7736,36 +19526,45 @@ - shlibpath_overrides_runpath=$shlibpath_overrides_runpath - - # How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+hardcode_action=$hardcode_action_RC - - # Whether we should hardcode library paths into libraries. - hardcode_into_libs=$hardcode_into_libs - - # Flag to hardcode \$libdir into a binary during linking. - # This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - - # Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - --# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the - # resulting binary. --hardcode_direct=$hardcode_direct -+hardcode_direct=$hardcode_direct_RC - - # Set to yes if using the -LDIR flag during linking hardcodes DIR into the - # resulting binary. --hardcode_minus_L=$hardcode_minus_L -+hardcode_minus_L=$hardcode_minus_L_RC - - # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into - # the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_RC - - # Variables whose values should be saved in libtool wrapper scripts and - # restored at relink time. - variables_saved_for_relink="$variables_saved_for_relink" - - # Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -+link_all_deplibs=$link_all_deplibs_RC - - # Compile-time system search path for libraries - sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -@@ -7774,234 +19573,75 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -+fix_srcfile_path="$fix_srcfile_path_RC" - - # Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -+always_export_symbols=$always_export_symbols_RC - - # The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+export_symbols_cmds=$lt_export_symbols_cmds_RC - - # The commands to extract the exported symbol list from a shared archive. - extract_expsyms_cmds=$lt_extract_expsyms_cmds - - # Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -+exclude_expsyms=$lt_exclude_expsyms_RC - - # Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+include_expsyms=$lt_include_expsyms_RC - --# ### END LIBTOOL CONFIG -+# ### END LIBTOOL TAG CONFIG: $tagname - - __EOF__ - -- case $host_os in -- aix3*) -- cat <<\EOF >> "${ofile}T" - --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi --EOF -- ;; -- esac - -- case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- cat <<'EOF' >> "${ofile}T" -- # This is a source program that is used to create dlls on Windows -- # Don't remove nor modify the starting and closing comments --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include --# #undef WIN32_LEAN_AND_MEAN --# #include --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ -- # This is a source program that is used to create import libraries -- # on Windows for dlls which lack them. Don't remove nor modify the -- # starting and closing comments --# /* impgen.c starts here */ --# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. --# --# This file is part of GNU libtool. --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# */ --# --# #include /* for printf() */ --# #include /* for open(), lseek(), read() */ --# #include /* for O_RDONLY, O_BINARY */ --# #include /* for strdup() */ --# --# /* O_BINARY isn't required (or even defined sometimes) under Unix */ --# #ifndef O_BINARY --# #define O_BINARY 0 --# #endif --# --# static unsigned int --# pe_get16 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[2]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 2); --# return b[0] + (b[1]<<8); --# } --# --# static unsigned int --# pe_get32 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[4]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 4); --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# static unsigned int --# pe_as32 (ptr) --# void *ptr; --# { --# unsigned char *b = ptr; --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# int --# main (argc, argv) --# int argc; --# char *argv[]; --# { --# int dll; --# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; --# unsigned long export_rva, export_size, nsections, secptr, expptr; --# unsigned long name_rvas, nexp; --# unsigned char *expdata, *erva; --# char *filename, *dll_name; --# --# filename = argv[1]; --# --# dll = open(filename, O_RDONLY|O_BINARY); --# if (dll < 1) --# return 1; --# --# dll_name = filename; --# --# for (i=0; filename[i]; i++) --# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') --# dll_name = filename + i +1; --# --# pe_header_offset = pe_get32 (dll, 0x3c); --# opthdr_ofs = pe_header_offset + 4 + 20; --# num_entries = pe_get32 (dll, opthdr_ofs + 92); --# --# if (num_entries < 1) /* no exports */ --# return 1; --# --# export_rva = pe_get32 (dll, opthdr_ofs + 96); --# export_size = pe_get32 (dll, opthdr_ofs + 100); --# nsections = pe_get16 (dll, pe_header_offset + 4 +2); --# secptr = (pe_header_offset + 4 + 20 + --# pe_get16 (dll, pe_header_offset + 4 + 16)); --# --# expptr = 0; --# for (i = 0; i < nsections; i++) --# { --# char sname[8]; --# unsigned long secptr1 = secptr + 40 * i; --# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); --# unsigned long vsize = pe_get32 (dll, secptr1 + 16); --# unsigned long fptr = pe_get32 (dll, secptr1 + 20); --# lseek(dll, secptr1, SEEK_SET); --# read(dll, sname, 8); --# if (vaddr <= export_rva && vaddr+vsize > export_rva) --# { --# expptr = fptr + (export_rva - vaddr); --# if (export_rva + export_size > vaddr + vsize) --# export_size = vsize - (export_rva - vaddr); --# break; --# } --# } --# --# expdata = (unsigned char*)malloc(export_size); --# lseek (dll, expptr, SEEK_SET); --# read (dll, expdata, export_size); --# erva = expdata - export_rva; --# --# nexp = pe_as32 (expdata+24); --# name_rvas = pe_as32 (expdata+32); --# --# printf ("EXPORTS\n"); --# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) -+CC="$lt_save_CC" - -- mv -f "${ofile}T" "$ofile" || \ -- (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") -- chmod +x "$ofile" --fi -+ ;; -+ -+ *) -+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -+echo "$as_me: error: Unsupported tag name: $tagname" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ esac - -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" -+ fi -+ fi -+ done -+ IFS="$lt_save_ifs" - -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -+echo "$as_me: error: unable to update list of available tagged configurations." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+fi - - - -@@ -8014,6 +19654,24 @@ - # Prevent multiple expansion - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - echo "$as_me:$LINENO: checking for long long int" >&5 - echo $ECHO_N "checking for long long int... $ECHO_C" >&6 - if test "${ac_cv_c_long_long+set}" = set; then -@@ -8023,15 +19681,12 @@ - ac_cv_c_long_long=yes - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -8042,11 +19697,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8055,10 +19720,11 @@ - ac_cv_c_long_long=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_c_long_long=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_c_long_long" >&5 -@@ -8089,6 +19755,7 @@ - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 - echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -@@ -8105,6 +19772,7 @@ - case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -8112,20 +19780,20 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi - done - done - ;; -@@ -8181,7 +19849,6 @@ - - - -- - for ac_header in exception string - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -8198,18 +19865,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8218,10 +19898,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8229,20 +19910,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8253,7 +19938,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8261,26 +19947,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -8317,18 +20020,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8337,10 +20053,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8348,20 +20065,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8372,7 +20093,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8380,26 +20102,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -8432,18 +20171,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8452,10 +20204,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8463,20 +20216,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8487,7 +20244,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8495,26 +20253,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -8548,18 +20323,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8568,10 +20356,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8579,20 +20368,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8603,7 +20396,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8611,26 +20405,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -8664,18 +20475,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8684,10 +20508,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8695,20 +20520,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8719,7 +20548,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8727,26 +20557,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -8781,18 +20628,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8801,10 +20661,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8812,20 +20673,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8836,7 +20701,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8844,26 +20710,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -8908,18 +20791,31 @@ - echo "$as_me:$LINENO: checking pthread.h usability" >&5 - echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8928,10 +20824,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -8939,20 +20836,24 @@ - echo "$as_me:$LINENO: checking pthread.h presence" >&5 - echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -8963,7 +20864,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -8971,19 +20873,36 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 - echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for pthread.h" >&5 - echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 -@@ -9023,49 +20942,73 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. */ --#include -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $ac_func -+ - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char $ac_func (); --char (*f) (); -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_$ac_func) || defined (__stub___$ac_func) - choke me - #else --f = $ac_func; -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} - #endif - -+int -+main () -+{ -+return f != $ac_func; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9074,10 +21017,12 @@ - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - eval "$as_ac_var=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -9104,8 +21049,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -9114,12 +21062,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char pthread_create (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -9130,11 +21072,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9143,10 +21095,12 @@ - ac_cv_lib_pthread_pthread_create=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_pthread_pthread_create=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -@@ -9162,6 +21116,82 @@ - - if test "x$pthreads_ok" != xyes - then -+# hpux 11 uses macros for pthread_create so test another function -+echo "$as_me:$LINENO: checking for pthread_join in -lpthread" >&5 -+echo $ECHO_N "checking for pthread_join in -lpthread... $ECHO_C" >&6 -+if test "${ac_cv_lib_pthread_pthread_join+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lpthread $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char pthread_join (); -+int -+main () -+{ -+pthread_join (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_pthread_pthread_join=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_pthread_pthread_join=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_join" >&5 -+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_join" >&6 -+if test $ac_cv_lib_pthread_pthread_join = yes; then -+ pthreads_ok=yes -+ THREAD_LIBS="-lpthread" -+else -+ pthreads_ok=no -+fi -+ -+fi -+ -+if test "x$pthreads_ok" != xyes -+then - - # try libc_r (*BSD) - echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 -@@ -9172,8 +21202,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lc_r $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -9182,12 +21215,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char pthread_create (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -9198,11 +21225,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9211,10 +21248,12 @@ - ac_cv_lib_c_r_pthread_create=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_c_r_pthread_create=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5 -@@ -9265,49 +21304,73 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. */ --#include -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $ac_func -+ - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char $ac_func (); --char (*f) (); -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_$ac_func) || defined (__stub___$ac_func) - choke me - #else --f = $ac_func; -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} - #endif - -+int -+main () -+{ -+return f != $ac_func; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9316,10 +21379,12 @@ - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - eval "$as_ac_var=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -9357,49 +21422,73 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. */ --#include -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $ac_func -+ - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char $ac_func (); --char (*f) (); -- --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_$ac_func) || defined (__stub___$ac_func) - choke me - #else --f = $ac_func; -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} - #endif - -+int -+main () -+{ -+return f != $ac_func; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9408,10 +21497,12 @@ - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - eval "$as_ac_var=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -9447,6 +21538,8 @@ - odbc_libraries_dir="$odbc_dir/lib" - odbc_includes_dir="$odbc_dir/include" - -+else -+ odbc_dir=yes - fi; - - -@@ -9465,18 +21558,19 @@ - - fi; - --save_CPPFLAGS="$CPPFLAGS" --save_LIBS="$LIBS" -- --if test "x$odbc_includes_dir" != "x" -a "x$odbc_includes_dir" != "x/usr/include" --then -- CPPFLAGS="$CPPFLAGS -I$odbc_includes_dir" --fi -+if test "x$odbc_dir" != "xno"; then -+ save_CPPFLAGS="$CPPFLAGS" -+ save_LIBS="$LIBS" -+ -+ if test "x$odbc_includes_dir" != "x" -a "x$odbc_includes_dir" != "x/usr/include" -+ then -+ CPPFLAGS="$CPPFLAGS -I$odbc_includes_dir" -+ fi - --if test "x$odbc_libraries_dir" != "x" --then -- LIBS="$LIBS -L$odbc_libraries_dir" --fi -+ if test "x$odbc_libraries_dir" != "x" -+ then -+ LIBS="$LIBS -L$odbc_libraries_dir" -+ fi - - - -@@ -9497,18 +21591,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9517,10 +21624,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -9528,20 +21636,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -9552,7 +21664,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -9560,26 +21673,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -9598,9 +21728,9 @@ - done - - --if test "x$odbc_ok" = "xyes" --then -- echo "$as_me:$LINENO: checking for SQLConnect in -lodbc" >&5 -+ if test "x$odbc_ok" = "xyes" -+ then -+ echo "$as_me:$LINENO: checking for SQLConnect in -lodbc" >&5 - echo $ECHO_N "checking for SQLConnect in -lodbc... $ECHO_C" >&6 - if test "${ac_cv_lib_odbc_SQLConnect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -9608,8 +21738,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lodbc $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -9618,12 +21751,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char SQLConnect (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -9634,11 +21761,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9647,10 +21784,12 @@ - ac_cv_lib_odbc_SQLConnect=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_odbc_SQLConnect=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLConnect" >&5 -@@ -9661,6 +21800,9 @@ - odbc_ok=no - fi - -+ fi -+else -+ odbc_ok=no - fi - - echo "$as_me:$LINENO: checking whether unixODBC should be used" >&5 -@@ -9771,18 +21913,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9791,10 +21946,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -9802,20 +21958,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -@@ -9826,7 +21986,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -9834,26 +21995,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -9881,8 +22059,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-liodbc $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -9891,12 +22072,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char SQLConnect (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -9907,11 +22082,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9920,10 +22105,12 @@ - ac_cv_lib_iodbc_SQLConnect=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_iodbc_SQLConnect=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLConnect" >&5 -@@ -10009,18 +22196,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10029,10 +22229,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -10040,20 +22241,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -10064,7 +22269,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -10072,26 +22278,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -10113,15 +22336,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10135,11 +22355,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10148,10 +22378,11 @@ - ac_cv_type_int=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_type_int=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 - echo "${ECHO_T}$ac_cv_type_int" >&6 -@@ -10169,15 +22400,12 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10190,11 +22418,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10203,15 +22441,12 @@ - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10224,11 +22459,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10237,29 +22482,28 @@ - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10272,11 +22516,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10285,15 +22539,12 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10306,11 +22557,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10319,37 +22580,36 @@ - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo= ac_hi= - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10362,11 +22622,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10375,37 +22645,39 @@ - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_int=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 --echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} -+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (int), 77 -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 --echo "$as_me: error: cannot run test program while cross compiling" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - long longval () { return (long) (sizeof (int)); } - unsigned long ulongval () { return (long) (sizeof (int)); } - #include - #include --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10448,13 +22720,16 @@ - else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 --echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} -+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (int), 77 -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - rm -f conftest.val -@@ -10475,15 +22750,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10497,11 +22769,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10510,10 +22792,11 @@ - ac_cv_type_long=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_type_long=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 - echo "${ECHO_T}$ac_cv_type_long" >&6 -@@ -10531,15 +22814,12 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10552,11 +22832,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10565,15 +22855,12 @@ - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10586,11 +22873,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10599,29 +22896,28 @@ - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10634,11 +22930,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10647,15 +22953,12 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10668,11 +22971,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10681,37 +22994,36 @@ - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo= ac_hi= - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10724,11 +23036,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10737,37 +23059,39 @@ - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_long=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 --echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} -+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (long), 77 -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 --echo "$as_me: error: cannot run test program while cross compiling" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - long longval () { return (long) (sizeof (long)); } - unsigned long ulongval () { return (long) (sizeof (long)); } - #include - #include --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10810,13 +23134,16 @@ - else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 --echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} -+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (long), 77 -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - rm -f conftest.val -@@ -10837,15 +23164,12 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10859,11 +23183,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10872,10 +23206,11 @@ - ac_cv_type_long_long=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_type_long_long=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 - echo "${ECHO_T}$ac_cv_type_long_long" >&6 -@@ -10893,15 +23228,12 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10914,11 +23246,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10927,15 +23269,12 @@ - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10948,11 +23287,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10961,29 +23310,28 @@ - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -10996,11 +23344,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11009,15 +23367,12 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -11030,11 +23385,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11043,37 +23408,36 @@ - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo= ac_hi= - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -11086,11 +23450,21 @@ - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11099,37 +23473,39 @@ - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_long_long=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5 --echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;} -+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (long long), 77 -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 --echo "$as_me: error: cannot run test program while cross compiling" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - long longval () { return (long) (sizeof (long long)); } - unsigned long ulongval () { return (long) (sizeof (long long)); } - #include - #include --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -11172,13 +23548,16 @@ - else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5 --echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;} -+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (long long), 77 -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - rm -f conftest.val -@@ -11233,18 +23612,31 @@ - echo "$as_me:$LINENO: checking $ac_header usability" >&5 - echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11253,10 +23645,11 @@ - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_compiler=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 - echo "${ECHO_T}$ac_header_compiler" >&6 - -@@ -11264,20 +23657,24 @@ - echo "$as_me:$LINENO: checking $ac_header presence" >&5 - echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -@@ -11288,7 +23685,8 @@ - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_header_preproc=no - fi - rm -f conftest.err conftest.$ac_ext -@@ -11296,26 +23694,43 @@ - echo "${ECHO_T}$ac_header_preproc" >&6 - - # So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -+ yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 - echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 - echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------ ## -+## Report this to freeodbc++@orcane.net ## -+## ------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac - echo "$as_me:$LINENO: checking for $ac_header" >&5 - echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=$ac_header_preproc" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -11344,8 +23759,11 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lreadline -ltermcap $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -11354,12 +23772,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char readline (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -11370,11 +23782,21 @@ - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11383,10 +23805,12 @@ - ac_cv_lib_readline_readline=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - ac_cv_lib_readline_readline=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -@@ -11819,7 +24243,7 @@ - CXXFLAGS="-DIN_ODBCXX $CXXFLAGS" - - --ac_config_files="$ac_config_files Makefile include/Makefile include/odbc++/Makefile src/Makefile tests/Makefile isql++/Makefile qtsql++/Makefile doc/Makefile doc/progref/Makefile win32/Makefile win32/tests/Makefile libodbc++.spec libodbc++.pc" -+ ac_config_files="$ac_config_files Makefile include/Makefile include/odbc++/Makefile src/Makefile tests/Makefile isql++/Makefile qtsql++/Makefile doc/Makefile doc/progref/Makefile win32/Makefile win32/tests/Makefile libodbc++.spec libodbc++.pc" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -11830,7 +24254,7 @@ - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overriden when -+# `ac_cv_env_foo' variables (set or unset) will be overridden when - # loading this file, other *unset* `ac_cv_foo' will be assigned the - # following values. - -@@ -11848,13 +24272,13 @@ - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; - } | -@@ -11865,7 +24289,7 @@ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache --if cmp -s $cache_file confcache; then :; else -+if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file -@@ -11884,18 +24308,33 @@ - # trailing colons and then remove the whole line if VPATH becomes empty - # (actually we leave an empty line to preserve line numbers). - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ - s/:*\$(srcdir):*/:/; - s/:*\${srcdir}:*/:/; - s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; -+s/^\([^=]*=[ ]*\):*/\1/; - s/:*$//; --s/^[^=]*=[ ]*$//; -+s/^[^=]*=[ ]*$//; - }' - fi - - DEFS=-DHAVE_CONFIG_H - -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_i=`echo "$ac_i" | -+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -+ # 2. Add them. -+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+done -+LIBOBJS=$ac_libobjs -+ -+LTLIBOBJS=$ac_ltlibobjs -+ -+ - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -11903,6 +24342,20 @@ - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${THREADS_TRUE}" && test -z "${THREADS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"THREADS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -11952,11 +24405,12 @@ - # configure, is in config.log if it exists. - - debug=false -+ac_cs_recheck=false -+ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -- - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -11965,46 +24419,57 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi -+DUALCASE=1; export DUALCASE # for MKS sh - --# NLS nuisances. - # Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false - fi - --(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && -- { $as_unset LANG || test "${LANG+set}" != set; } || -- { LANG=C; export LANG; } --(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && -- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || -- { LC_ALL=C; export LC_ALL; } --(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && -- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || -- { LC_TIME=C; export LC_TIME; } --(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && -- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || -- { LC_CTYPE=C; export LC_CTYPE; } --(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && -- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || -- { LANGUAGE=C; export LANGUAGE; } --(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && -- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || -- { LC_COLLATE=C; export LC_COLLATE; } --(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && -- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || -- { LC_NUMERIC=C; export LC_NUMERIC; } --(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && -- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || -- { LC_MESSAGES=C; export LC_MESSAGES; } -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi - - - # Name of the executable. --as_me=`(basename "$0") 2>/dev/null || -+as_me=`$as_basename "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ -@@ -12015,6 +24480,7 @@ - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -+ - # PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' -@@ -12025,15 +24491,15 @@ - - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conftest.sh -- echo "exit 0" >>conftest.sh -- chmod +x conftest.sh -- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi -- rm -f conftest.sh -+ rm -f conf$$.sh - fi - - -@@ -12082,6 +24548,8 @@ - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} -@@ -12155,13 +24623,20 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - # IFS -@@ -12171,7 +24646,7 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } -+$as_unset CDPATH - - exec 6>&1 - -@@ -12187,8 +24662,8 @@ - } >&5 - cat >&5 <<_CSEOF - --This file was extended by libodbcxx $as_me 0.2.3, which was --generated by GNU Autoconf 2.53. Invocation command line was -+This file was extended by libodbcxx $as_me 0.2.3-20050404, which was -+generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -12228,12 +24703,13 @@ - - -h, --help print this help, then exit - -V, --version print version number, then exit -+ -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ instantiate the configuration file FILE - --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -12249,12 +24725,11 @@ - - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ --libodbcxx config.status 0.2.3 --configured by $0, generated by GNU Autoconf 2.53, -+libodbcxx config.status 0.2.3-20050404 -+configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 2003 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - srcdir=$srcdir -@@ -12271,25 +24746,25 @@ - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -- shift -- set dummy "$ac_option" "$ac_optarg" ${1+"$@"} -- shift -+ ac_shift=: -+ ;; -+ -*) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift - ;; -- -*);; - *) # This is not an option, so the user has probably given explicit - # arguments. -+ ac_option=$1 - ac_need_defaults=false;; - esac - -- case $1 in -+ case $ac_option in - # Handling of the options. - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" -- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; --_ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) -@@ -12304,13 +24779,16 @@ - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) -- shift -- CONFIG_FILES="$CONFIG_FILES $1" -+ $ac_shift -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) -- shift -- CONFIG_HEADERS="$CONFIG_HEADERS $1" -+ $ac_shift -+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -@@ -12325,6 +24803,20 @@ - shift - done - -+ac_configure_extra_args= -+ -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+if \$ac_cs_recheck; then -+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+fi -+ - _ACEOF - - cat >>$CONFIG_STATUS <<_ACEOF -@@ -12374,6 +24866,9 @@ - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands - fi - -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason to put it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. - # Create a temporary directory, and hook for its removal unless debugging. - $debug || - { -@@ -12382,17 +24877,17 @@ - } - - # Create a (secure) tmp directory for tmp files. --: ${TMPDIR=/tmp} -+ - { -- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=$TMPDIR/cs$$-$RANDOM -+ tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) - } || - { -- echo "$me: cannot create a temporary directory in $TMPDIR" >&2 -+ echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - -@@ -12443,6 +24938,7 @@ - s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t - s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t - s,@INSTALL_DATA@,$INSTALL_DATA,;t t -+s,@CYGPATH_W@,$CYGPATH_W,;t t - s,@PACKAGE@,$PACKAGE,;t t - s,@VERSION@,$VERSION,;t t - s,@ACLOCAL@,$ACLOCAL,;t t -@@ -12457,6 +24953,7 @@ - s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t - s,@AWK@,$AWK,;t t - s,@SET_MAKE@,$SET_MAKE,;t t -+s,@am__leading_dot@,$am__leading_dot,;t t - s,@lib_version@,$lib_version,;t t - s,@build@,$build,;t t - s,@build_cpu@,$build_cpu,;t t -@@ -12481,16 +24978,26 @@ - s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t - s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t - s,@CXXDEPMODE@,$CXXDEPMODE,;t t -+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t - s,@CXXCPP@,$CXXCPP,;t t - s,@CC@,$CC,;t t - s,@CFLAGS@,$CFLAGS,;t t - s,@ac_ct_CC@,$ac_ct_CC,;t t - s,@CCDEPMODE@,$CCDEPMODE,;t t -+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -+s,@EGREP@,$EGREP,;t t - s,@LN_S@,$LN_S,;t t - s,@ECHO@,$ECHO,;t t -+s,@AR@,$AR,;t t -+s,@ac_ct_AR@,$ac_ct_AR,;t t - s,@RANLIB@,$RANLIB,;t t - s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t - s,@CPP@,$CPP,;t t -+s,@F77@,$F77,;t t -+s,@FFLAGS@,$FFLAGS,;t t -+s,@ac_ct_F77@,$ac_ct_F77,;t t - s,@LIBTOOL@,$LIBTOOL,;t t - s,@docdir@,$docdir,;t t - s,@THREAD_LIBS@,$THREAD_LIBS,;t t -@@ -12515,6 +25022,8 @@ - s,@BUILD_ISQLXX_FALSE@,$BUILD_ISQLXX_FALSE,;t t - s,@BUILD_TESTS_TRUE@,$BUILD_TESTS_TRUE,;t t - s,@BUILD_TESTS_FALSE@,$BUILD_TESTS_FALSE,;t t -+s,@LIBOBJS@,$LIBOBJS,;t t -+s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF - - _ACEOF -@@ -12544,9 +25053,9 @@ - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end -@@ -12564,46 +25073,51 @@ - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ cat >$tmp/stdin -+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -- { case "$ac_dir" in -- [\\/]* | ?:[\\/]* ) as_incr_dir=;; -- *) as_incr_dir=.;; --esac --as_dummy="$ac_dir" --for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do -- case $as_mkdir_dir in -- # Skip DOS drivespec -- ?:) as_incr_dir=$as_mkdir_dir ;; -- *) -- as_incr_dir=$as_incr_dir/$as_mkdir_dir -- test -d "$as_incr_dir" || -- mkdir "$as_incr_dir" || -- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac --done; } -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } - - ac_builddir=. - -@@ -12630,12 +25144,45 @@ - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac - - - case $INSTALL in -@@ -12657,7 +25204,7 @@ - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+ sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. -@@ -12666,24 +25213,24 @@ - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ # Absolute (can't be DOS-style, as IFS=:) -+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- echo $f;; -+ echo "$f";; - *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ if test -f "$f"; then -+ # Build tree -+ echo "$f" -+ elif test -f "$srcdir/$f"; then -+ # Source tree -+ echo "$srcdir/$f" -+ else -+ # /dev/null tree -+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- fi;; -+ fi;; - esac - done` || { (exit 1); exit 1; } - _ACEOF -@@ -12725,12 +25272,12 @@ - # NAME is the cpp macro being defined and VALUE is the value it is being given. - # - # ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' -+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -+ac_dB='[ ].*$,\1#\2' - ac_dC=' ' - ac_dD=',;t' - # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' - ac_uB='$,\1#\2define\3' - ac_uC=' ' - ac_uD=',;t' -@@ -12739,11 +25286,11 @@ - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ cat >$tmp/stdin -+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - -@@ -12757,28 +25304,29 @@ - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ # Absolute (can't be DOS-style, as IFS=:) -+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- echo $f;; -+ # Do quote $f, to prevent DOS paths from being IFS'd. -+ echo "$f";; - *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ if test -f "$f"; then -+ # Build tree -+ echo "$f" -+ elif test -f "$srcdir/$f"; then -+ # Source tree -+ echo "$srcdir/$f" -+ else -+ # /dev/null tree -+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- fi;; -+ fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - - _ACEOF - -@@ -12801,9 +25349,9 @@ - s,[\\$`],\\&,g - t clear - : clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp - t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp - : end - _ACEOF - # If some macros were called several times there might be several times -@@ -12817,13 +25365,13 @@ - # example, in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, - _ACEOF - - # Break up conftest.defines because some shells have a limit on the size - # of here documents, and old seds have small limits too (100 cmds). - echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS - echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS - echo ' :' >>$CONFIG_STATUS - rm -f conftest.tail -@@ -12832,7 +25380,7 @@ - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS -@@ -12847,7 +25395,7 @@ - mv conftest.tail conftest.defines - done - rm -f conftest.defines --echo ' fi # egrep' >>$CONFIG_STATUS -+echo ' fi # grep' >>$CONFIG_STATUS - echo >>$CONFIG_STATUS - - # Break up conftest.undefs because some shells have a limit on the size -@@ -12859,7 +25407,7 @@ - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS -@@ -12887,41 +25435,46 @@ - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then -- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then -+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -- { case "$ac_dir" in -- [\\/]* | ?:[\\/]* ) as_incr_dir=;; -- *) as_incr_dir=.;; --esac --as_dummy="$ac_dir" --for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do -- case $as_mkdir_dir in -- # Skip DOS drivespec -- ?:) as_incr_dir=$as_mkdir_dir ;; -- *) -- as_incr_dir=$as_incr_dir/$as_mkdir_dir -- test -d "$as_incr_dir" || -- mkdir "$as_incr_dir" || -- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac --done; } -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file -@@ -12930,13 +25483,29 @@ - cat $tmp/config.h - rm -f $tmp/config.h - fi -- # Run the commands associated with the file. -- case $ac_file in -- config.h ) # update the timestamp --echo 'timestamp for config.h' >"./stamp-h1" -- ;; -+# Compute $ac_file's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $ac_file | $ac_file:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done -+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X$ac_file : 'X\(//\)[^/]' \| \ -+ X$ac_file : 'X\(//\)$' \| \ -+ X$ac_file : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X$ac_file | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+done - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -@@ -12948,16 +25517,41 @@ - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || - $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_dest" : 'X\(//\)[^/]' \| \ -+ X"$ac_dest" : 'X\(//\)$' \| \ -+ X"$ac_dest" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } -+ - ac_builddir=. - - if test "$ac_dir" != .; then -@@ -12983,12 +25577,45 @@ - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac - - - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -@@ -13006,10 +25633,10 @@ - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$mf" : 'X\(//\)[^/]' \| \ -- X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$mf" : 'X\(//\)[^/]' \| \ -+ X"$mf" : 'X\(//\)$' \| \ -+ X"$mf" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -13045,35 +25672,40 @@ - test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || - $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$file" : 'X\(//\)[^/]' \| \ -- X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$file" : 'X\(//\)[^/]' \| \ -+ X"$file" : 'X\(//\)$' \| \ -+ X"$file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -- { case $dirpart/$fdir in -- [\\/]* | ?:[\\/]* ) as_incr_dir=;; -- *) as_incr_dir=.;; --esac --as_dummy=$dirpart/$fdir --for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do -- case $as_mkdir_dir in -- # Skip DOS drivespec -- ?:) as_incr_dir=$as_mkdir_dir ;; -- *) -- as_incr_dir=$as_incr_dir/$as_mkdir_dir -- test -d "$as_incr_dir" || -- mkdir "$as_incr_dir" || -- { { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5 --echo "$as_me: error: cannot create $dirpart/$fdir" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac --done; } -+ { if $as_mkdir_p; then -+ mkdir -p $dirpart/$fdir -+ else -+ as_dir=$dirpart/$fdir -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} -+ { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" -@@ -13102,8 +25734,11 @@ - # need to make the FD available again. - if test "$no_create" != yes; then - ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null -- $SHELL $CONFIG_STATUS || ac_cs_success=false -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -diff -Naur libodbc++-0.2.3/configure.ac libodbc++-0.2.3-20050404/configure.ac ---- libodbc++-0.2.3/configure.ac 2003-06-17 12:20:32.000000000 +0200 -+++ libodbc++-0.2.3-20050404/configure.ac 2005-04-04 18:12:42.000000000 +0200 -@@ -18,7 +18,7 @@ - # Boston, MA 02111-1307, USA. - - AC_PREREQ(2.53) --AC_INIT(libodbcxx,0.2.3,freeodbc++@orcane.net,libodbc++) -+AC_INIT(libodbcxx,0.2.3-20050404,freeodbc++@orcane.net,libodbc++) - AC_CONFIG_SRCDIR(src/connection.cpp) - AM_INIT_AUTOMAKE - AM_CONFIG_HEADER(config.h) -diff -Naur libodbc++-0.2.3/depcomp libodbc++-0.2.3-20050404/depcomp ---- libodbc++-0.2.3/depcomp 2003-03-28 16:40:16.000000000 +0100 -+++ libodbc++-0.2.3-20050404/depcomp 2005-04-04 18:10:28.000000000 +0200 -@@ -1,7 +1,7 @@ - #! /bin/sh - - # depcomp - compile a program generating dependencies as side-effects --# Copyright 1999, 2000 Free Software Foundation, Inc. -+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -172,19 +172,25 @@ - - aix) - # The C for AIX Compiler uses -M and outputs the dependencies -- # in a .u file. This file always lives in the current directory. -- # Also, the AIX compiler puts `$object:' at the start of each line; -- # $object doesn't have directory information. -- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` -+ # in a .u file. In older versions, this file always lives in the -+ # current directory. Also, the AIX compiler puts `$object:' at the -+ # start of each line; $object doesn't have directory information. -+ # Version 6 uses the directory in both cases. -+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" -- outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi -- - stat=$? -+ -+ if test -f "$tmpdepfile"; then : -+ else -+ stripped=`echo "$stripped" | sed 's,^.*/,,'` -+ tmpdepfile="$stripped.u" -+ fi -+ - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" -@@ -192,6 +198,7 @@ - fi - - if test -f "$tmpdepfile"; then -+ outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. -@@ -206,6 +213,44 @@ - rm -f "$tmpdepfile" - ;; - -+icc) -+ # Intel's C compiler understands `-MD -MF file'. However on -+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c -+ # ICC 7.0 will fill foo.d with something like -+ # foo.o: sub/foo.c -+ # foo.o: sub/foo.h -+ # which is wrong. We want: -+ # sub/foo.o: sub/foo.c -+ # sub/foo.o: sub/foo.h -+ # sub/foo.c: -+ # sub/foo.h: -+ # ICC 7.1 will output -+ # foo.o: sub/foo.c sub/foo.h -+ # and will wrap long lines using \ : -+ # foo.o: sub/foo.c ... \ -+ # sub/foo.h ... \ -+ # ... -+ -+ "$@" -MD -MF "$tmpdepfile" -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ # Each line is of the form `foo.o: dependent.h', -+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. -+ # Do two passes, one to just change these to -+ # `$object: dependent.h' and one to simply `dependent.h:'. -+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" -+ # Some versions of the HPUX 10.20 sed can't process this invocation -+ # correctly. Breaking it into two sed invocations is a workaround. -+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | -+ sed -e 's/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ - tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. -@@ -240,8 +285,8 @@ - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -- # That's a space and a tab in the []. -- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -+ # That's a tab and a space in the []. -+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi -@@ -254,7 +299,7 @@ - - dashmstdout) - # Important note: in order to support this mode, a compiler *must* -- # always write the proprocessed file to stdout, regardless of -o. -+ # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. -@@ -265,9 +310,7 @@ - shift - fi - -- # Remove `-o $object'. We will use -o /dev/null later, -- # however we can't do the remplacement now because -- # `-o $object' might simply not be used -+ # Remove `-o $object'. - IFS=" " - for arg - do -@@ -287,7 +330,11 @@ - done - - test -z "$dashmflag" && dashmflag=-M -- "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" -+ # Require at least two characters before searching for `:' -+ # in the target name. This is to cope with DOS-style filenames: -+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. -+ "$@" $dashmflag | -+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -@@ -306,6 +353,13 @@ - - makedepend) - "$@" || exit $? -+ # Remove any Libtool call -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift -+ done -+ shift -+ fi - # X makedepend - shift - cleared=no -@@ -318,7 +372,9 @@ - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; -- -*) -+ # Strip any option that makedepend may not understand. Remove -+ # the object too, otherwise makedepend will parse it as a source file. -+ -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; -@@ -339,7 +395,7 @@ - - cpp) - # Important note: in order to support this mode, a compiler *must* -- # always write the proprocessed file to stdout. -+ # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. -@@ -381,7 +437,7 @@ - - msvisualcpp) - # Important note: in order to support this mode, a compiler *must* -- # always write the proprocessed file to stdout, regardless of -o, -+ # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " -diff -Naur libodbc++-0.2.3/doc/INSTALL/book1.html libodbc++-0.2.3-20050404/doc/INSTALL/book1.html ---- libodbc++-0.2.3/doc/INSTALL/book1.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/book1.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,194 +0,0 @@ -- --Libodbc++ Installation

Libodbc++ Installation

Manush Dodunekov

manush@stendahls.net

Version 0.2.3
  Next >>>
  Software requirements
-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/c18.html libodbc++-0.2.3-20050404/doc/INSTALL/c18.html ---- libodbc++-0.2.3/doc/INSTALL/c18.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/c18.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,166 +0,0 @@ -- --Software requirements
Libodbc++ Installation
<<< PreviousNext >>>

Software requirements

C++ compiler

To compile libodbc++, you'll need a c++ compiler that supports -- exceptions, templates and namespaces and -- has a reasonable standard c++ library. On free unices, -- your best choice is GCC 2.95.2 or later, which can be -- obtained from the GCC homepage. -- If you already have egcs 1.1.2 or later, it will do.

On win32, success has been reported with MSVC 5.0 and 6.0, with -- and without QT.

<<< PreviousHomeNext >>>
Libodbc++ Installation ODBC Driver Manager
-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/c70.html libodbc++-0.2.3-20050404/doc/INSTALL/c70.html ---- libodbc++-0.2.3/doc/INSTALL/c70.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/c70.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,663 +0,0 @@ -- --Installation
Libodbc++ Installation
<<< PreviousNext >>>

Installation

UNIX

The following information applies for installing libodbc++ on unices.

Configuration

First, you need to configure libodbc++ for your system. -- Go into the source directory and do: -- -- 
$ ./configure
-- -- or, if iODBC isn't installed in it's default location -- /usr/local, do: -- 
$ ./configure --with-iodbc=DIR
-- -- This will make ./configure look for iODBC in -- DIR/include and -- DIR/lib.

If you aren't using iODBC, try -- -- 
$ ./configure --with-odbc=DIR
-- This works the same as above, except it looks for standard ODBC headers and libraries -- instead of the iODBC-specific ones. This should be used with for example -- unixODBC and Merant driver manager.

If you wish to install libodbc++ in a location other than -- /usr/local, add -- --prefix=PREFIX to the ./configure arguments.

If the c++ compiler you wish to use to compile this package isn't the system -- default one, you will need to set the environment variable CXX to -- the name of it's executable. For example, if you have an old gcc or -- egcs as a system default compiler, but installed a newer -- gcc in /usr/local/gcc, do like this: -- 
$ CXX=/usr/local/egcs/bin/c++ ./configure --with-iodbc
--

If you wish to enable support for multithreaded programs, add -- --enable-threads to the ./configure arguments. -- On UNIX, this requires pthreads and will probably not yet work on anything else -- than linux and solaris. The library built will have suffix '-mt' appended -- to it's name if threads are enabled.

If you wish to enable support for QT, -- use the --with-qt -- argument. You can optionally specify where your QT lives by using -- --with-qt=QTDIR. The -- --with-qt-includes=DIR, -- --with-qt-libs=DIR and -- --with-qt-moc=PATH options might be handy if you have -- a strange QT installation. This will compile a second version of the library -- named libodbc++_qt in the subdirectory qt. -- Note that you must define ODBCXX_QT when compiling a program -- that links with libodbc++_qt.

The two "demo" programs that come with libodbc++ aren't -- built by default. To enable them, use --with-isqlxx and/or -- --with-qtsqlxx to build isql++ -- respectively qtsql++.

By default, a number of test programs are built with the library. If you do not wish -- to build them, use --without-tests.

You can control the ODBC version libodbc++ uses by specifying: -- --with-odbc-version=ODBCVER, -- where ODBCVER should be a -- four-digit hexadecimal value representing the ODBC version. For example: -- 
$ ./configure --with-odbc-version=0x0250
-- would make libodbc++ use ODBC version 2.50.

Compilation

Just type: -- 
$ make
--

If it all goes well, you can try a couple of the test programs in -- tests/. You'll need to configure some datasources before -- running most of the tests. For simply reality-checking your current ODBC -- setup, you can try running tests/dmtest, which lists -- all available datasources and drivers.

Installing libodbc++

If you have write privileges in PREFIX, just do: -- 
$ make install
-- Otherwise, you'll have to use: -- 
$ su root -c 'make install'

-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/caution.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/caution.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/caution.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/caution.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3 +0,0 @@ --GIF87a÷!!11BBZZcckkss{{„„„„sŒŒŒŒsŒŒŒ””””s””{œœœœsœœ{œœ”œœœ¥¥¥¥c¥¥œ¥¥¥µµµµZµµcµµµ½½½½cÎÎÎÎÎÖÖÖÖÎÖÖÖÞÞÞÞ1ÞÞ9ÞÞBçççç1çç9çççïïïïï÷÷÷÷÷÷÷÷1÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,ôuH° Áƒ_Ä@È ‰6DHB --$N$ø¢Á --4>pиña (e|ˆ¸QGE(YÀéaäD`ÊèP 8j’,XÑEJt@ÃP?MºeH›œL)ƒ‚€%¸ªd)ð¥Ø üäJC¨Ž¨geŒp`-[ tÄààÆYÌ«b 16|ø‹ÀÁÙÜûÁoÊ "Ø•Ñ‚d‚‰=àHÉ)UDF¸W4Ê  „•áÂÂ热-—X«ÂöÆÄ‹¹B¾Ý²åÎÄ'†Æ¡:ùo ·Ä ÂùÀ€; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/home.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/home.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/home.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/home.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF87a#÷Œ!Œ!)”)1œ1BœBJ¥Jc­cs½s„½„ŒÆŒ”Δ¥Î¥µÞµÆÞÆÎçÎÖïÖçïçï÷ïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,#È%H° Áƒ*\È°¡C4p ÁA24 @`42D@` Pè ‚J F`á I“(%X°`Ì@p@Ê ÈXAPŸJ``@ :H€:µä­¼)ðäÖœ\ €EÙ $Pµ6-Yå‚`U{¶«„« ‹Ö”&d õ@HˆAAÁˆ+^Ì!A‚Œ.Îla³„°Š\ͺµë†; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/important.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/important.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/important.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/important.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3 +0,0 @@ --GIF87a÷)))999BB1BBBJJJRRRZZ)ccccRccckkBkkkssR{{{„„„ŒŒŒŒ9ŒŒ{ŒŒŒ””Z””Œ”””œœZœœcœœ{œœœ¥¥c¥¥„¥¥”¥¥œ¥¥¥­­!­­9­­k­­{­­„­­Œ­­¥­­­µµJµµRµµŒµµµ½½½½Z½½„½½œ½½½ÆÆÆÆZÆÆÆÎÎsÎÎÎÖÖÖÖRÖÖcÖÖkÖÖÖÞÞÞÞ!ÞÞ1ÞÞ9ÞÞRÞÞÞçççç!çç)çç1ççZççcçç{çççïïïïïï1ïïBïïï÷÷÷÷÷÷1÷÷9÷÷J÷÷÷ÿÿÿÿÿÿÿÿ!ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,þ·Hp‰Aƒ*ܲĆˆ ""BÄae!A+3,|Ò¤cG,à°È0ƒ‡$WRªT©CƒˆŠ ­dˆÑd¥Í”ML¸ˆ9Ó& --|ÜÜ°s Ž5WR@AR•M< ¸$J› ˜rSG --8Pܼ"i'c9,Ù""ÈØLd‹ÇOW¾`ÂØ+D2ÜÍ«2$þ<öG+ Æ;ÖÈ;$3¾ùÄÂ%ŠElqÁõæ 9æÞ¬»¥Ç‡±Ìá b­•:nB`jà‡M,0Š¶ö@؇/nò… 7µ ½)R¡ˆ „ó0r¡ 5žŒ}Â"ƒ ’­ET@A¤=‘*¨X‹žª ø'ÒO; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/next.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/next.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/next.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/next.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,2 +0,0 @@ --GIF87a#÷„Œ!Œ!)”)1œ1BœBJ¥JR­Rc­ckµk„½„ŒÆŒ”Δ¥Î¥­Ö­µÞµÆÞÆÎçÎÖïÖçïçï÷ïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,#©+H° Áƒ*\È°¡Ã‚L(!âć --%pQ† "8T@€€À(¦>>???@@@AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSSTTTUUUVVVWWWXXXYYYZZZ[[[\\\]]]^^^___```aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrssstttuuuvvvwwwxxxyyyzzz{{{|||}}}~~~€€€‚‚‚ƒƒƒ„„„………†††‡‡‡ˆˆˆ‰‰‰ŠŠŠ‹‹‹ŒŒŒŽŽŽ‘‘‘’’’“““”””•••–––———˜˜˜™™™ššš›››œœœžžžŸŸŸ   ¡¡¡¢¢¢£££¤¤¤¥¥¥¦¦¦§§§¨¨¨©©©ªªª«««¬¬¬­­­®®®¯¯¯°°°±±±²²²³³³´´´µµµ¶¶¶···¸¸¸¹¹¹ººº»»»¼¼¼½½½¾¾¾¿¿¿ÀÀÀÁÁÁÂÂÂÃÃÃÄÄÄÅÅÅÆÆÆÇÇÇÈÈÈÉÉÉÊÊÊËËËÌÌÌÍÍÍÎÎÎÏÏÏÐÐÐÑÑÑÒÒÒÓÓÓÔÔÔÕÕÕÖÖÖ×××ØØØÙÙÙÚÚÚÛÛÛÜÜÜÝÝÝÞÞÞßßßàààáááâââãããäääåååæææçççèèèéééêêêëëëìììíííîîîïïïðððñññòòòóóóôôôõõõööö÷÷÷øøøùùùúúúûûûüüüýýýþþþÿÿÿ,þÿ HðœAƒ*Ø«¥R:[˜ð1F¥¬{Çñœ1J”&R<÷ÐÅÎ(ÕZø®ÔÊ“[öªHi&L‚5 :+u³b)“öL¸S`Q‚ÆzÕRÚËÛA„ÿJ‹êí5k¥ÕræÍš3F„ F¤tnë9© · --<—Ò˜³9M½u élF²ßQ£E‰”=5k-5öŽ¤·»Sîáz˜Ò¿wÖ=ëQb½sTö¸$eJ{Jq\³Ç«±=@žýWËšÀZ!×lž3ƦÂR±Æ<-%3!c[BŽ*òŸÓã'{ÙÆšxèÎá¯yýǨøÀ^” Süj l¿ÃÄŠQî9o;µ6‡‰$HÜÚ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/prev.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/prev.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/prev.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/prev.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,2 +0,0 @@ --GIF87a#÷„Œ!Œ!)”)1œ1BœBJ¥JR­Rkµks½s„½„ŒÆŒ”Δ¥Î¥­Ö­ÆÞÆÎçÎÖïÖçïçï÷ïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,#•)H° Áƒ*\È°¡CƒH|ð°b‚P±¡‚( @‘":ü(P`DÀ@ œ4À‘¡ -- Œ¤€‚  ÐÀÓž>A,J¨‚¡$ õ(u Uœ0Ùð"A zh@’#X‡¤A¢@ H˜@W¥ß¿€; ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/tip.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/tip.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/tip.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/tip.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,6 +0,0 @@ --GIF87a÷ -- -- --  !!!"""###$$$%%%&&&'''((()))***+++,,,---...///000111222333444555666777888999:::;;;<<<===>>>???@@@AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSSTTTUUUVVVWWWXXXYYYZZZ[[[\\\]]]^^^___```aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrssstttuuuvvvwwwxxxyyyzzz{{{|||}}}~~~€€€‚‚‚ƒƒƒ„„„………†††‡‡‡ˆˆˆ‰‰‰ŠŠŠ‹‹‹ŒŒŒŽŽŽ‘‘‘’’’“““”””•••–––———˜˜˜™™™ššš›››œœœžžžŸŸŸ   ¡¡¡¢¢¢£££¤¤¤¥¥¥¦¦¦§§§¨¨¨©©©ªªª«««¬¬¬­­­®®®¯¯¯°°°±±±²²²³³³´´´µµµ¶¶¶···¸¸¸¹¹¹ººº»»»¼¼¼½½½¾¾¾¿¿¿ÀÀÀÁÁÁÂÂÂÃÃÃÄÄÄÅÅÅÆÆÆÇÇÇÈÈÈÉÉÉÊÊÊËËËÌÌÌÍÍÍÎÎÎÏÏÏÐÐÐÑÑÑÒÒÒÓÓÓÔÔÔÕÕÕÖÖÖ×××ØØØÙÙÙÚÚÚÛÛÛÜÜÜÝÝÝÞÞÞßßßàààáááâââãããäääåååæææçççèèèéééêêêëëëìììíííîîîïïïðððñññòòòóóóôôôõõõööö÷÷÷øøøùùùúúúûûûüüüýýýþþþÿÿÿ,êÿ HðœAƒ*xÎX)J¥"BtvoaÂ{½&ž»·±!%JÎ,2„èM¤3ˆïQêUQä¿s¥j)TÙK!Ìs --W&tVªåÀ{{B¬ÁY°TI†¥ˆ¼7‚¥yF•¹Ð›Ñ…*‰^UÈhϪ --k…„é“`Ö”xŽÒËž )åH»vä[¨?ÇÐ]ØömÝ÷ôªåëö&VÁ½¹ý'öð^…¥Bþ³êxpBÀ#ÏD¬°WÍVñ2 ±g-O¼z3&™ £ÖkQ«ÐÙk‘ý='Û˜ËÉ”=x"m‹çŠŒ|ü_@; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/toc-blank.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/toc-blank.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/toc-blank.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/toc-blank.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF89a ³€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿÿÿÿ, ðɇ¦½8Ûª»§`%‚_Æ•¨tf; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/toc-minus.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/toc-minus.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/toc-minus.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/toc-minus.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF89a ÷„„„ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ, 08P€Áƒ*L¨PÆ64‘¢1:ܘPàÄ?V"A‚; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/toc-plus.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/toc-plus.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/toc-plus.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/toc-plus.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF89a ÷„„„ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ, 38P€Áƒ*L¨PC6tx0¢Á‡hÔH1¡Ç‡)6)qäD‘ œ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/up.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/up.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/up.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/up.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF87a#÷„Œ!Œ!)”)1œ1BœBc­ckµk„½„ŒÆŒ”ΔµÞµÆÞÆÎçÎÖïÖçïçï÷ïÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,##H° Áƒ*\Èpàƒ DhÀ`„† €Œˆ@ ƒ €D(’d ,(°`¥Á–KF@Pò›qîÌ©P‚Bàó¨Ã "0P“ÀƒTrL€ jNjjMÈs¬B|4˶m€; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/stylesheet-images/warning.gif libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/warning.gif ---- libodbc++-0.2.3/doc/INSTALL/stylesheet-images/warning.gif 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/stylesheet-images/warning.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF87a÷!)1BJRZks{„Œ””{{œRRœZZœ{{¥¥99¥JJ¥„„¥””¥¥¥­­11­””µµ))µŒŒµœœµ¥¥µµµ½½­­½µµÆÆÆÆÆÆÎÎÎÎ))ÖÖ))ÖÖÖÞÞÞÞçç!!çççïïïïï÷÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ,þyÈCŒƒâ Èp`Š6Dœ¸a‡… Š°p#‡ÇQ\̈#E…Ž Sæ@q#ÁPªL‰"ƒK"NªìðÀ…J–SpT9‚@€2C^”!éÇðù3Œ 3shÀ@Œ™7 ÀðÕÄœz {5kŒdeKvæŒÌ‹5+‚öŽÍšC ‚ûÎÑ€ªJºYg0@€,ŠSjˆêuf 8@ ˜Ùa@€3T¾˜ ƒGèÑ;¨P}¡µ@NNIã2C"tïÎñÂ͸ag}Q;ãmÑ7fDŸ>£…oçu˜À½;w ¶ ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/x185.html libodbc++-0.2.3-20050404/doc/INSTALL/x185.html ---- libodbc++-0.2.3/doc/INSTALL/x185.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/x185.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,354 +0,0 @@ -- --Win32
Libodbc++ Installation
<<< PreviousInstallation 

Win32

MSVC

A makefile for MSVC is provided in the win32 directory of the source distribution. Use -- 
nmake /f makefile.w32 CFG=config
-- where config is one of: --

  • debug-lib - Static library with debugging information. Builds -- odbc++sd.lib in the debug-lib subdirectory.

  • debug-dll - Shared library with debugging information. Builds -- odbc++d.lib and odbc++d.dll in the debug-dll -- subdirectory.

  • prod-lib - Production static library. Builds odbc++s.lib -- in the prod-lib subdirectory.

  • prod-dll - Production shared library. Builds odbc++.lib -- and odbc++.dll in the prod-dll subdirectory.

  • qt-debug-lib - Static library with QT and debugging information. -- Builds odbc++qtsd.lib in the qt-debug-lib subdirectory.

  • qt-debug-dll - Shared library with QT and debugging information. -- Builds odbc++qtd.lib and odbc++qtd.dll in the -- qt-debug-dll subdirectory.

  • qt-prod-lib - Production static library with QT. Builds -- odbc++qts.lib in the qt-prod-lib subdirectory.

  • qt-prod-dll - Production shared library with QT. Builds -- odbc++qt.lib and odbc++qt.dll in the -- qt-prod-dll subdirectory.

When building with QT, make sure you have your environment set up right. QTDIR -- must point to a directory that contains the include and -- lib subdirectories for QT. The makefile will assume version 202 (2.0.2) of QT. -- To override that, pass QT_VERSION=nnn to nmake, for -- example: -- 
nmake /f makefile.w32 CFG=qt-debug-dll QT_VERSION=201
-- will build libodbc++ against QT version 2.0.1.

The library is always built with multithreading support on win32.

<<< PreviousHome 
InstallationUp 
-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/x27.html libodbc++-0.2.3-20050404/doc/INSTALL/x27.html ---- libodbc++-0.2.3/doc/INSTALL/x27.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/x27.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,188 +0,0 @@ -- --ODBC Driver Manager
Libodbc++ Installation
<<< PreviousSoftware requirementsNext >>>

ODBC Driver Manager

The ODBC Driver Manager is the software layer between -- applications and ODBC drivers. You must have one installed -- in order to use this library. -- The free choices on UNIX are: --

  • iODBC. -- Version 2.50.3 or later is recommended.

  • unixODBC. -- Version 1.8.4 or later is recommended.

-- Among the commercial driver managers, libodbc++ has been reported to work fine -- with the Merant driver manager.

<<< PreviousHomeNext >>>
Software requirementsUpDrivers
-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/x41.html libodbc++-0.2.3-20050404/doc/INSTALL/x41.html ---- libodbc++-0.2.3/doc/INSTALL/x41.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/x41.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,239 +0,0 @@ -- --Drivers
Libodbc++ Installation
<<< PreviousSoftware requirementsNext >>>

Drivers

To actually use libodbc++, you will need -- one or more ODBC drivers. Examples of free database engines -- with ODBC drivers are: --

--

MyODBC version 2.50.28 contains a bug that prevents -- it from working (at all). -- This -- patch solves the problem. --

--

Several vendors provide commercial drivers for unix: --

--

<<< PreviousHomeNext >>>
ODBC Driver ManagerUpQT
-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/INSTALL/x65.html libodbc++-0.2.3-20050404/doc/INSTALL/x65.html ---- libodbc++-0.2.3/doc/INSTALL/x65.html 2003-06-17 12:25:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/INSTALL/x65.html 1970-01-01 01:00:00.000000000 +0100 -@@ -1,156 +0,0 @@ -- --QT
Libodbc++ Installation
<<< PreviousSoftware requirementsNext >>>

QT

Libodbc++ can be built with support for -- the QT library version 2.0 or later, -- both on UNIX and win32.

<<< PreviousHomeNext >>>
DriversUpInstallation
-\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/Makefile.in libodbc++-0.2.3-20050404/doc/Makefile.in ---- libodbc++-0.2.3/doc/Makefile.in 2003-06-17 12:20:50.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/Makefile.in 2005-04-04 18:21:26.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,92 +32,146 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - instdoc_dir = @docdir@/@PACKAGE@-@VERSION@/INSTALL -@@ -128,16 +182,18 @@ - - EXTRA_DIST = $(instdoc_name).sgml - subdir = doc -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - --RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ -- uninstall-info-recursive all-recursive install-data-recursive \ -- install-exec-recursive installdirs-recursive install-recursive \ -- uninstall-recursive check-recursive installcheck-recursive --DIST_COMMON = Makefile.am Makefile.in -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - -@@ -212,10 +268,17 @@ - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done - - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -231,9 +294,15 @@ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ else \ -+ include_option=--include; \ -+ fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ -+ test -f $$subdir/TAGS && \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -246,20 +315,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -293,7 +383,7 @@ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="${top_distdir}" distdir="$(distdir)" \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - check-am: all-am - check: check-recursive -@@ -312,7 +402,7 @@ - installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -320,7 +410,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -330,7 +420,7 @@ - clean-am: clean-generic clean-libtool clean-local mostlyclean-am - - distclean: distclean-recursive -- -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -@@ -353,7 +443,7 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local - -@@ -361,25 +451,34 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ - uninstall-am: uninstall-info-am uninstall-local - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ -- clean clean-generic clean-libtool clean-local clean-recursive \ -- distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-local \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-local \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ -+ check-am clean clean-generic clean-libtool clean-local \ -+ clean-recursive ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-recursive \ -+ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -+ info-recursive install install-am install-data install-data-am \ -+ install-data-local install-data-recursive install-exec \ -+ install-exec-am install-exec-recursive install-info \ -+ install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-local maintainer-clean-recursive mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-local uninstall-recursive - - -diff -Naur libodbc++-0.2.3/doc/progref/annotated.html libodbc++-0.2.3-20050404/doc/progref/annotated.html ---- libodbc++-0.2.3/doc/progref/annotated.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/annotated.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,31 +1,30 @@ -- -+ - --Annotated Index -+libodbc++: Class List - - -- --
--Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
--

libodbc++ Compound List

Here are the classes, structs, unions and interfaces with brief descriptions: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
-+

libodbc++ Class List

Here are the classes, structs, unions and interfaces with brief descriptions:
odbc::BytesA chunk of bytes
odbc::CallableStatementA prepared statement suited for stored procedure calls
odbc::ConnectionA database connection
odbc::DatabaseMetaDataProvides several tons of information about a data source
odbc::DataSourceA Data Source
odbc::DateAn SQL DATE
odbc::DriverAn ODBC Driver with it's information
odbc::DriverManagerThe DriverManager
odbc::DriverMessageUsed internally - represents the result of an SQLError call
odbc::ErrorHandlerBase class for everything that might contain warnings
odbc::PreparedStatementA prepared statement
odbc::ResultSetA result set
odbc::ResultSetMetaDataProvides meta data about a result set
odbc::SQLExceptionThe exception thrown when errors occur inside the library
odbc::SQLWarningRepresents an SQL warning
odbc::StatementA simple non-prepared statement
odbc::TimeAn SQL TIME
odbc::TimestampAn SQL TIMESTAMP
odbc::TypesSQL type constants
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
odbc::BytesA chunk of bytes
odbc::CallableStatementA prepared statement suited for stored procedure calls
odbc::ConnectionA database connection
odbc::DatabaseMetaDataProvides several tons of information about a data source
odbc::DataSourceA Data Source
odbc::DateAn SQL DATE
odbc::DriverAn ODBC Driver with it's information
odbc::DriverManagerThe DriverManager
odbc::DriverMessageUsed internally - represents the result of an SQLError call
odbc::ErrorHandlerBase class for everything that might contain warnings
odbc::PreparedStatementA prepared statement
odbc::ResultSetA result set
odbc::ResultSetMetaDataProvides meta data about a result set
odbc::SQLExceptionThe exception thrown when errors occur inside the library
odbc::SQLWarningRepresents an SQL warning
odbc::StatementA simple non-prepared statement
odbc::TimeAn SQL TIME
odbc::TimestampAn SQL TIMESTAMP
odbc::TypesSQL type constants
-
-
-diff -Naur libodbc++-0.2.3/doc/progref/callablestatement_8h-source.html libodbc++-0.2.3-20050404/doc/progref/callablestatement_8h-source.html ---- libodbc++-0.2.3/doc/progref/callablestatement_8h-source.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/callablestatement_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,100 +1,99 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/callablestatement.h Source File -+libodbc++: odbc++/callablestatement.h Source File - - -- --
--Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
--

/trees/alex/src/libodbc++/include/odbc++/callablestatement.h

00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members

-+
odbc++/callablestatement.h
00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_CALLABLESTATEMENT_H
--00023 #define __ODBCXX_CALLABLESTATEMENT_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/preparedstatement.h>
-+00022 #ifndef __ODBCXX_CALLABLESTATEMENT_H
-+00023 #define __ODBCXX_CALLABLESTATEMENT_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/preparedstatement.h>
- 00028 
--00029 namespace odbc {
-+00029 namespace odbc {
- 00030 
--00057   class ODBCXX_EXPORT CallableStatement : public PreparedStatement {
--00058     friend class Connection;
-+00057   class ODBCXX_EXPORT CallableStatement : public PreparedStatement {
-+00058     friend class Connection;
- 00059     
--00060   private:
--00061     bool lastWasNull_;
-+00060   private:
-+00061     bool lastWasNull_;
- 00062 
--00063   protected:
--00064     CallableStatement(Connection* con,
-+00063   protected:
-+00064     CallableStatement(Connection* con,
- 00065                       SQLHSTMT hstmt,
--00066                       const ODBCXX_STRING& sql,
--00067                       int resultSetType,
--00068                       int resultSetConcurrency);
-+00066                       const ODBCXX_STRING& sql,
-+00067                       int resultSetType,
-+00068                       int resultSetConcurrency);
- 00069     
--00070   public:
--00072     virtual ~CallableStatement();
-+00070   public:
-+00072     virtual ~CallableStatement();
- 00073     
--00077     double getDouble(int idx);
-+00077     double getDouble(int idx);
- 00078 
--00082     bool getBoolean(int idx);
-+00082     bool getBoolean(int idx);
- 00083 
--00087     signed char getByte(int idx);
-+00087     signed char getByte(int idx);
- 00088 
--00092     ODBCXX_BYTES getBytes(int idx);
-+00092     ODBCXX_BYTES getBytes(int idx);
- 00093 
--00097     Date getDate(int idx);
-+00097     Date getDate(int idx);
- 00098 
--00102     float getFloat(int idx);
-+00102     float getFloat(int idx);
- 00103 
--00107     int getInt(int idx);
-+00107     int getInt(int idx);
- 00108 
--00112     Long getLong(int idx);
-+00112     Long getLong(int idx);
- 00113 
--00117     short getShort(int idx);
-+00117     short getShort(int idx);
- 00118 
--00122     ODBCXX_STRING getString(int idx);
-+00122     ODBCXX_STRING getString(int idx);
- 00123 
--00127     Time getTime(int idx);
-+00127     Time getTime(int idx);
- 00128 
--00132     Timestamp getTimestamp(int idx);
-+00132     Timestamp getTimestamp(int idx);
- 00133 
--00139     void registerOutParameter(int idx, int sqlType) {
-+00139     void registerOutParameter(int idx, int sqlType) {
- 00140       this->registerOutParameter(idx,sqlType,0);
- 00141     }
- 00142 
--00149     void registerOutParameter(int idx, int sqlType, int scale);
-+00149     void registerOutParameter(int idx, int sqlType, int scale);
- 00150 
--00154     void registerInParameter(int idx);
-+00154     void registerInParameter(int idx);
- 00155 
--00157     bool wasNull() {
--00158       return lastWasNull_;
-+00157     bool wasNull() {
-+00158       return lastWasNull_;
- 00159     }
- 00160   };
- 00161 
- 00162   
--00163 }; // namespace odbc
-+00163 }; // namespace odbc
- 00164 
- 00165 
--00166 #endif // __ODBCXX_CALLABLESTATEMENT_H
--
-+00166 #endif // __ODBCXX_CALLABLESTATEMENT_H -+
- -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_bytes.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_bytes.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_bytes.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_bytes.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,42 +1,42 @@ -- -+ - --odbc::Bytes class Reference -+libodbc++: odbc::Bytes Class Reference - - -- --
--Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
--

odbc::Bytes Class Reference

A chunk of bytes. -+ -+
Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
-+

odbc::Bytes Class Reference

A chunk of bytes. - More... -

- #include <types.h> -

--List of all members.

Public Methods

-+List of all members.

Public Member Functions

-
    --
  • -+
  • - Bytes () --
    Default constructor.

  • -+
    Default constructor.
  • - Bytes (const signed char *data, size_t dataLen) --
    Constructor.

  • --Bytes (const Bytes &b) --
    Copy constructor.

  • --Bytes & operator= (const Bytes &b) --
    Assignment.

  • --~Bytes () --
    Destructor.

  • --const signed char * getData () const --
    Returns a pointer to the data.

  • --size_t getSize () const --
    Returns the size of the data.

-+
Constructor.
  • -+Bytes (const Bytes &b) -+
    Copy constructor.
  • -+Bytes & operator= (const Bytes &b) -+
    Assignment.
  • -+bool operator== (const Bytes &b) -+
    Comparison.
  • -+~Bytes () -+
    Destructor.
  • -+const signed char * getData () const -+
    Returns a pointer to the data.
  • -+size_t getSize () const -+
    Returns the size of the data.
    -

    Detailed Description

    --A chunk of bytes. -+A chunk of bytes. -

    --Used for setting and getting binary values.

    --Warning:
    --This class uses reference counting. An instance that is referred to from different threads is likely to cause trouble.
    -+Used for setting and getting binary values.
    Warning:
    This class uses reference counting. An instance that is referred to from different threads is likely to cause trouble.
    -+ -

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_bytes-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_bytes-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_bytes-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_bytes-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,19 +1,19 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Bytes Member List

    This is the complete list of members for odbc::Bytes, including all inherited members. -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Bytes Member List

    This is the complete list of members for odbc::Bytes, including all inherited members.

    Bytes()odbc::Bytes
    Bytes(const signed char *data, size_t dataLen)odbc::Bytes
    Bytes(const Bytes &b)odbc::Bytes
    getData() constodbc::Bytes
    getSize() constodbc::Bytes
    operator=(const Bytes &b)odbc::Bytes
    ~Bytes()odbc::Bytes
    -+ -+ -+ -+ -+ -+ -+ -+ -
    Bytes()odbc::Bytes
    Bytes(const signed char *data, size_t dataLen)odbc::Bytes
    Bytes(const Bytes &b)odbc::Bytes
    getData() constodbc::Bytes
    getSize() constodbc::Bytes
    operator=(const Bytes &b)odbc::Bytes
    operator==(const Bytes &b)odbc::Bytes
    ~Bytes()odbc::Bytes
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,8 +0,0 @@ --GIF89a™ÀòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,™Àþ8ºÜþ0ÊI«½8Á»ÿ`(Ždižhª¦Êê¾p,ÏeKßx®ÃöîÿÀ\/H,IÃ]€³tžPZ³3]5«¾¤îúÂJ?^7¨µ>=g…K5³ ¯c§Q&¼šÖÏùu<1x~k‡~comˆ‰ŽTs†“Š‘•‚2…–”%Pyœœ›£ tž¤o,ƒ0›°—¬— €’·´ ·±{¡³'e)¼©c$Œh¹ÉÈ£»²‰Ë1ÁbÎ{•ÅÇnЫ´¨×†‹ÊÑ®¯t}v|ߺÏ趢¥qÌ“×å3ÒGøù:÷úýþ.üþ (" Áƒ "\ØO!ÇFBœøC"Å‹84hÜÈþ±£ÇˆI²¤É“(Sª\©ÒË—0cÊœI³¦M”.oêÜɳ§Ï”‚þJ´¨Ñ’As]Ê´éˤBJêªRªX³þ¼ªµ«×š\¿Š ”¬Ù³HѪ5v­[ªmßÊew®]¢uïêå™w¯_°÷ì+¸pKÈgNÌÀâƈC.,yràÊ–ýbάw3g»ž?Ë -Ú-éÒjO£>«z5ÙÖ®ÅÂF ²¶íÛ¸5bÜÏ"ïß+|nB8ñã!Œ#_ÎA¹¦g*Ö½ƒ¦„̸|Å¢/cõ‹õ ¡ª©i7ÂKžó‡Òe÷U­çƨ¥ïÖíN3yiâá÷þzþŽaÞLW)òHÌ}ù‡€NÏ"ëðgJƒ;ÀW5 --Æv÷™ç‰‡¨d¡à ¼Ì—a-â×!}*ö^9úÅA^}\ÑGz%²±M{"2ç#@#þ($¹[‘F^„d’-ÉäCN>¹P”R”Û•Xfyg³ÅÖU—^b•T˜‚I¦fP¹—UjjÖæ_`¾I—œkÒÙ™wʼn'^{Î¥gŸ>ý (_ƒšVèZ‚jS¢ŠÒÄh£2= --)L’NÊR¥––éW˜nzR§ž¦ªV Ž*R©¦¢:ªª¡²z”–°Æ*+UJIe­ÝŠ«?ºîªO¯¾ö¤Ù #?x°þG,^XT¬ƒÐaÇN´ÜlA¤‚á™##§PWˆßΨ¸Ü¦¢ãèº7.;ê‘ë%ÚÈ"èÈ*öbrJ¾û‰· ½À‹!¿Æ»#¸0Xn´ôJˆà³Ï‹á…ÙüI²éXà†ªs¯ÇìŸÂÃPŒ"Ç£Œ-ü‚0…D¬Š¼'r|r¿'lMŠ9~(qˆÍa £%0ö|³ºçp£Òåbœ,ºÛ"ÝpÆŠ`ì‚ÁŽp5‰Y4,CÝáºu×.’ÍÜØfWøuÚ¡ÍvF³Æ-w¬\šš•«™šiwUQíMWš~/ÅfàsÞÞy~¸â…3nâ–B>©äþRÞ¨åŠb~¨æ…r>¨ç€‚Þ§è{’Ž§év¢N§êr²þ¦ëm®¦ìgÒN¦í)™¢ûî¼÷îûïÀ/üðÄÿ»ãF=|QÊ/?TóÎû}ôèµ/{Ìß÷˜@õ5 --ô^Áø=p€ --<ßýÈÁüÙï€T_ü¸Áûa€,Ta ¨ÁŽÐ„$ìKP(Âò0‡b qÈC"Þ°{ø3b m¸’$B‰ --|à£Ø? --–O‚O,â§8¿$rÑŠœŸ‡C%Òo…PüágèÃ0:°† ”à½øE2ºÐŽPd¢×8Ç2"‰áƒ¡¨Ä†VD¤ --}HHVð…XäcËèDêIO–d&3ù r&žüä7)ÊÜ‘²”à;%*h¼Vºò•°Œ¥,M‘; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,77 +1,72 @@ -- -+ - --odbc::CallableStatement class Reference -+libodbc++: odbc::CallableStatement Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::CallableStatement Class Reference

    A prepared statement suited for stored procedure calls. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::CallableStatement Class Reference

    A prepared statement suited for stored procedure calls. - More... -

    - #include <callablestatement.h> -

    -

    Inheritance diagram for odbc::CallableStatement: --

    -+

    - - odbc::PreparedStatement - odbc::Statement - odbc::ErrorHandler - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    - -+
    Returns true if the last fetched parameter was NULL.
    -

    Detailed Description

    --A prepared statement suited for stored procedure calls. -+A prepared statement suited for stored procedure calls. -

    --A CallableStatement extends the functionality of a PreparedStatement, by allowing output parameters. --

    --The ODBC escapes for calling stored procedures and functions should be used. A procedure call is prepared like this: 

    -- CallableStatement* cstmt=con->prepareCall
-+A CallableStatement extends the functionality of a PreparedStatement, by allowing output parameters.
    
-+The ODBC escapes for calling stored procedures and functions should be used. A procedure call is prepared like this: 
    -+ CallableStatement* cstmt=con->prepareCall
-      ("{call my_procedure(?,?,?)}");
-- 
    
--
    
-+

    - And for a function call (a procedure that returns a value), the following syntax should be used: 

    -- CallableStatement* cstmt=con->prepareCall
-+ CallableStatement* cstmt=con->prepareCall
-      ("{?=call my_function(?,?)}"); 
--
    --

    --All parameters in a CallableStatement are treated as input/output parameters, unless they are registered as output-only parameters with registerOutParameter(). Note that output-only parameters must be registered with their proper SQL type prior to executing a CallableStatement. -+

    -+All parameters in a CallableStatement are treated as input/output parameters, unless they are registered as output-only parameters with registerOutParameter(). Note that output-only parameters must be registered with their proper SQL type prior to executing a CallableStatement. -

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -84,31 +79,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::CallableStatement::getBoolean bool odbc::CallableStatement::getBoolean ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a bool. -+Fetches a parameter as a bool. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -121,31 +114,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    signed char odbc::CallableStatement::getByte signed char odbc::CallableStatement::getByte ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a signed char. -+Fetches a parameter as a signed char. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -158,31 +149,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Bytes odbc::CallableStatement::getBytes Bytes odbc::CallableStatement::getBytes ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a Bytes object. -+Fetches a parameter as a Bytes object. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -195,31 +184,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Date odbc::CallableStatement::getDate Date odbc::CallableStatement::getDate ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a Date. -+Fetches a parameter as a Date. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -232,31 +219,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    double odbc::CallableStatement::getDouble double odbc::CallableStatement::getDouble ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a double. -+Fetches a parameter as a double. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -269,31 +254,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    float odbc::CallableStatement::getFloat float odbc::CallableStatement::getFloat ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a float. -+Fetches a parameter as a float. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -306,31 +289,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::CallableStatement::getInt int odbc::CallableStatement::getInt ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as an int. -+Fetches a parameter as an int. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -343,31 +324,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Long odbc::CallableStatement::getLong Long odbc::CallableStatement::getLong ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a Long. -+Fetches a parameter as a Long. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -380,31 +359,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    short odbc::CallableStatement::getShort short odbc::CallableStatement::getShort ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a short. -+Fetches a parameter as a short. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -417,31 +394,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::CallableStatement::getString std::string odbc::CallableStatement::getString ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a string. -+Fetches a parameter as a string. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -454,31 +429,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Time odbc::CallableStatement::getTime Time odbc::CallableStatement::getTime ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a Time. -+Fetches a parameter as a Time. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -491,31 +464,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Timestamp odbc::CallableStatement::getTimestamp Timestamp odbc::CallableStatement::getTimestamp ( int   idx )  idx  ) 
    -
    - -

    --Fetches a parameter as a Timestamp. -+Fetches a parameter as a Timestamp. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -528,46 +499,44 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    void odbc::CallableStatement::registerInParameter void odbc::CallableStatement::registerInParameter ( int   idx )  idx  ) 
    -
    - -

    --Registers an input only parameter. -+Registers an input only parameter. -

    --

    --Parameters:
    -- -- --
    idx  --The parameter index, starting at 1
    --
    -+ -+
    idx The parameter index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -580,46 +549,41 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::CallableStatement::registerOutParameter void odbc::CallableStatement::registerOutParameter ( int   idx, idx,
    int   sqlType, sqlType,
    int   scale scale
    ) 
    -
    - -

    --Registers an output parameter with a given scale. -+Registers an output parameter with a given scale. -

    --

    --Parameters:
    -- -- -- -- --
    idx  --The parameter index, starting at 1
    sqlType  --The SQL type of the parameter
    scale  --The scale of the parameter.
    --
    --See also:
    --Types
    -+ -+ -+ -+
    idx The parameter index, starting at 1
    sqlType The SQL type of the parameter
    scale The scale of the parameter.
    -+ -+

    See also:
    Types
    -+ - - --

    -- -+

    -+

    - -- - -@@ -632,23 +596,20 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::CallableStatement::registerOutParameter void odbc::CallableStatement::registerOutParameter ( int   idx, idx,
    int   sqlType sqlType
    ) 
    -
    - -

    --Registers an output parameter. -+Registers an output parameter. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    sqlType  --The SQL type of the parameter
    --
    --See also:
    --Types
    -+ -+ -+
    idx The parameter index, starting at 1
    sqlType The SQL type of the parameter
    -+ -+

    See also:
    Types
    -+ - - -
    The documentation for this class was generated from the following file: -+
  • odbc++/callablestatement.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,76 +1,75 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::CallableStatement Member List

    This is the complete list of members for odbc::CallableStatement, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::CallableStatement Member List

    This is the complete list of members for odbc::CallableStatement, including all inherited members.

    cancel()odbc::Statement
    clearParameters()odbc::PreparedStatement
    clearWarnings()odbc::ErrorHandler
    close()odbc::Statement
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    execute()odbc::PreparedStatement
    odbc::Statement::execute(const std::string &sql)odbc::Statement [virtual]
    executeQuery()odbc::PreparedStatement
    odbc::Statement::executeQuery(const std::string &sql)odbc::Statement [virtual]
    executeUpdate()odbc::PreparedStatement
    odbc::Statement::executeUpdate(const std::string &sql)odbc::Statement [virtual]
    getBoolean(int idx)odbc::CallableStatement
    getByte(int idx)odbc::CallableStatement
    getBytes(int idx)odbc::CallableStatement
    getConnection()odbc::Statement
    getDate(int idx)odbc::CallableStatement
    getDouble(int idx)odbc::CallableStatement
    getEscapeProcessing()odbc::Statement
    getFetchSize()odbc::Statement
    getFloat(int idx)odbc::CallableStatement
    getInt(int idx)odbc::CallableStatement
    getLong(int idx)odbc::CallableStatement
    getMaxFieldSize()odbc::Statement
    getMaxRows()odbc::Statement
    getMoreResults()odbc::Statement
    getQueryTimeout()odbc::Statement
    getResultSet()odbc::Statement
    getResultSetConcurrency()odbc::Statement
    getResultSetType()odbc::Statement
    getShort(int idx)odbc::CallableStatement
    getString(int idx)odbc::CallableStatement
    getTime(int idx)odbc::CallableStatement
    getTimestamp(int idx)odbc::CallableStatement
    getUpdateCount()odbc::Statement
    getWarnings()odbc::ErrorHandler
    registerInParameter(int idx)odbc::CallableStatement
    registerOutParameter(int idx, int sqlType)odbc::CallableStatement
    registerOutParameter(int idx, int sqlType, int scale)odbc::CallableStatement
    setAsciiStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBinaryStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBoolean(int idx, bool val)odbc::PreparedStatement
    setByte(int idx, signed char val)odbc::PreparedStatement
    setBytes(int idx, const Bytes &val)odbc::PreparedStatement
    setCursorName(const std::string &name)odbc::Statement
    setDate(int idx, const Date &val)odbc::PreparedStatement
    setDouble(int idx, double val)odbc::PreparedStatement
    setEscapeProcessing(bool on)odbc::Statement
    setFetchSize(int size)odbc::Statement
    setFloat(int idx, float val)odbc::PreparedStatement
    setInt(int idx, int val)odbc::PreparedStatement
    setLong(int idx, Long val)odbc::PreparedStatement
    setMaxFieldSize(int maxFieldSize)odbc::Statement
    setMaxRows(int maxRows)odbc::Statement
    setNull(int idx, int sqlType)odbc::PreparedStatement
    setQueryTimeout(int seconds)odbc::Statement
    setShort(int idx, short val)odbc::PreparedStatement
    setString(int idx, const std::string &val)odbc::PreparedStatement
    setTime(int idx, const Time &val)odbc::PreparedStatement
    setTimestamp(int idx, const Timestamp &val)odbc::PreparedStatement
    wasNull()odbc::CallableStatement
    ~CallableStatement()odbc::CallableStatement [virtual]
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~PreparedStatement()odbc::PreparedStatement [virtual]
    ~Statement()odbc::Statement [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    cancel()odbc::Statement
    clearParameters()odbc::PreparedStatement
    clearWarnings()odbc::ErrorHandler
    close()odbc::Statement
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    execute()odbc::PreparedStatement
    odbc::Statement::execute(const std::string &sql)odbc::Statement [virtual]
    executeQuery()odbc::PreparedStatement
    odbc::Statement::executeQuery(const std::string &sql)odbc::Statement [virtual]
    executeUpdate()odbc::PreparedStatement
    odbc::Statement::executeUpdate(const std::string &sql)odbc::Statement [virtual]
    getBoolean(int idx)odbc::CallableStatement
    getByte(int idx)odbc::CallableStatement
    getBytes(int idx)odbc::CallableStatement
    getConnection()odbc::Statement
    getDate(int idx)odbc::CallableStatement
    getDouble(int idx)odbc::CallableStatement
    getEscapeProcessing()odbc::Statement
    getFetchSize()odbc::Statement
    getFloat(int idx)odbc::CallableStatement
    getInt(int idx)odbc::CallableStatement
    getLong(int idx)odbc::CallableStatement
    getMaxFieldSize()odbc::Statement
    getMaxRows()odbc::Statement
    getMoreResults()odbc::Statement
    getQueryTimeout()odbc::Statement
    getResultSet()odbc::Statement
    getResultSetConcurrency()odbc::Statement
    getResultSetType()odbc::Statement
    getShort(int idx)odbc::CallableStatement
    getString(int idx)odbc::CallableStatement
    getTime(int idx)odbc::CallableStatement
    getTimestamp(int idx)odbc::CallableStatement
    getUpdateCount()odbc::Statement
    getWarnings()odbc::ErrorHandler
    registerInParameter(int idx)odbc::CallableStatement
    registerOutParameter(int idx, int sqlType)odbc::CallableStatement
    registerOutParameter(int idx, int sqlType, int scale)odbc::CallableStatement
    setAsciiStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBinaryStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBoolean(int idx, bool val)odbc::PreparedStatement
    setByte(int idx, signed char val)odbc::PreparedStatement
    setBytes(int idx, const Bytes &val)odbc::PreparedStatement
    setCursorName(const std::string &name)odbc::Statement
    setDate(int idx, const Date &val)odbc::PreparedStatement
    setDouble(int idx, double val)odbc::PreparedStatement
    setEscapeProcessing(bool on)odbc::Statement
    setFetchSize(int size)odbc::Statement
    setFloat(int idx, float val)odbc::PreparedStatement
    setInt(int idx, int val)odbc::PreparedStatement
    setLong(int idx, Long val)odbc::PreparedStatement
    setMaxFieldSize(int maxFieldSize)odbc::Statement
    setMaxRows(int maxRows)odbc::Statement
    setNull(int idx, int sqlType)odbc::PreparedStatement
    setQueryTimeout(int seconds)odbc::Statement
    setShort(int idx, short val)odbc::PreparedStatement
    setString(int idx, const std::string &val)odbc::PreparedStatement
    setTime(int idx, const Time &val)odbc::PreparedStatement
    setTimestamp(int idx, const Timestamp &val)odbc::PreparedStatement
    wasNull()odbc::CallableStatement
    ~CallableStatement()odbc::CallableStatement [virtual]
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~PreparedStatement()odbc::PreparedStatement [virtual]
    ~Statement()odbc::Statement [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_callable_statement.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_callable_statement.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,3 @@ -+‰PNG -+ -+ IHDR™ÀåóܶPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfâIDATxœíšQ’Û †á¥ÏH7'è´Ú§ÜÿE`lã˜8ÌÆÙ11‚²cóÜ߉å·ûç£M£!Õ¯€…ä¯Óo¶¶¼HKž"Qª Ò¸A,$´d‘©Yz!Ð’9ÍÈŸˆ<µÎžFó@¹Fµ ÅÒ+‘o”;K% ¼o(íò]b™N>Ã4YéBÓ•.4ì®|‹'´ºo'4:[é:¦<¢ì›XÊJIcRbzH{·Íhg´¹OÀ±ò5Øï´_ûÒ¯ÛÒîS£ÍhF3šÑŒö´Ì}¼ó{ïO§µò€{wŠnhTî.Ñz¢¤c´^ˆÏߪ‰œÓv¢+‹bA‹&2Hk…ÑWtñEsÙØ_£É¨þA±Ô×hÔ¸%kÎõ8m#Š`³o¯­t'ŠÈï YÁ¬’¨â@Lß)F3ÚmîpîÓù4ÓC.–©0£ÍhF3šÑŒö´¹oƒw~ïý´u^H¿»œÈõ”»=êÒ1­£ud–3ó1­# ç…äTÉá+è‘Š>ÂÍ2åNi½¼–AªìQn$W¤¤tÈY\Ø\}ëå…DM‰ •BšÂ*=Pž:>¤éÆdÙC7>ßÄ"pJ…Ò†hUöÀöfq+Öt™­“Òì–}kiý•îóB”Vcšu-Ž)/›¨QTÕ*Ï{þ¿°Ï9zVþgÚkÅhWisŸ€sŸÎ ™r±L…ÍhF3šÑŒf´o¤ÁÄ\˜¸£½Oó-@í^-Nm¾„mëƒJóyÀ†J§§4Ÿ<Ô‘«¥7;âÙæ=÷S¿Ò-¹¸Àsq uT©¼Km2š/AæË_ƒ^-‰Z»¤>h—°¢éÀ²ŸyíÞµãWÿ–YWÞÒ@}… -+ - --odbc::Connection class Reference -+libodbc++: odbc::Connection Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Connection Class Reference

    A database connection. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Connection Class Reference

    A database connection. - More... -

    - #include <connection.h> -

    -

    Inheritance diagram for odbc::Connection: --

    -+

    - - odbc::ErrorHandler - - List of all members.

    Public Types

    - --

    Public Methods

    -+
    Transaction isolation constants. More...
    -+

    Public Member Functions

    - -+
    Translate a given SQL string into this data sources' own SQL grammar.
    -

    Detailed Description

    --A database connection. -+A database connection. -

    -

    Member Enumeration Documentation

    --

    -- -+

    -+

    - -- - -@@ -92,40 +92,38 @@ - - -
    -+ - - -- -+ -
    enum odbc::Connection::TransactionIsolation -+ enum odbc::Connection::TransactionIsolation
    -
    - -

    --Transaction isolation constants. -+Transaction isolation constants. -

    --

    --Enumeration values:
    -+
    Enumeration values:
    - -- -- -- -- -- -+ -+ -+ -+ -+ -
    TRANSACTION_NONE  --The data source does not support transactions.
    TRANSACTION_READ_UNCOMMITTED  --Dirty reads, non-repeatable reads and phantom reads can occur.
    TRANSACTION_READ_COMMITTED  --Non-repeatable and phantom reads can occur.
    TRANSACTION_REPEATABLE_READ  --Phantom reads can occur.
    TRANSACTION_SERIALIZABLE  --Simply no problems.
    TRANSACTION_NONE  -+The data source does not support transactions.
    TRANSACTION_READ_UNCOMMITTED  -+Dirty reads, non-repeatable reads and phantom reads can occur.
    TRANSACTION_READ_COMMITTED  -+Non-repeatable and phantom reads can occur.
    TRANSACTION_REPEATABLE_READ  -+Phantom reads can occur.
    TRANSACTION_SERIALIZABLE  -+Simply no problems.
    -
    -
    -

    Constructor & Destructor Documentation

    --

    -- -+

    -+

    - -- - -@@ -138,35 +136,34 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    virtual odbc::Connection::~Connection virtual odbc::Connection::~Connection (   )   )  [virtual]
    -
    - -

    --Destructor. -+Destructor. -

    - Closes the connection

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -179,32 +176,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    Statement* odbc::Connection::createStatement Statement* odbc::Connection::createStatement ( int   resultSetType, resultSetType,
    int   resultSetConcurrency resultSetConcurrency
    ) 
    -
    - -

    --Creates a non-prepared statement. -+Creates a non-prepared statement. -

    --

    --Parameters:
    -- -- -- --
    resultSetType  --The type for ResultSets created by this statement
    resultSetConcurrency  --The concurrency for ResultSets created by this statement
    --
    -+ -+ -+
    resultSetType The type for ResultSets created by this statement
    resultSetConcurrency The concurrency for ResultSets created by this statement
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -217,40 +211,39 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    DatabaseMetaData* odbc::Connection::getMetaData DatabaseMetaData* odbc::Connection::getMetaData (   )   ) 
    -
    - -

    --Returns meta information for this connection. -+Returns meta information for this connection. -

    - Note that the returned object is 'owned' by this connection and should in no way be deleted by the caller.

    --

    -- -+

    -+

    - -- - -@@ -263,35 +256,31 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    CallableStatement* odbc::Connection::prepareCall CallableStatement* odbc::Connection::prepareCall ( const std::string &   sql, sql,
    int   resultSetType, resultSetType,
    int   resultSetConcurrency resultSetConcurrency
    ) 
    -
    - -

    --Create a callable prepared statement. -+Create a callable prepared statement. -

    --

    --Parameters:
    -- -- -- -- --
    sql  --The string to prepare, optionally containing parameter markers for input and/or output parameters
    resultSetType  --The type for ResultSets created by this statement
    resultSetConcurrency  --The concurrency for ResultSets created by this statement
    --
    -+ -+ -+ -+
    sql The string to prepare, optionally containing parameter markers for input and/or output parameters
    resultSetType The type for ResultSets created by this statement
    resultSetConcurrency The concurrency for ResultSets created by this statement
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -304,46 +293,44 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    CallableStatement* odbc::Connection::prepareCall CallableStatement* odbc::Connection::prepareCall ( const std::string &   sql )  sql  ) 
    -
    - -

    --Create a callable prepared statement. -+Create a callable prepared statement. -

    --

    --Parameters:
    -- -- --
    sql  --The string to prepare, optionally containing parameter markers for input and/or output parameters
    --
    -+ -+
    sql The string to prepare, optionally containing parameter markers for input and/or output parameters
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -356,35 +343,31 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    PreparedStatement* odbc::Connection::prepareStatement PreparedStatement* odbc::Connection::prepareStatement ( const std::string &   sql, sql,
    int   resultSetType, resultSetType,
    int   resultSetConcurrency resultSetConcurrency
    ) 
    -
    - -

    --Create a prepared statement. -+Create a prepared statement. -

    --

    --Parameters:
    -- -- -- -- --
    sql  --The string to prepare, optionally containing parameter markers.
    resultSetType  --The type for ResultSets created by this statement
    resultSetConcurrency  --The concurrency for ResultSets created by this statement
    --
    -+ -+ -+ -+
    sql The string to prepare, optionally containing parameter markers.
    resultSetType The type for ResultSets created by this statement
    resultSetConcurrency The concurrency for ResultSets created by this statement
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -397,31 +380,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    PreparedStatement* odbc::Connection::prepareStatement PreparedStatement* odbc::Connection::prepareStatement ( const std::string &   sql )  sql  ) 
    -
    - -

    --Create a prepared statement. -+Create a prepared statement. -

    --

    --Parameters:
    -- -- --
    sql  --The string to prepare, optionally containing parameter markers (?).
    --
    -+ -+
    sql The string to prepare, optionally containing parameter markers (?).
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -434,19 +415,18 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    void odbc::Connection::setAutoCommit void odbc::Connection::setAutoCommit ( bool   autoCommit )  autoCommit  ) 
    -
    - -

    --Sets the autocommit state of this connection. -+Sets the autocommit state of this connection. -

    --

    --Parameters:
    -- -- --
    autoCommit  --true for on, false for off
    --
    -+ -+
    autoCommit true for on, false for off
    -+ -+ - - -

    The documentation for this class was generated from the following file: -+
  • odbc++/connection.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_connection-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_connection-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_connection-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_connection-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,45 +1,44 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Connection Member List

    This is the complete list of members for odbc::Connection, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Connection Member List

    This is the complete list of members for odbc::Connection, including all inherited members.

    clearWarnings()odbc::ErrorHandler
    commit()odbc::Connection
    createStatement()odbc::Connection
    createStatement(int resultSetType, int resultSetConcurrency)odbc::Connection
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    getAutoCommit()odbc::Connection
    getCatalog()odbc::Connection
    getMetaData()odbc::Connection
    getTrace()odbc::Connection
    getTraceFile()odbc::Connection
    getTransactionIsolation()odbc::Connection
    getWarnings()odbc::ErrorHandler
    isReadOnly()odbc::Connection
    nativeSQL(const std::string &sql)odbc::Connection
    prepareCall(const std::string &sql)odbc::Connection
    prepareCall(const std::string &sql, int resultSetType, int resultSetConcurrency)odbc::Connection
    prepareStatement(const std::string &sql)odbc::Connection
    prepareStatement(const std::string &sql, int resultSetType, int resultSetConcurrency)odbc::Connection
    rollback()odbc::Connection
    setAutoCommit(bool autoCommit)odbc::Connection
    setCatalog(const std::string &catalog)odbc::Connection
    setReadOnly(bool readOnly)odbc::Connection
    setTrace(bool on)odbc::Connection
    setTraceFile(const std::string &s)odbc::Connection
    setTransactionIsolation(TransactionIsolation isolation)odbc::Connection
    TRANSACTION_NONE enum valueodbc::Connection
    TRANSACTION_READ_COMMITTED enum valueodbc::Connection
    TRANSACTION_READ_UNCOMMITTED enum valueodbc::Connection
    TRANSACTION_REPEATABLE_READ enum valueodbc::Connection
    TRANSACTION_SERIALIZABLE enum valueodbc::Connection
    TransactionIsolation enum nameodbc::Connection
    ~Connection()odbc::Connection [virtual]
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    clearWarnings()odbc::ErrorHandler
    commit()odbc::Connection
    createStatement()odbc::Connection
    createStatement(int resultSetType, int resultSetConcurrency)odbc::Connection
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    getAutoCommit()odbc::Connection
    getCatalog()odbc::Connection
    getMetaData()odbc::Connection
    getTrace()odbc::Connection
    getTraceFile()odbc::Connection
    getTransactionIsolation()odbc::Connection
    getWarnings()odbc::ErrorHandler
    isReadOnly()odbc::Connection
    nativeSQL(const std::string &sql)odbc::Connection
    prepareCall(const std::string &sql)odbc::Connection
    prepareCall(const std::string &sql, int resultSetType, int resultSetConcurrency)odbc::Connection
    prepareStatement(const std::string &sql)odbc::Connection
    prepareStatement(const std::string &sql, int resultSetType, int resultSetConcurrency)odbc::Connection
    rollback()odbc::Connection
    setAutoCommit(bool autoCommit)odbc::Connection
    setCatalog(const std::string &catalog)odbc::Connection
    setReadOnly(bool readOnly)odbc::Connection
    setTrace(bool on)odbc::Connection
    setTraceFile(const std::string &s)odbc::Connection
    setTransactionIsolation(TransactionIsolation isolation)odbc::Connection
    TRANSACTION_NONE enum valueodbc::Connection
    TRANSACTION_READ_COMMITTED enum valueodbc::Connection
    TRANSACTION_READ_UNCOMMITTED enum valueodbc::Connection
    TRANSACTION_REPEATABLE_READ enum valueodbc::Connection
    TRANSACTION_SERIALIZABLE enum valueodbc::Connection
    TransactionIsolation enum nameodbc::Connection
    ~Connection()odbc::Connection [virtual]
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_connection.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_connection.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_connection.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_connection.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,3 @@ -+‰PNG -+ -+ IHDRyPÏwÇ„PLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØf6IDATxœí”QrÄ †å¥Ï àöBû”û¡j¢M6ÝuÚtgÄLŒðˆ$“ð9`ïáCž·I qõ2"mDl׎î€n·8¡u'&bÖ +a£5bu›Š(ÓºÔŒi¥Ôž]ÕIhwñ±• li!Ÿê¹Éü6ÑK.émÒVùJ{å+íÉ¡©Ù[:ºžû„æ¾ò¶çIQÎm‘R9{KÏåß|©“þ3zì|ßn'ñ_¤ß–ëèe¹]F_ÙóIOzÒ“žôËÐ8`1ÄÊ&­Ûâž~FCØ«*öKw€î„J§)V]z¡¢Ç#¨ÜÑÐ1…:t‚t‹¶?˜Ç–kÀßé,ª5VO ¬y¢õ« £õñ.]Ï{ÞWGtÛóTæG{ÏCîyO?g“~=zèü˜åc×¼SŽIEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_database_meta_data.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_database_meta_data.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_database_meta_data.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_database_meta_data.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,12 +1,11 @@ -- -+ - --odbc::DatabaseMetaData class Reference -+libodbc++: odbc::DatabaseMetaData Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DatabaseMetaData Class Reference

    Provides several tons of information about a data source. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DatabaseMetaData Class Reference

    Provides several tons of information about a data source. - More... -

    - #include <databasemetadata.h> -@@ -14,283 +13,283 @@ - List of all members.

    Public Types

    - --

    Public Methods

    -+
    Searchability constants. More...
  • enum -+
    Imported key UPDATE_RULE and DELETE_RULE constants. More...
  • enum -+
    Index type constants.
  • enum -+
    Procedure column type constants for getProcedureColumns(). More...
  • enum -+
    Procedure column nullability constants for getProcedureColumns(). More...
  • enum -+
    Procedure type constants for PROCEDURE_TYPE in getProcedures(). More...
    -+

    Public Member Functions

    -
      --
    • -+
    • - Connection * getConnection () --
      Returns the Connection this came from.

    • -+
      Returns the Connection this came from.
    • - std::string getDatabaseProductName () --
      Returns the name of the database product.

    • -+
      Returns the name of the database product.
    • - std::string getDatabaseProductVersion () --
      Returns the version of the database product as a string.

    • -+
      Returns the version of the database product as a string.
    • - std::string getDriverName () --
      Returns the name of the ODBC driver used.

    • -+
      Returns the name of the ODBC driver used.
    • - std::string getDriverVersion () --
      Returns the version of the ODBC driver used.

    • -+
      Returns the version of the ODBC driver used.
    • - int getDriverMajorVersion () --
      Returns the major ODBC version of the driver used.

    • -+
      Returns the major ODBC version of the driver used.
    • - int getDriverMinorVersion () --
      Returns the minor ODBC version of the driver used.

    • std::string getIdentifierQuoteString () --
      Returns the string that can be used to quote identifiers. More...

    • std::string getCatalogTerm () --
      Returns the term for catalog used by the data source. More...

    • -+
      Returns the minor ODBC version of the driver used.
    • std::string getIdentifierQuoteString () -+
      Returns the string that can be used to quote identifiers.
    • std::string getCatalogTerm () -+
      Returns the term for catalog used by the data source.
    • - std::string getSchemaTerm () --
      Returns the term for schema used by the data source, for example "owner" or just "schema".

    • -+
      Returns the term for schema used by the data source, for example "owner" or just "schema".
    • - std::string getTableTerm () --
      Returns the term for table used by the data source.

    • -+
      Returns the term for table used by the data source.
    • - std::string getProcedureTerm () --
      Returns the term the data source uses for a procedure, for example "stored procedure".

    • -+
      Returns the term the data source uses for a procedure, for example "stored procedure".
    • - std::string getUserName () --
      Returns the user name of the connection.

    • std::string getCatalogSeparator () --
      Returns the string used to separate a catalog in a fully qualified identifier. More...

    • bool isCatalogAtStart () --
      Returns true if the catalog is positioned at the beginning of a fully qualified identifier. More...

    • -+
      Returns the user name of the connection.
    • std::string getCatalogSeparator () -+
      Returns the string used to separate a catalog in a fully qualified identifier.
    • bool isCatalogAtStart () -+
      Returns true if the catalog is positioned at the beginning of a fully qualified identifier.
    • - std::string getSQLKeywords () --
      Returns a comma-separated list of all non-ODBC keywords specific to this data source.

    • -+
      Returns a comma-separated list of all non-ODBC keywords specific to this data source.
    • - bool supportsTransactions () --
      Returns true if the data source supports transactions.

    • int getDefaultTransactionIsolation () --
      Returns the default transaction isolation level. More...

    • bool supportsTransactionIsolationLevel (int lev) --
      Returns true if the data source supports the specified transaction isolation level. More...

    • bool supportsDataDefinitionAndDataManipulationTransactions () --
      Checks if the data source supports both DML and DDL in transactions. More...

    • bool supportsDataManipulationTransactionsOnly () --
      Checks if the data source only supports DML in transactions. More...

    • bool dataDefinitionCausesTransactionCommit () --
      Checks if DDL in a transaction will cause the transaction to be committed. More...

    • bool dataDefinitionIgnoredInTransactions () --
      Checks if DDL in a transaction is ignored. More...

    • bool supportsOpenCursorsAcrossCommit () --
      Returns true if the data source and the driver can handle open cursors (eg. More...

    • bool supportsOpenCursorsAcrossRollback () --
      Returns true if the data source and the driver can handle open cursors (eg. More...

    • -+
      Returns true if the data source supports transactions.
    • int getDefaultTransactionIsolation () -+
      Returns the default transaction isolation level.
    • bool supportsTransactionIsolationLevel (int lev) -+
      Returns true if the data source supports the specified transaction isolation level.
    • bool supportsDataDefinitionAndDataManipulationTransactions () -+
      Checks if the data source supports both DML and DDL in transactions.
    • bool supportsDataManipulationTransactionsOnly () -+
      Checks if the data source only supports DML in transactions.
    • bool dataDefinitionCausesTransactionCommit () -+
      Checks if DDL in a transaction will cause the transaction to be committed.
    • bool dataDefinitionIgnoredInTransactions () -+
      Checks if DDL in a transaction is ignored.
    • bool supportsOpenCursorsAcrossCommit () -+
      Returns true if the data source and the driver can handle open cursors (eg.
    • bool supportsOpenCursorsAcrossRollback () -+
      Returns true if the data source and the driver can handle open cursors (eg.
    • - bool supportsOpenStatementsAcrossCommit () --
      Returns true if the data source and the driver can handle open statements across a commit, or false if they are invalidated.

    • -+
      Returns true if the data source and the driver can handle open statements across a commit, or false if they are invalidated.
    • - bool supportsOpenStatementsAcrossRollback () --
      Returns true if the data source and the driver can handle open statements across a rollback, or false if they are invalidated.

    • bool supportsResultSetType (int type) --
      Returns true if the data source supports the given result set type. More...

    • bool supportsResultSetConcurrency (int type, int concurrency) --
      Returns true if the data source supports the given result set concurrency for the given result set type. More...

    • -+
      Returns true if the data source and the driver can handle open statements across a rollback, or false if they are invalidated.
    • bool supportsResultSetType (int type) -+
      Returns true if the data source supports the given result set type.
    • bool supportsResultSetConcurrency (int type, int concurrency) -+
      Returns true if the data source supports the given result set concurrency for the given result set type.
    • - bool supportsCatalogsInDataManipulation () --
      Returns true if catalogs are supported in DML.

    • -+
      Returns true if catalogs are supported in DML.
    • - bool supportsCatalogsInProcedureCalls () --
      Returns true if catalogs are supported in procedure call statements.

    • -+
      Returns true if catalogs are supported in procedure call statements.
    • - bool supportsCatalogsInTableDefinitions () --
      Returns true if catalogs are supported in CREATE/ALTER TABLE statements.

    • -+
      Returns true if catalogs are supported in CREATE/ALTER TABLE statements.
    • - bool supportsCatalogsInIndexDefinitions () --
      Returns true if catalogs are supported in index definitions.

    • -+
      Returns true if catalogs are supported in index definitions.
    • - bool supportsCatalogsInPrivilegeDefinitions () --
      Returns true if catalogs are supported in privilege definition statements.

    • -+
      Returns true if catalogs are supported in privilege definition statements.
    • - bool supportsSchemasInDataManipulation () --
      Returns true if schemas are supported in DML.

    • -+
      Returns true if schemas are supported in DML.
    • - bool supportsSchemasInProcedureCalls () --
      Returns true if schemas are supported in procedure call statements.

    • -+
      Returns true if schemas are supported in procedure call statements.
    • - bool supportsSchemasInTableDefinitions () --
      Returns true if schemas are supported in CREATE/ALTER TABLE statements.

    • -+
      Returns true if schemas are supported in CREATE/ALTER TABLE statements.
    • - bool supportsSchemasInIndexDefinitions () --
      Returns true if schemas are supported in index definitions.

    • -+
      Returns true if schemas are supported in index definitions.
    • - bool supportsSchemasInPrivilegeDefinitions () --
      Returns true if schemas are supported in privilege definition statements.

    • -+
      Returns true if schemas are supported in privilege definition statements.
    • - bool nullPlusNonNullIsNull () --
      Returns true if NULL plus a non-NULL value yields NULL.

    • -+
      Returns true if NULL plus a non-NULL value yields NULL.
    • - bool supportsColumnAliasing () --
      Returns true if the data source supports column aliasing, for example SELECT COLUMN1 [AS] C1 FROM TABLE.

    • -+
      Returns true if the data source supports column aliasing, for example SELECT COLUMN1 [AS] C1 FROM TABLE.
    • - bool supportsConvert () --
      Returns true if the CONVERT function is supported by the data source.

    • -+
      Returns true if the CONVERT function is supported by the data source.
    • - bool supportsConvert (int fromType, int toType) --
      Returns true if CONVERT between fromType and toType is supported.

    • -+
      Returns true if CONVERT between fromType and toType is supported.
    • - bool supportsAlterTableWithDropColumn () --
      Returns true if ALTER TABLE with drop column is supported.

    • -+
      Returns true if ALTER TABLE with drop column is supported.
    • - bool supportsAlterTableWithAddColumn () --
      Returns true if ALTER TABLE with add column is supported.

    • -+
      Returns true if ALTER TABLE with add column is supported.
    • - std::string getExtraNameCharacters () --
      Returns the extra characters beyond A-Z, a-z, 0-9 and _ that can be used in unquoted identifier names.

    • -+
      Returns the extra characters beyond A-Z, a-z, 0-9 and _ that can be used in unquoted identifier names.
    • - std::string getSearchStringEscape () --
      Returns the string that can be used to escape wildcard characters.

    • -+
      Returns the string that can be used to escape wildcard characters.
    • - std::string getTimeDateFunctions () --
      Returns a comma-separated list of all time and date functions supported.

    • -+
      Returns a comma-separated list of all time and date functions supported.
    • - std::string getSystemFunctions () --
      Returns a comma-separated list of all system functions supported.

    • -+
      Returns a comma-separated list of all system functions supported.
    • - std::string getStringFunctions () --
      Returns a comma-separated list of all string functions supported.

    • -+
      Returns a comma-separated list of all string functions supported.
    • - std::string getNumericFunctions () --
      Returns a comma-separated list of all numeric functions supported.

    • -+
      Returns a comma-separated list of all numeric functions supported.
    • - bool supportsLikeEscapeClause () --
      Returns true if the escape character is supported in LIKE clauses.

    • -+
      Returns true if the escape character is supported in LIKE clauses.
    • - bool supportsMultipleResultSets () --
      Returns true if a query can return multiple ResultSets.

    • -+
      Returns true if a query can return multiple ResultSets.
    • - bool supportsMultipleTransactions () --
      Returns true if multiple transactions can be open at once on different connections.

    • -+
      Returns true if multiple transactions can be open at once on different connections.
    • - bool supportsNonNullableColumns () --
      Returns true if columns can be defined as non-nullable.

    • -+
      Returns true if columns can be defined as non-nullable.
    • - bool supportsMinimumSQLGrammar () --
      Returns true if the data source supports ODBC minimum SQL grammar.

    • -+
      Returns true if the data source supports ODBC minimum SQL grammar.
    • - bool supportsCoreSQLGrammar () --
      Returns true if the data source supports the core ODBC SQL grammar.

    • -+
      Returns true if the data source supports the core ODBC SQL grammar.
    • - bool supportsExtendedSQLGrammar () --
      Returns true if the data source supports the ODBC extended SQL grammar.

    • -+
      Returns true if the data source supports the ODBC extended SQL grammar.
    • - bool supportsANSI92EntryLevelSQL () --
      Returns true if the data source supports the ANSI92 entry level SQL grammar.

    • -+
      Returns true if the data source supports the ANSI92 entry level SQL grammar.
    • - bool supportsANSI92IntermediateSQL () --
      Returns true if the data source supports the ANSI92 intermediate level SQL grammar.

    • -+
      Returns true if the data source supports the ANSI92 intermediate level SQL grammar.
    • - bool supportsANSI92FullSQL () --
      Returns true if the data source supports the full ANSI92 SQL grammar.

    • bool supportsPositionedDelete () --
      Checks if the data source supports positioned delete. More...

    • bool supportsPositionedUpdate () --
      Checks if the data source supports positioned update. More...

    • bool supportsSelectForUpdate () --
      Checks if the data source supports. More...

    • -+
      Returns true if the data source supports the full ANSI92 SQL grammar.
    • bool supportsPositionedDelete () -+
      Checks if the data source supports positioned delete.
    • bool supportsPositionedUpdate () -+
      Checks if the data source supports positioned update.
    • bool supportsSelectForUpdate () -+
      Checks if the data source supports.
    • - bool supportsIntegrityEnhancementFacility () --
      Returns true if the data source supports the SQL Integrity Enhancement Facility.

    • -+
      Returns true if the data source supports the SQL Integrity Enhancement Facility.
    • - bool supportsBatchUpdates () --
      Whether the data source supports batch updates.

    • -+
      Whether the data source supports batch updates.
    • - bool supportsSubqueriesInComparisons () --
      Returns true if the data source supports subqueries in comparisons.

    • -+
      Returns true if the data source supports subqueries in comparisons.
    • - bool supportsSubqueriesInExists () --
      Returns true if the data source supports subqueries in "EXISTS" expressions.

    • -+
      Returns true if the data source supports subqueries in "EXISTS" expressions.
    • - bool supportsSubqueriesInIns () --
      Returns true if the data source supports subqueries in "IN" expressions.

    • -+
      Returns true if the data source supports subqueries in "IN" expressions.
    • - bool supportsSubqueriesInQuantifieds () --
      Returns true if the data source supports subqueries in quantified expressions.

    • -+
      Returns true if the data source supports subqueries in quantified expressions.
    • - bool supportsCorrelatedSubqueries () --
      Returns true if the data source supports correlated subqueries.

    • bool ownUpdatesAreVisible (int type) --
      Returns true if updated rows are available with their new values in the ResultSet. More...

    • bool ownDeletesAreVisible (int type) --
      Returns true if deleted rows dissapear from a ResultSet. More...

    • bool ownInsertsAreVisible (int type) --
      Returns true if inserted rows become available in a ResultSet. More...

    • bool othersUpdatesAreVisible (int type) --
      Returns true if rows updated by others are visible with their new values. More...

    • bool othersDeletesAreVisible (int type) --
      Returns true if rows deleted by others disapear from a ResultSet. More...

    • bool othersInsertsAreVisible (int type) --
      Returns true if rows inserted by others become available in a ResultSet. More...

    • bool deletesAreDetected (int type) --
      Returns true if a deleted row can be detected with ResultSet::rowDeleted(). More...

    • bool insertsAreDetected (int type) --
      Returns true if an inserted row can be detected with ResultSet::rowInserted(). More...

    • bool updatesAreDetected (int type) --
      Returns true if ResultSet::rowUpdated can determine whether a row has been updated. More...

    • -+
      Returns true if the data source supports correlated subqueries.
    • bool ownUpdatesAreVisible (int type) -+
      Returns true if updated rows are available with their new values in the ResultSet.
    • bool ownDeletesAreVisible (int type) -+
      Returns true if deleted rows dissapear from a ResultSet.
    • bool ownInsertsAreVisible (int type) -+
      Returns true if inserted rows become available in a ResultSet.
    • bool othersUpdatesAreVisible (int type) -+
      Returns true if rows updated by others are visible with their new values.
    • bool othersDeletesAreVisible (int type) -+
      Returns true if rows deleted by others disapear from a ResultSet.
    • bool othersInsertsAreVisible (int type) -+
      Returns true if rows inserted by others become available in a ResultSet.
    • bool deletesAreDetected (int type) -+
      Returns true if a deleted row can be detected with ResultSet::rowDeleted().
    • bool insertsAreDetected (int type) -+
      Returns true if an inserted row can be detected with ResultSet::rowInserted().
    • bool updatesAreDetected (int type) -+
      Returns true if ResultSet::rowUpdated can determine whether a row has been updated.
    • - int getMaxBinaryLiteralLength () --
      Returns the max number of hex characters allowed in an inline binary literal.

    • -+
      Returns the max number of hex characters allowed in an inline binary literal.
    • - int getMaxCharLiteralLength () --
      Returns the maximum length of an inline character string.

    • -+
      Returns the maximum length of an inline character string.
    • - int getMaxColumnNameLength () --
      Returns the maximum length of a column name.

    • -+
      Returns the maximum length of a column name.
    • - int getMaxColumnsInGroupBy () --
      Returns the maximum number of columns this data source can have in a GROUP BY clause.

    • -+
      Returns the maximum number of columns this data source can have in a GROUP BY clause.
    • - int getMaxColumnsInIndex () --
      Returns the maximum number of columns allowed in an index.

    • -+
      Returns the maximum number of columns allowed in an index.
    • - int getMaxColumnsInOrderBy () --
      Returns the maximum number of columns this data source can have in an ORDER BY clause.

    • -+
      Returns the maximum number of columns this data source can have in an ORDER BY clause.
    • - int getMaxColumnsInSelect () --
      Returns the maximum number of columns this data source can SELECT.

    • -+
      Returns the maximum number of columns this data source can SELECT.
    • - int getMaxColumnsInTable () --
      Returns the maximum number of columns a table can consist of.

    • -+
      Returns the maximum number of columns a table can consist of.
    • - int getMaxCursorNameLength () --
      Returns the maximum length of a cursor name.

    • -+
      Returns the maximum length of a cursor name.
    • - int getMaxIndexLength () --
      Returns the maximum length of an index in bytes.

    • -+
      Returns the maximum length of an index in bytes.
    • - int getMaxSchemaNameLength () --
      Returns the maximum length of a schema name.

    • -+
      Returns the maximum length of a schema name.
    • - int getMaxProcedureNameLength () --
      Returns the maximum length of a procedure name.

    • -+
      Returns the maximum length of a procedure name.
    • - int getMaxCatalogNameLength () --
      Returns the maximum length of a catalog name.

    • -+
      Returns the maximum length of a catalog name.
    • - int getMaxRowSize () --
      Returns the maximum size of a row in bytes.

    • -+
      Returns the maximum size of a row in bytes.
    • - bool doesMaxRowSizeIncludeBlobs () --
      Returns true if the value returned by getMaxRowSize() includes BLOBs.

    • -+
      Returns true if the value returned by getMaxRowSize() includes BLOBs.
    • - int getMaxStatementLength () --
      Returns the maximum length of a statement (query).

    • -+
      Returns the maximum length of a statement (query).
    • - int getMaxTableNameLength () --
      Returns the maximum length of a table name.

    • int getMaxTablesInSelect () --
      Returns the maximum number of tables that can be joined at once. More...

    • -+
      Returns the maximum length of a table name.
    • int getMaxTablesInSelect () -+
      Returns the maximum number of tables that can be joined at once.
    • - int getMaxUserNameLength () --
      Returns the maximum length of a username.

    • -+
      Returns the maximum length of a username.
    • - int getMaxConnections () --
      Returns the maximum number of connections we can have open to this data source.

    • -+
      Returns the maximum number of connections we can have open to this data source.
    • - int getMaxStatements () --
      Returns the maximim number of statements that can be open on this connection.

    • -+
      Returns the maximim number of statements that can be open on this connection.
    • - bool supportsMixedCaseIdentifiers () --
      Returns true if the data source supports case sensitive mixed case identifiers.

    • -+
      Returns true if the data source supports case sensitive mixed case identifiers.
    • - bool supportsMixedCaseQuotedIdentifiers () --
      Returns true if the data source supports case sensitive mixed case quoted identifiers.

    • -+
      Returns true if the data source supports case sensitive mixed case quoted identifiers.
    • - bool supportsStoredProcedures () --
      Returns true if the data source supports some form of stored procedures.

    • -+
      Returns true if the data source supports some form of stored procedures.
    • - bool supportsGroupBy () --
      Returns true if the data source supports the GROUP BY clause.

    • -+
      Returns true if the data source supports the GROUP BY clause.
    • - bool supportsGroupByUnrelated () --
      Returns true if the columns in a GROUP BY clause are independent of the selected ones.

    • -+
      Returns true if the columns in a GROUP BY clause are independent of the selected ones.
    • - bool supportsGroupByBeyondSelect () --
      Returns true if the columns in a GROUP BY don't have to be selected.

    • -+
      Returns true if the columns in a GROUP BY don't have to be selected.
    • - bool supportsUnion () --
      Returns true if the data source supports UNION joins.

    • -+
      Returns true if the data source supports UNION joins.
    • - bool supportsUnionAll () --
      Returns true if the data source supports UNION ALL joins.

    • -+
      Returns true if the data source supports UNION ALL joins.
    • - bool supportsOuterJoins () --
      Returns true if the data source supports some form of outer joins.

    • -+
      Returns true if the data source supports some form of outer joins.
    • - bool supportsFullOuterJoins () --
      Returns true if the data source fully supports outer joins.

    • -+
      Returns true if the data source fully supports outer joins.
    • - bool supportsLimitedOuterJoins () --
      Returns true if the data source only supports certain types of outer joins.

    • -+
      Returns true if the data source only supports certain types of outer joins.
    • - bool usesLocalFilePerTable () --
      Returns true if the data source uses a file for each table.

    • -+
      Returns true if the data source uses a file for each table.
    • - bool usesLocalFiles () --
      Returns true if the data source uses local files.

    • -+
      Returns true if the data source uses local files.
    • - bool nullsAreSortedAtStart () --
      Returns true if NULL values are sorted first, regardless of the sort order.

    • -+
      Returns true if NULL values are sorted first, regardless of the sort order.
    • - bool nullsAreSortedAtEnd () --
      Returns true if NULL values are sorted last, regardless of the sort order.

    • -+
      Returns true if NULL values are sorted last, regardless of the sort order.
    • - bool nullsAreSortedHigh () --
      Returns true if NULL values are sorted high.

    • -+
      Returns true if NULL values are sorted high.
    • - bool nullsAreSortedLow () --
      Returns true if NULL values are sorted low.

    • -+
      Returns true if NULL values are sorted low.
    • - bool allProceduresAreCallable () --
      Returns true if all procedures returned by getProcedures() are callable by the current user.

    • -+
      Returns true if all procedures returned by getProcedures() are callable by the current user.
    • - bool allTablesAreSelectable () --
      Returns true if all tables returned by getTables() are selectable by the current user.

    • -+
      Returns true if all tables returned by getTables() are selectable by the current user.
    • - bool isReadOnly () --
      Returns true if the data source or the current connection is in read-only mode.

    • -+
      Returns true if the data source or the current connection is in read-only mode.
    • - bool storesLowerCaseIdentifiers () --
      Returns true if the data source treats identifiers as case insensitive and stores them in lower case.

    • -+
      Returns true if the data source treats identifiers as case insensitive and stores them in lower case.
    • - bool storesLowerCaseQuotedIdentifiers () --
      Returns true if the data source treats quoted identifiers as case insensitive and stores them in lower case.

    • -+
      Returns true if the data source treats quoted identifiers as case insensitive and stores them in lower case.
    • - bool storesMixedCaseIdentifiers () --
      Returns true if the data source treats identifiers as case insensitive and stores them in mixed case.

    • -+
      Returns true if the data source treats identifiers as case insensitive and stores them in mixed case.
    • - bool storesMixedCaseQuotedIdentifiers () --
      Returns true if the data source treats quoted identifiers as case insensitive and stores them in mixed case.

    • -+
      Returns true if the data source treats quoted identifiers as case insensitive and stores them in mixed case.
    • - bool storesUpperCaseIdentifiers () --
      Returns true if the data source treats identifiers as case insensitive and stores them in upper case.

    • -+
      Returns true if the data source treats identifiers as case insensitive and stores them in upper case.
    • - bool storesUpperCaseQuotedIdentifiers () --
      Returns true if the data source treats quoted identifiers as case insensitive and stores them in upper case.

    • ResultSet * getTypeInfo () --
      Fetches a list of data types supported by this data source. More...

    • ResultSet * getColumns (const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::string &columnNamePattern) --
      Fetches the available columns in a catalog. More...

    • ResultSet * getTables (const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::vector< std::string > &types) --
      Fetches the available tables in the data source. More...

    • ResultSet * getTablePrivileges (const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern) --
      Fetches a list of access rights for tables in a catalog. More...

    • ResultSet * getColumnPrivileges (const std::string &catalog, const std::string &schema, const std::string &table, const std::string &columnNamePattern) --
      Fetches a list of access rights for a table's columns. More...

    • ResultSet * getPrimaryKeys (const std::string &catalog, const std::string &schema, const std::string &table) --
      Fetches a list of primary keys for a table. More...

    • ResultSet * getIndexInfo (const std::string &catalog, const std::string &schema, const std::string &table, bool unique, bool approximate) --
      Fetches a list of indices and statistics for a table. More...

    • ResultSet * getCrossReference (const std::string &primaryCatalog, const std::string &primarySchema, const std::string &primaryTable, const std::string &foreignCatalog, const std::string &foreignSchema, const std::string &foreignTable) --
      Figures out in which way a foreign key table references a primary key table. More...

    • ResultSet * getImportedKeys (const std::string &catalog, const std::string &schema, const std::string &table) --
      Fetches a list of columns that are foreign keys to other tables' primary keys. More...

    • ResultSet * getExportedKeys (const std::string &catalog, const std::string &schema, const std::string &table) --
      Fetches a list of columns that reference a table's primary keys. More...

    • ResultSet * getProcedures (const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern) --
      Returns available procedures in a catalog. More...

    • ResultSet * getProcedureColumns (const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern, const std::string &columnNamePattern) --
      Returns available procedure columns in a catalog. More...

    • ResultSet * getBestRowIdentifier (const std::string &catalog, const std::string &schema, const std::string &table, int scope, bool nullable) --
      Returns the optimal set of columns that identifies a row. More...

    • ResultSet * getVersionColumns (const std::string &catalog, const std::string &schema, const std::string &table) --
      Returns a list of columns for a table that are automatically updated when anything in a row is updated. More...

    • ResultSet * getTableTypes () --
      Fetches the table types the database supports. More...

    • ResultSet * getSchemas () --
      Returns a list of available schemas in the database. More...

    • ResultSet * getCatalogs () --
      Returns a list of available catalogs in the database. More...

    -+
    Returns true if the data source treats quoted identifiers as case insensitive and stores them in upper case.
  • ResultSet * getTypeInfo () -+
    Fetches a list of data types supported by this data source.
  • ResultSet * getColumns (const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::string &columnNamePattern) -+
    Fetches the available columns in a catalog.
  • ResultSet * getTables (const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::vector< std::string > &types) -+
    Fetches the available tables in the data source.
  • ResultSet * getTablePrivileges (const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern) -+
    Fetches a list of access rights for tables in a catalog.
  • ResultSet * getColumnPrivileges (const std::string &catalog, const std::string &schema, const std::string &table, const std::string &columnNamePattern) -+
    Fetches a list of access rights for a table's columns.
  • ResultSet * getPrimaryKeys (const std::string &catalog, const std::string &schema, const std::string &table) -+
    Fetches a list of primary keys for a table.
  • ResultSet * getIndexInfo (const std::string &catalog, const std::string &schema, const std::string &table, bool unique, bool approximate) -+
    Fetches a list of indices and statistics for a table.
  • ResultSet * getCrossReference (const std::string &primaryCatalog, const std::string &primarySchema, const std::string &primaryTable, const std::string &foreignCatalog, const std::string &foreignSchema, const std::string &foreignTable) -+
    Figures out in which way a foreign key table references a primary key table.
  • ResultSet * getImportedKeys (const std::string &catalog, const std::string &schema, const std::string &table) -+
    Fetches a list of columns that are foreign keys to other tables' primary keys.
  • ResultSet * getExportedKeys (const std::string &catalog, const std::string &schema, const std::string &table) -+
    Fetches a list of columns that reference a table's primary keys.
  • ResultSet * getProcedures (const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern) -+
    Returns available procedures in a catalog.
  • ResultSet * getProcedureColumns (const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern, const std::string &columnNamePattern) -+
    Returns available procedure columns in a catalog.
  • ResultSet * getBestRowIdentifier (const std::string &catalog, const std::string &schema, const std::string &table, int scope, bool nullable) -+
    Returns the optimal set of columns that identifies a row.
  • ResultSet * getVersionColumns (const std::string &catalog, const std::string &schema, const std::string &table) -+
    Returns a list of columns for a table that are automatically updated when anything in a row is updated.
  • ResultSet * getTableTypes () -+
    Fetches the table types the database supports.
  • ResultSet * getSchemas () -+
    Returns a list of available schemas in the database.
  • ResultSet * getCatalogs () -+
    Returns a list of available catalogs in the database.
    -

    Detailed Description

    --Provides several tons of information about a data source. -+Provides several tons of information about a data source. -

    --

    --Warning:
    --The column names in ResultSets returned by methods of DatabaseMetaData can differ depending on what ODBC version the current driver supports. To avoid problems, columns should be referenced by number, and not by name. Also note that ODBC version 2 drivers do not return some of the specified columns.
    -+
    Warning:
    The column names in ResultSets returned by methods of DatabaseMetaData can differ depending on what ODBC version the current driver supports. To avoid problems, columns should be referenced by number, and not by name. Also note that ODBC version 2 drivers do not return some of the specified columns.
    -+ -

    -

    Member Enumeration Documentation

    --

    -- -+

    -+

    - -- - -@@ -303,20 +302,20 @@ - -+
    See also:
    getProcedures()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Procedure type constants for PROCEDURE_TYPE in getProcedures(). -+Procedure type constants for PROCEDURE_TYPE in getProcedures(). -

    --

    --See also:
    --getProcedures()
    --

    -- -+

    -+

    - -- - -@@ -329,20 +328,20 @@ - -+
    See also:
    getVersionColumns()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Version column constants for getVersionColumns(). -+Version column constants for getVersionColumns(). -

    --

    --See also:
    --getVersionColumns()
    --

    -- -+

    -+

    - -- - -@@ -355,20 +354,20 @@ - -+
    See also:
    getTypes()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Nullability constants for the resultset returned by getTypes(). -+Nullability constants for the resultset returned by getTypes(). -

    --

    --See also:
    --getTypes()
    --

    -- -+

    -+

    - -- - -@@ -381,20 +380,20 @@ - -+
    See also:
    getColumns()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Nullability constants for the resultset returned by getColumns(). -+Nullability constants for the resultset returned by getColumns(). -

    --

    --See also:
    --getColumns()
    --

    -- -+

    -+

    - -- - -@@ -407,31 +406,31 @@ - - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Searchability constants. -+Searchability constants. -

    --

    --Enumeration values:
    -+
    Enumeration values:
    - -- -- -- -- -+ -+ -+ -+ -
    typePredNone  --Column is unsearchable.
    typePredChar  --Column can only be used in a LIKE clause.
    typePredBasic  --Column can be used in searches, except in LIKE.
    typeSearchable  --Column is searchable.
    typePredNone  -+Column is unsearchable.
    typePredChar  -+Column can only be used in a LIKE clause.
    typePredBasic  -+Column can be used in searches, except in LIKE.
    typeSearchable  -+Column is searchable.
    -
    -
    --

    -- -+

    -+

    - -- - -@@ -444,20 +443,20 @@ - -+
    See also:
    getImportedKeys()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Imported key UPDATE_RULE and DELETE_RULE constants. -+Imported key UPDATE_RULE and DELETE_RULE constants. -

    --

    --See also:
    --getImportedKeys()
    --

    -- -+

    -+

    - -- - -@@ -470,20 +469,20 @@ - -+
    See also:
    getProcedureColumns()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Procedure column type constants for getProcedureColumns(). -+Procedure column type constants for getProcedureColumns(). -

    --

    --See also:
    --getProcedureColumns()
    --

    -- -+

    -+

    - -- - -@@ -496,27 +495,25 @@ - -+
    See also:
    getProcedureColumns()
    -+ - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --Procedure column nullability constants for getProcedureColumns(). -+Procedure column nullability constants for getProcedureColumns(). -

    --

    --See also:
    --getProcedureColumns()
    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -529,26 +526,24 @@ - -+
    Returns:
    true if the data source only supports data manipulation (eg. UPDATE, INSERT) within a transaction and any data definition (eg. CREATE TABLE) will cause the transaction to be committed.
    -+If this method returns true, supportsDataDefinitionAndDataManipulationTransactions(), supportsDataManipulationTransactionsOnly() and dataDefinitionIgnoredInTransactions() all return false. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::dataDefinitionCausesTransactionCommit bool odbc::DatabaseMetaData::dataDefinitionCausesTransactionCommit (   )   ) 
    -
    - -

    --Checks if DDL in a transaction will cause the transaction to be committed. -+Checks if DDL in a transaction will cause the transaction to be committed. -

    --

    --Returns:
    --true if the data source only supports data manipulation (eg. UPDATE, INSERT) within a transaction and any data definition (eg. CREATE TABLE) will cause the transaction to be committed.
    If this method returns true, supportsDataDefinitionAndDataManipulationTransactions(), supportsDataManipulationTransactionsOnly() and dataDefinitionIgnoredInTransactions() all return false.
    --

    -- -+

    -+

    - -- - -@@ -561,27 +556,25 @@ - -+
    Returns:
    true if the data source only supports data manipulation (eg. UPDATE, INSERT) within a transaction and any data definition (eg. CREATE TABLE) will be ignored.
    -+If this method returns true, supportsDataDefinitionAndDataManipulationTransactions(), supportsDataManipulationTransactionsOnly() and dataDefinitionCausesTransactionCommit() all return false. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::dataDefinitionIgnoredInTransactions bool odbc::DatabaseMetaData::dataDefinitionIgnoredInTransactions (   )   ) 
    -
    - -

    --Checks if DDL in a transaction is ignored. -+Checks if DDL in a transaction is ignored. -

    --

    --Returns:
    --true if the data source only supports data manipulation (eg. UPDATE, INSERT) within a transaction and any data definition (eg. CREATE TABLE) will be ignored.
    If this method returns true, supportsDataDefinitionAndDataManipulationTransactions(), supportsDataManipulationTransactionsOnly() and dataDefinitionCausesTransactionCommit() all return false.
    --

    -- -+

    -+

    - -- - -@@ -594,58 +587,56 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::deletesAreDetected bool odbc::DatabaseMetaData::deletesAreDetected ( int   type )  type  ) 
    -
    - -

    --Returns true if a deleted row can be detected with ResultSet::rowDeleted(). -+Returns true if a deleted row can be detected with ResultSet::rowDeleted(). -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -658,44 +649,66 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getBestRowIdentifier ResultSet* odbc::DatabaseMetaData::getBestRowIdentifier ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table, table,
    int   scope, scope,
    bool   nullable nullable
    ) 
    -
    - -

    --Returns the optimal set of columns that identifies a row. -+Returns the optimal set of columns that identifies a row. -

    - The returned ResultSet is ordered by SCOPE and has the following columns:

      --
    1. SCOPE - short - scope of this result:
        --
      • bestRowTemporary - temporary, only while a ResultSet is using the row
      • bestRowTransaction - valid until the current transaction ends
      • bestRowSession - valid through the whole session - until the connection is closed
      --
    2. COLUMN_NAME - string - the column name
    3. DATA_TYPE - short - the type of the column from Types
    4. TYPE_NAME - string - native type name (data source dependent)
    5. COLUMN_SIZE - int - the size (precision) of the column.
    6. BUFFER_LENGTH - int - unused
    7. DECIMAL_DIGITS - short - scale if applicable. Can be NULL.
    8. PSEUDO_COLUMN - short - whether this is a pseudo column:
        --
      • bestRowUnknown - it is unknown whether this is a pseudo column
      • bestRowNotPseudo - it is definitely not a pseudo column
      • bestRowPseudo - it is definitely a pseudo column
      -+
    9. -+SCOPE - short - scope of this result:
        -+
      • -+bestRowTemporary - temporary, only while a ResultSet is using the row
        • -+
      • -+bestRowTransaction - valid until the current transaction ends
        • -+
      • -+bestRowSession - valid through the whole session - until the connection is closed
        • -+
      -+
      10. -+
    10. -+COLUMN_NAME - string - the column name
      11. -+
    11. -+DATA_TYPE - short - the type of the column from Types
      12. -+
    12. -+TYPE_NAME - string - native type name (data source dependent)
      13. -+
    13. -+COLUMN_SIZE - int - the size (precision) of the column.
      14. -+
    14. -+BUFFER_LENGTH - int - unused
      15. -+
    15. -+DECIMAL_DIGITS - short - scale if applicable. Can be NULL.
      16. -+
    16. -+PSEUDO_COLUMN - short - whether this is a pseudo column:
        -+
      • -+bestRowUnknown - it is unknown whether this is a pseudo column
        • -+
      • -+bestRowNotPseudo - it is definitely not a pseudo column
        • -+
      • -+bestRowPseudo - it is definitely a pseudo column
        • -+
      -+
      17. -
    --
    --Parameters:
    -- -- -- -- -- -- --
    catalog  --the catalog name
    schema  --the schema name
    table  --the table name
    scope  --the scope of interest, same values as the SCOPE column.
    nullable  --whether nullable columns should be included
    --
    -+ -+ -+ -+ -+ -+
    catalog the catalog name
    schema the schema name
    table the table name
    scope the scope of interest, same values as the SCOPE column.
    nullable whether nullable columns should be included
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -708,24 +721,23 @@ - -+The returned ResultSet is the same as with getTables(), except that all columns but TABLE_CAT are NULL values. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    ResultSet* odbc::DatabaseMetaData::getCatalogs ResultSet* odbc::DatabaseMetaData::getCatalogs (   )   ) 
    -
    - -

    --Returns a list of available catalogs in the database. -+Returns a list of available catalogs in the database. -

    --The returned ResultSet is the same as with getTables(), except that all columns but TABLE_CAT are NULL values.

    --

    -- -+

    -+

    - -- - -@@ -738,24 +750,23 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    std::string odbc::DatabaseMetaData::getCatalogSeparator std::string odbc::DatabaseMetaData::getCatalogSeparator (   )   ) 
    -
    - -

    --Returns the string used to separate a catalog in a fully qualified identifier. -+Returns the string used to separate a catalog in a fully qualified identifier. -

    - For example Oracle would return a "@", while mysql would say ".".

    --

    -- -+

    -+

    - -- - -@@ -768,46 +779,45 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    std::string odbc::DatabaseMetaData::getCatalogTerm std::string odbc::DatabaseMetaData::getCatalogTerm (   )   ) 
    -
    - -

    --Returns the term for catalog used by the data source. -+Returns the term for catalog used by the data source. -

    - Can be for example "directory" or "database".

    --

    -- -+

    -+

    - -- - -@@ -820,48 +830,63 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getColumnPrivileges ResultSet* odbc::DatabaseMetaData::getColumnPrivileges ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table, table,
    const std::string &   columnNamePattern columnNamePattern
    ) 
    -
    - -

    --Fetches a list of access rights for a table's columns. -+Fetches a list of access rights for a table's columns. -

    - The returned ResultSet is ordered by COLUMN_NAME and PRIVILEGE. It contains the following columns:

      --
    1. TABLE_CAT - string - table catalog (can be NULL)
    2. TABLE_SCHEM - string - table schema (can be NULL)
    3. TABLE_NAME - string - table name
    4. COLUMN_NAME - string - column name
    5. GRANTOR - string - grantor (can be NULL). If GRANTEE owns the object, GRANTOR is "SYSTEM".
    6. GRANTEE - string - grantee
    7. PRIVILEGE - string - one of "SELECT", "INSERT", "UPDATE", "DELETE", "REFERENCES" or a data source specific value
    8. IS_GRANTABLE - string - "YES" if GRANTEE can grant this privilege to other users. "NO" if not. NULL if unknown.
    -+
  • -+TABLE_CAT - string - table catalog (can be NULL)
    • -+
  • -+TABLE_SCHEM - string - table schema (can be NULL)
    • -+
  • -+TABLE_NAME - string - table name
    • -+
  • -+COLUMN_NAME - string - column name
    • -+
  • -+GRANTOR - string - grantor (can be NULL). If GRANTEE owns the object, GRANTOR is "SYSTEM".
    • -+
  • -+GRANTEE - string - grantee
    • -+
  • -+PRIVILEGE - string - one of "SELECT", "INSERT", "UPDATE", "DELETE", "REFERENCES" or a data source specific value
    • -+
  • -+IS_GRANTABLE - string - "YES" if GRANTEE can grant this privilege to other users. "NO" if not. NULL if unknown.
    • -+ -
    --

    -- -+

    -+

    - -- - -@@ -874,62 +899,103 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getColumns ResultSet* odbc::DatabaseMetaData::getColumns ( const std::string &   catalog, catalog,
    const std::string &   schemaPattern, schemaPattern,
    const std::string &   tableNamePattern, tableNamePattern,
    const std::string &   columnNamePattern columnNamePattern
    ) 
    -
    - -

    --Fetches the available columns in a catalog. -+Fetches the available columns in a catalog. -

    - The returned ResultSet has the following columns:

      --
    1. TABLE_CAT - string - table catalog (can be NULL)
    2. TABLE_SCHEM - string - table schema (can be NULL)
    3. TABLE_NAME - string - table name
    4. COLUMN_NAME - string - column name
    5. COLUMN_TYPE - short - see Types
    6. TYPE_NAME - string - the name of the type. Data source dependent.
    7. COLUMN_SIZE - int - column size. For character and date types, this is the maximum number of characters. For numeric types this is the precision.
    8. BUFFER_LENGTH - not used
    9. DECIMAL_DIGITS - int - the number of fractional digits.
    10. NUM_PREC_RADIX - int - radix
    11. NULLABLE - int - whether the column allows NULLs
        --
      • columnNoNulls - might not allow NULLs
      • columnNullable - definitely allows NULLs
      • columnNullableUnknown - nullability is unknown
      --
    12. REMARKS - string - comments on the column (can be NULL)
    13. COLUMN_DEF - string - default value (can be NULL)
    14. SQL_DATA_TYPE - short -
    15. SQL_DATETIME_SUB - short -
    16. CHAR_OCTET_LENGTH - int - for character data types the maximum number of bytes in the column
    17. ORDINAL_POSITION - int - 1-based index in the table
    18. IS_NULLABLE - string - "NO" means in no way nullable, "YES" means possibly nullable. Empty string means nobody knows.
    -+
  • -+TABLE_CAT - string - table catalog (can be NULL)
    • -+
  • -+TABLE_SCHEM - string - table schema (can be NULL)
    • -+
  • -+TABLE_NAME - string - table name
    • -+
  • -+COLUMN_NAME - string - column name
    • -+
  • -+COLUMN_TYPE - short - see Types
    • -+
  • -+TYPE_NAME - string - the name of the type. Data source dependent.
    • -+
  • -+COLUMN_SIZE - int - column size. For character and date types, this is the maximum number of characters. For numeric types this is the precision.
    • -+
  • -+BUFFER_LENGTH - not used
    • -+
  • -+DECIMAL_DIGITS - int - the number of fractional digits.
    • -+
  • -+NUM_PREC_RADIX - int - radix
    • -+
  • -+NULLABLE - int - whether the column allows NULLs
      -+
    • -+columnNoNulls - might not allow NULLs
      • -+
    • -+columnNullable - definitely allows NULLs
      • -+
    • -+columnNullableUnknown - nullability is unknown
      • -+
    -+
    • -+
  • -+REMARKS - string - comments on the column (can be NULL)
    • -+
  • -+COLUMN_DEF - string - default value (can be NULL)
    • -+
  • -+SQL_DATA_TYPE - short -
    • -+
  • -+SQL_DATETIME_SUB - short -
    • -+
  • -+CHAR_OCTET_LENGTH - int - for character data types the maximum number of bytes in the column
    • -+
  • -+ORDINAL_POSITION - int - 1-based index in the table
    • -+
  • -+IS_NULLABLE - string - "NO" means in no way nullable, "YES" means possibly nullable. Empty string means nobody knows.
    • -+ -
    --

    -- -+

    -+

    - -- - -@@ -942,30 +1008,71 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getCrossReference ResultSet* odbc::DatabaseMetaData::getCrossReference ( const std::string &   primaryCatalog, primaryCatalog,
    const std::string &   primarySchema, primarySchema,
    const std::string &   primaryTable, primaryTable,
    const std::string &   foreignCatalog, foreignCatalog,
    const std::string &   foreignSchema, foreignSchema,
    const std::string &   foreignTable foreignTable
    ) 
    -
    - -

    --Figures out in which way a foreign key table references a primary key table. -+Figures out in which way a foreign key table references a primary key table. -

    --Returns it's findings in a ResultSet, ordered by FKTABLE_CAT, FKTABLE_SCHEM, FKTABLE_NAME and KEY_SEQ. The ResultSet contains the following columns:

      --
    1. PKTABLE_CAT - string - primary key table catalog
    2. PKTABLE_SCHEM - string - primary key table schema
    3. PKTABLE_NAME - string - primary key table name
    4. PKCOLUMN_NAME - string - primary key column name
    5. FKTABLE_CAT - string - foreign key table catalog
    6. FKTABLE_SCHEM - string - foreign key table schema
    7. FKTABLE_NAME - string - foreign key table name
    8. FKCOLUMN_NAME - string - foreign key column name
    9. KEY_SEQ - short - column sequence number in key (1-based)
    10. UPDATE_RULE - short - what happens to the foreign key when the primary is updated:
        --
      • importedKeyNoAction - nothing happends since the primary key can not be updated
      • importedKeyCascade - change imported key to match the primary key
      • importedKeySetNull - update the imported key to NULL
      • importedKeySetDefault - update the impored key to it's default value
      • importedKeyRestrict - same as importedKeyNoAction
      --
    11. DELETE_RULE - short - what happens to the foreign key when the primary is deleted:
        --
      • importedKeyNoAction - nothing happends since the primary key can not be deleted
      • importedKeyCascade - imported key is deleted as well
      • importedKeySetNull - imported key is set to NULL
      • importedKeySetDefault - imported key is set to it's default value
      • importedKeyRestrict - same as importedKeyNoAction
      -+Returns it's findings in a ResultSet, ordered by FKTABLE_CAT, FKTABLE_SCHEM, FKTABLE_NAME and KEY_SEQ. The ResultSet contains the following columns:
        -+
      1. -+PKTABLE_CAT - string - primary key table catalog
        2. -+
      2. -+PKTABLE_SCHEM - string - primary key table schema
        3. -+
      3. -+PKTABLE_NAME - string - primary key table name
        4. -+
      4. -+PKCOLUMN_NAME - string - primary key column name
        5. -+
      5. -+FKTABLE_CAT - string - foreign key table catalog
        6. -+
      6. -+FKTABLE_SCHEM - string - foreign key table schema
        7. -+
      7. -+FKTABLE_NAME - string - foreign key table name
        8. -+
      8. -+FKCOLUMN_NAME - string - foreign key column name
        9. -+
      9. -+KEY_SEQ - short - column sequence number in key (1-based)
        10. -+
      10. -+UPDATE_RULE - short - what happens to the foreign key when the primary is updated:
          -+
        • -+importedKeyNoAction - nothing happends since the primary key can not be updated
          • -+
        • -+importedKeyCascade - change imported key to match the primary key
          • -+
        • -+importedKeySetNull - update the imported key to NULL
          • -+
        • -+importedKeySetDefault - update the impored key to it's default value
          • -+
        • -+importedKeyRestrict - same as importedKeyNoAction
          • -+
        -+
        11. -+
      11. -+DELETE_RULE - short - what happens to the foreign key when the primary is deleted:
          -+
        • -+importedKeyNoAction - nothing happends since the primary key can not be deleted
          • -+
        • -+importedKeyCascade - imported key is deleted as well
          • -+
        • -+importedKeySetNull - imported key is set to NULL
          • -+
        • -+importedKeySetDefault - imported key is set to it's default value
          • -+
        • -+importedKeyRestrict - same as importedKeyNoAction
          • -+
        -+
        12. -
      -
    --

    -- -+

    -+

    - -- - -@@ -978,42 +1085,40 @@ - -+
    See also:
    Connection
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    int odbc::DatabaseMetaData::getDefaultTransactionIsolation int odbc::DatabaseMetaData::getDefaultTransactionIsolation (   )   ) 
    -
    - -

    --Returns the default transaction isolation level. -+Returns the default transaction isolation level. -

    --

    --See also:
    --Connection
    --

    -- -+

    -+

    - -- - -@@ -1026,24 +1131,23 @@ - -+The returned ResultSet is identical to the one returned by getCrossReference(). - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getExportedKeys ResultSet* odbc::DatabaseMetaData::getExportedKeys ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table table
    ) 
    -
    - -

    --Fetches a list of columns that reference a table's primary keys. -+Fetches a list of columns that reference a table's primary keys. -

    --The returned ResultSet is identical to the one returned by getCrossReference().

    --

    -- -+

    -+

    - -- - -@@ -1056,40 +1160,39 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    std::string odbc::DatabaseMetaData::getIdentifierQuoteString std::string odbc::DatabaseMetaData::getIdentifierQuoteString (   )   ) 
    -
    - -

    --Returns the string that can be used to quote identifiers. -+Returns the string that can be used to quote identifiers. -

    - If the data source doesn't support it, returns an empty string.

    --

    -- -+

    -+

    - -- - -@@ -1102,52 +1205,51 @@ - -+The returned ResultSet is identical to the one returned by getCrossReference(), except it's ordered by PKTABLE_CAT, PKTABLE_SCHEM, PKTABLE_NAME and KEY_SEQ. - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getImportedKeys ResultSet* odbc::DatabaseMetaData::getImportedKeys ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table table
    ) 
    -
    - -

    --Fetches a list of columns that are foreign keys to other tables' primary keys. -+Fetches a list of columns that are foreign keys to other tables' primary keys. -

    --The returned ResultSet is identical to the one returned by getCrossReference(), except it's ordered by PKTABLE_CAT, PKTABLE_SCHEM, PKTABLE_NAME and KEY_SEQ.

    --

    -- -+

    -+

    - -- - -@@ -1160,42 +1262,70 @@ - -+
  • -+TABLE_CAT - string - table catalog (can be NULL)
    • -+
  • -+TABLE_SCHEM - string - table schema (can be NULL)
    • -+
  • -+TABLE_NAME - string - table name
    • -+
  • -+NON_UNIQUE - bool - true if index values can be non-unique. NULL if TYPE is tableIndexStatistic
    • -+
  • -+INDEX_QUALIFIER - string - index catalog, NULL if TYPE is tableIndexStatistic
    • -+
  • -+INDEX_NAME - string - index name, NULL if TYPE is tableIndexStatistic
    • -+
  • -+TYPE - short - index type:
      -+
    • -+tableIndexStatistic - no real index - a statistic for the table
      • -+
    • -+tableIndexClustered - this index is clustered
      • -+
    • -+tableIndexHashed - this index is hashed
      • -+
    • -+tableIndexOther - this is some other kind of index
      • -+
    -+
    • -+
  • -+ORDINAL_POSITION - short - column sequence number in index (1-based). NULL if TYPE is tableIndexStatistic.
    • -+
  • -+COLUMN_NAME - string - column name. NULL if TYPE is tableIndexStatistic.
    • -+
  • -+ASC_OR_DESC - string - "A" for ascending, "D" for descending index. NULL if TYPE is tableIndexStatistic.
    • -+
  • -+CARDINALITY - int - If TYPE is tableIndexStatistic, the number of rows in the table. Otherwise, the number of unique values in the index.
    • -+
  • -+PAGES - int - Number of pages used for the table if TYPE is tableIndexStatistic. Otherwise the number of pages used for the index.
    • -+
  • -+FILTER_CONDITION - string - filter condition (if any)
    • -+ -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getIndexInfo ResultSet* odbc::DatabaseMetaData::getIndexInfo ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table, table,
    bool   unique, unique,
    bool   approximate approximate
    ) 
    -
    - -

    --Fetches a list of indices and statistics for a table. -+Fetches a list of indices and statistics for a table. -

    - The returned ResultSet is ordered by NON_UNIQUE, TYPE, INDEX_QUALIFIER, INDEX_NAME and ORDINAL_POSITION. It contains the following columns:

      --
    1. TABLE_CAT - string - table catalog (can be NULL)
    2. TABLE_SCHEM - string - table schema (can be NULL)
    3. TABLE_NAME - string - table name
    4. NON_UNIQUE - bool - true if index values can be non-unique. NULL if TYPE is tableIndexStatistic
    5. INDEX_QUALIFIER - string - index catalog, NULL if TYPE is tableIndexStatistic
    6. INDEX_NAME - string - index name, NULL if TYPE is tableIndexStatistic
    7. TYPE - short - index type:
        --
      • tableIndexStatistic - no real index - a statistic for the table
      • tableIndexClustered - this index is clustered
      • tableIndexHashed - this index is hashed
      • tableIndexOther - this is some other kind of index
      --
    8. ORDINAL_POSITION - short - column sequence number in index (1-based). NULL if TYPE is tableIndexStatistic.
    9. COLUMN_NAME - string - column name. NULL if TYPE is tableIndexStatistic.
    10. ASC_OR_DESC - string - "A" for ascending, "D" for descending index. NULL if TYPE is tableIndexStatistic.
    11. CARDINALITY - int - If TYPE is tableIndexStatistic, the number of rows in the table. Otherwise, the number of unique values in the index.
    12. PAGES - int - Number of pages used for the table if TYPE is tableIndexStatistic. Otherwise the number of pages used for the index.
    13. FILTER_CONDITION - string - filter condition (if any)
    --
    --Parameters:
    -- -- -- -- -- -- --
    catalog  --the catalog name
    schema  --the schema name
    table  --the table name
    unique  --whether only unique indices should be looked at
    approximate  --whether only accurate values should be retrieved
    --
    -+ -+ -+ -+ -+ -+
    catalog the catalog name
    schema the schema name
    table the table name
    unique whether only unique indices should be looked at
    approximate whether only accurate values should be retrieved
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1208,42 +1338,40 @@ - -+
    Returns:
    zero if unknown.
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    int odbc::DatabaseMetaData::getMaxTablesInSelect int odbc::DatabaseMetaData::getMaxTablesInSelect (   )   ) 
    -
    - -

    --Returns the maximum number of tables that can be joined at once. -+Returns the maximum number of tables that can be joined at once. -

    --

    --Returns:
    --zero if unknown.
    --

    -- -+

    -+

    - -- - -@@ -1256,48 +1384,59 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getPrimaryKeys ResultSet* odbc::DatabaseMetaData::getPrimaryKeys ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table table
    ) 
    -
    - -

    --Fetches a list of primary keys for a table. -+Fetches a list of primary keys for a table. -

    --The returned ResultSet is ordered by TABLE_CAT, TABLE_SCHEM, TABLE_NAME and KEY_SEQ. It contains the following columns:

      --
    1. TABLE_CAT - string - table catalog (can be NULL)
    2. TABLE_SCHEM - string - table schema (can be NULL)
    3. TABLE_NAME - string - table name
    4. COLUMN_NAME - string - column name
    5. KEY_SEQ - string - sequence number in primary key (1-based)
    6. PK_NAME - string - primary key (constraint) name. Can be NULL.
    -+The returned ResultSet is ordered by TABLE_CAT, TABLE_SCHEM, TABLE_NAME and KEY_SEQ. It contains the following columns:
      -+
    1. -+TABLE_CAT - string - table catalog (can be NULL)
      2. -+
    2. -+TABLE_SCHEM - string - table schema (can be NULL)
      3. -+
    3. -+TABLE_NAME - string - table name
      4. -+
    4. -+COLUMN_NAME - string - column name
      5. -+
    5. -+KEY_SEQ - string - sequence number in primary key (1-based)
      6. -+
    6. -+PK_NAME - string - primary key (constraint) name. Can be NULL.
      7. -+
    -
    --

    -- -+

    -+

    - -- - -@@ -1310,46 +1449,90 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getProcedureColumns ResultSet* odbc::DatabaseMetaData::getProcedureColumns ( const std::string &   catalog, catalog,
    const std::string &   schemaPattern, schemaPattern,
    const std::string &   procedureNamePattern, procedureNamePattern,
    const std::string &   columnNamePattern columnNamePattern
    ) 
    -
    - -

    --Returns available procedure columns in a catalog. -+Returns available procedure columns in a catalog. -+

    -+The returned ResultSet is ordered by PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME and COLUMN_NAME. It contains the following columns:

      -+
    1. -+PROCEDURE_CAT - string - the procedure catalog
      2. -+
    2. -+PROCEDURE_SCHEM - string - the procedure schema
      3. -+
    3. -+PROCEDURE_NAME - string - the procedure name
      4. -+
    4. -+COLUMN_NAME - string - the column name
      5. -+
    5. -+COLUMN_TYPE - short - the column type
        -+
      • -+procedureColumnUnknown - beats the driver
        • -+
      • -+procedureColumnIn - IN parameter
        • -+
      • -+procedureColumnInOut - IN OUT parameter
        • -+
      • -+procedureColumnOut - OUT parameter
        • -+
      • -+procedureColumnReturn - procedure return value (eg. this procedure is actually a function)
        • -+
      • -+procedureColumnResult - this column is part of a ResultSet this procedure returns
        • -+
      -+
      6. -+
    6. -+DATA_TYPE - int - SQL type of the column
      7. -+
    7. -+TYPE_NAME - string - native type name
      8. -+
    8. -+COLUMN_SIZE - int - the precision of the column
      9. -+
    9. -+BUFFER_LENGTH - int - nothing of interest
      10. -+
    10. -+DECIMAL_DIGITS - short - scale, if applicable
      11. -+
    11. -+NUM_PREC_RADIX - short - radix, if applicable
      12. -+
    12. -+NULLABLE - short - whether the column is nullable
        -+
      • -+procedureNoNulls - not nullable
        • -+
      • -+procedureNullable - nullable
        • -+
      • -+procedureNullableUnknown - nobody knows
        • -+
      -+
      13. -+
    13. -+REMARKS - string - comments on the column
      14. -+
    -

    --The returned ResultSet is ordered by PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME and COLUMN_NAME. It contains the following columns:

      --
    1. PROCEDURE_CAT - string - the procedure catalog
    2. PROCEDURE_SCHEM - string - the procedure schema
    3. PROCEDURE_NAME - string - the procedure name
    4. COLUMN_NAME - string - the column name
    5. COLUMN_TYPE - short - the column type
        --
      • procedureColumnUnknown - beats the driver
      • procedureColumnIn - IN parameter
      • procedureColumnInOut - IN OUT parameter
      • procedureColumnOut - OUT parameter
      • procedureColumnReturn - procedure return value (eg. this procedure is actually a function)
      • procedureColumnResult - this column is part of a ResultSet this procedure returns
      --
    6. DATA_TYPE - int - SQL type of the column
    7. TYPE_NAME - string - native type name
    8. COLUMN_SIZE - int - the precision of the column
    9. BUFFER_LENGTH - int - nothing of interest
    10. DECIMAL_DIGITS - short - scale, if applicable
    11. NUM_PREC_RADIX - short - radix, if applicable
    12. NULLABLE - short - whether the column is nullable
        --
      • procedureNoNulls - not nullable
      • procedureNullable - nullable
      • procedureNullableUnknown - nobody knows
      --
    13. REMARKS - string - comments on the column
    - Note: more columns can be returned depending on the driver.
    --

    -- -+

    -+

    - -- - -@@ -1362,28 +1545,49 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getProcedures ResultSet* odbc::DatabaseMetaData::getProcedures ( const std::string &   catalog, catalog,
    const std::string &   schemaPattern, schemaPattern,
    const std::string &   procedureNamePattern procedureNamePattern
    ) 
    -
    - -

    --Returns available procedures in a catalog. -+Returns available procedures in a catalog. -

    - The returned ResultSet is ordered by PROCEDURE_CAT, PROCEDURE_SCHEM and PROCEDURE_NAME. It contains the following columns:

      --
    1. PROCEDURE_CAT - string - the procedure catalog
    2. PROCEDURE_SCHEM - string - the procedure schema
    3. PROCEDURE_NAME - string - the procedure name
    4. NUM_INPUT_PARAMS - reserved for future use
    5. NUM_OUTPUT_PARAMS - reserved for future use
    6. NUM_RESULT_SETS - reserved for future use
    7. REMARKS - string - comments on the procedure
    8. PROCEDURE_TYPE - short - the procedure type:
        --
      • procedureResultUnknown - can possibly return a result, but nobody is sure
      • procedureNoResult - does not return a result
      • procedureReturnsResult - returns a result
      -+
    9. -+PROCEDURE_CAT - string - the procedure catalog
      10. -+
    10. -+PROCEDURE_SCHEM - string - the procedure schema
      11. -+
    11. -+PROCEDURE_NAME - string - the procedure name
      12. -+
    12. -+NUM_INPUT_PARAMS - reserved for future use
      13. -+
    13. -+NUM_OUTPUT_PARAMS - reserved for future use
      14. -+
    14. -+NUM_RESULT_SETS - reserved for future use
      15. -+
    15. -+REMARKS - string - comments on the procedure
      16. -+
    16. -+PROCEDURE_TYPE - short - the procedure type:
        -+
      • -+procedureResultUnknown - can possibly return a result, but nobody is sure
        • -+
      • -+procedureNoResult - does not return a result
        • -+
      • -+procedureReturnsResult - returns a result
        • -+
      -+
      17. -
    -
    --

    -- -+

    -+

    - -- - -@@ -1396,40 +1600,39 @@ - -+The returned ResultSet is the same as with getTables(), except that all columns but TABLE_SCHEM contain NULL values. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    ResultSet* odbc::DatabaseMetaData::getSchemas ResultSet* odbc::DatabaseMetaData::getSchemas (   )   ) 
    -
    - -

    --Returns a list of available schemas in the database. -+Returns a list of available schemas in the database. -

    --The returned ResultSet is the same as with getTables(), except that all columns but TABLE_SCHEM contain NULL values.

    --

    -- -+

    -+

    - -- - -@@ -1442,50 +1645,62 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getTablePrivileges ResultSet* odbc::DatabaseMetaData::getTablePrivileges ( const std::string &   catalog, catalog,
    const std::string &   schemaPattern, schemaPattern,
    const std::string &   tableNamePattern tableNamePattern
    ) 
    -
    - -

    --Fetches a list of access rights for tables in a catalog. --

    --A table privilege applies to one or more columns in a table. Do not assume that this privilege is valid for all columns. -+Fetches a list of access rights for tables in a catalog. -

    --The returned ResultSet is ordered by TABLE_CAT, TABLE_SCHEM, TABLE_NAME and PRIVILEGE. It contains the following columns:

      --
    1. TABLE_CAT - string - table catalog (can be NULL)
    2. TABLE_SCHEM - string - table schema (can be NULL)
    3. TABLE_NAME - string - table name
    4. GRANTOR - string - grantor (can be NULL). If GRANTEE owns the object, GRANTOR is "SYSTEM".
    5. GRANTEE - string - grantee
    6. PRIVILEGE - string - one of "SELECT", "INSERT", "UPDATE", "DELETE", "REFERENCES" or a data source specific value
    7. IS_GRANTABLE - string - "YES" if GRANTEE can grant this privilege to other users. "NO" if not. NULL if unknown.
    -+A table privilege applies to one or more columns in a table. Do not assume that this privilege is valid for all columns.

    -+The returned ResultSet is ordered by TABLE_CAT, TABLE_SCHEM, TABLE_NAME and PRIVILEGE. It contains the following columns:

      -+
    1. -+TABLE_CAT - string - table catalog (can be NULL)
      2. -+
    2. -+TABLE_SCHEM - string - table schema (can be NULL)
      3. -+
    3. -+TABLE_NAME - string - table name
      4. -+
    4. -+GRANTOR - string - grantor (can be NULL). If GRANTEE owns the object, GRANTOR is "SYSTEM".
      5. -+
    5. -+GRANTEE - string - grantee
      6. -+
    6. -+PRIVILEGE - string - one of "SELECT", "INSERT", "UPDATE", "DELETE", "REFERENCES" or a data source specific value
      7. -+
    7. -+IS_GRANTABLE - string - "YES" if GRANTEE can grant this privilege to other users. "NO" if not. NULL if unknown.
      8. -+
    -
    --

    -- -+

    -+

    - -- - -@@ -1498,38 +1713,43 @@ - -+
  • -+TABLE_CAT - string - table catalog (can be NULL)
    • -+
  • -+TABLE_SCHEM - string - table schema (can be NULL)
    • -+
  • -+TABLE_NAME - string - table name
    • -+
  • -+TABLE_TYPE - string - table type
    • -+
  • -+REMARKS - string - comments on the table
    • -+ -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getTables ResultSet* odbc::DatabaseMetaData::getTables ( const std::string &   catalog, catalog,
    const std::string &   schemaPattern, schemaPattern,
    const std::string &   tableNamePattern, tableNamePattern,
    const std::vector< std::string > &   types types
    ) 
    -
    - -

    --Fetches the available tables in the data source. -+Fetches the available tables in the data source. -

    - The returned ResultSet has the following columns:

      --
    1. TABLE_CAT - string - table catalog (can be NULL)
    2. TABLE_SCHEM - string - table schema (can be NULL)
    3. TABLE_NAME - string - table name
    4. TABLE_TYPE - string - table type
    5. REMARKS - string - comments on the table
    --
    --Parameters:
    -- -- -- -- -- --
    catalog  --the catalog name
    schemaPattern  --schema name search pattern
    tableNamePattern  --table name search pattern
    types  --a list of table types. An empty list returns all table types.
    --
    -+ -+ -+ -+ -+
    catalog the catalog name
    schemaPattern schema name search pattern
    tableNamePattern table name search pattern
    types a list of table types. An empty list returns all table types.
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1542,24 +1762,23 @@ - -+The returned ResultSet is the same as with getTables(), except that all columns but TABLE_TYPE contain NULL values. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    ResultSet* odbc::DatabaseMetaData::getTableTypes ResultSet* odbc::DatabaseMetaData::getTableTypes (   )   ) 
    -
    - -

    --Fetches the table types the database supports. -+Fetches the table types the database supports. -

    --The returned ResultSet is the same as with getTables(), except that all columns but TABLE_TYPE contain NULL values.

    --

    -- -+

    -+

    - -- - -@@ -1572,46 +1791,95 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    ResultSet* odbc::DatabaseMetaData::getTypeInfo ResultSet* odbc::DatabaseMetaData::getTypeInfo (   )   ) 
    -
    - -

    --Fetches a list of data types supported by this data source. -+Fetches a list of data types supported by this data source. -

    - The returned ResultSet is ordered by DATA_TYPE and then by how closely the type maps to the corresponding ODBC SQL type. It contains the following columns:

      --
    1. TYPE_NAME - string - native type name
    2. DATA_TYPE - short - SQL data type from Types
    3. COLUMN_SIZE - int - maximum precision
    4. LITERAL_PREFIX - string - prefix used to quote a literal. Can be NULL.
    5. LITERAL_SUFFIX - string - suffix used to quote a literal. Can be NULL.
    6. CREATE_PARAMS - string - comma separated possible list of parameters to creating a column of this type
    7. NULLABLE - short - whether this type can contain NULLs:
        --
      • typeNoNulls - no
      • typeNullable - yes, can be nullable
      • typeNullableUnknown - nobody knows
      --
    8. CASE_SENSITIVE - bool - whether this type is case sensitive
    9. SEARCHABLE - bool - whether this type can be searched, eg used in WHERE-clauses:
        --
      • typePredNone - no
      • typePredChar - yes, but only with a LIKE predicate
      • typePredBasic - yes, except in a LIKE predicate
      • typeSearchable - yes
      --
    10. UNSIGNED_ATTRIBUTE - bool - true if this type is unsigned
    11. FIXED_PREC_SCALE - bool - whether this type has predefined fixed precision and scale (eg is useful for money)
    12. AUTO_UNIQUE_VALUE - bool - whether this type can be used for an autoincrementing value. NULL if not applicable.
    13. LOCAL_TYPE_NAME - string - localized native type name. Can be NULL.
    14. MINIMUM_SCALE - short - minimum supported scale, if applicable
    15. MAXIMUM_SCALE - short - maximum supported scale, if applicable
    16. SQL_DATA_TYPE - short - unused
    17. SQL_DATETIME_SUB - short - unused
    18. NUM_PREC_RADIX - int - radix, if applicable
    -+
  • -+TYPE_NAME - string - native type name
    • -+
  • -+DATA_TYPE - short - SQL data type from Types
    • -+
  • -+COLUMN_SIZE - int - maximum precision
    • -+
  • -+LITERAL_PREFIX - string - prefix used to quote a literal. Can be NULL.
    • -+
  • -+LITERAL_SUFFIX - string - suffix used to quote a literal. Can be NULL.
    • -+
  • -+CREATE_PARAMS - string - comma separated possible list of parameters to creating a column of this type
    • -+
  • -+NULLABLE - short - whether this type can contain NULLs:
      -+
    • -+typeNoNulls - no
      • -+
    • -+typeNullable - yes, can be nullable
      • -+
    • -+typeNullableUnknown - nobody knows
      • -+
    -+
    • -+
  • -+CASE_SENSITIVE - bool - whether this type is case sensitive
    • -+
  • -+SEARCHABLE - bool - whether this type can be searched, eg used in WHERE-clauses:
      -+
    • -+typePredNone - no
      • -+
    • -+typePredChar - yes, but only with a LIKE predicate
      • -+
    • -+typePredBasic - yes, except in a LIKE predicate
      • -+
    • -+typeSearchable - yes
      • -+
    -+
    • -+
  • -+UNSIGNED_ATTRIBUTE - bool - true if this type is unsigned
    • -+
  • -+FIXED_PREC_SCALE - bool - whether this type has predefined fixed precision and scale (eg is useful for money)
    • -+
  • -+AUTO_UNIQUE_VALUE - bool - whether this type can be used for an autoincrementing value. NULL if not applicable.
    • -+
  • -+LOCAL_TYPE_NAME - string - localized native type name. Can be NULL.
    • -+
  • -+MINIMUM_SCALE - short - minimum supported scale, if applicable
    • -+
  • -+MAXIMUM_SCALE - short - maximum supported scale, if applicable
    • -+
  • -+SQL_DATA_TYPE - short - unused
    • -+
  • -+SQL_DATETIME_SUB - short - unused
    • -+
  • -+NUM_PREC_RADIX - int - radix, if applicable
    • -+ -
    --

    -- -+

    -+

    - -- - -@@ -1624,29 +1892,50 @@ - - -
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    ResultSet* odbc::DatabaseMetaData::getVersionColumns ResultSet* odbc::DatabaseMetaData::getVersionColumns ( const std::string &   catalog, catalog,
    const std::string &   schema, schema,
    const std::string &   table table
    ) 
    -
    - -

    --Returns a list of columns for a table that are automatically updated when anything in a row is updated. -+Returns a list of columns for a table that are automatically updated when anything in a row is updated. -

    - The returned ResultSet has the following unordered columns:

      --
    1. SCOPE - short - unused
    2. COLUMN_NAME - string - the column name
    3. DATA_TYPE - short - the type of the column from Types
    4. TYPE_NAME - string - native type name (data source dependent)
    5. COLUMN_SIZE - int - the size (precision) of the column.
    6. BUFFER_LENGTH - int - unused
    7. DECIMAL_DIGITS - short - scale if applicable. Can be NULL.
    8. PSEUDO_COLUMN - short - whether this is a pseudo column:
        --
      • versionColumnUnknown - it is unknown whether this is a pseudo column
      • versionColumnNotPseudo - it is definitely not a pseudo column
      • versionColumnPseudo - it is definitely a pseudo column
      -+
    9. -+SCOPE - short - unused
      10. -+
    10. -+COLUMN_NAME - string - the column name
      11. -+
    11. -+DATA_TYPE - short - the type of the column from Types
      12. -+
    12. -+TYPE_NAME - string - native type name (data source dependent)
      13. -+
    13. -+COLUMN_SIZE - int - the size (precision) of the column.
      14. -+
    14. -+BUFFER_LENGTH - int - unused
      15. -+
    15. -+DECIMAL_DIGITS - short - scale if applicable. Can be NULL.
      16. -+
    16. -+PSEUDO_COLUMN - short - whether this is a pseudo column:
        -+
      • -+versionColumnUnknown - it is unknown whether this is a pseudo column
        • -+
      • -+versionColumnNotPseudo - it is definitely not a pseudo column
        • -+
      • -+versionColumnPseudo - it is definitely a pseudo column
        • -+
      -+
      17. -
    -
    --

    -- -+

    -+

    - -- - -@@ -1659,30 +1948,28 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::insertsAreDetected bool odbc::DatabaseMetaData::insertsAreDetected ( int   type )  type  ) 
    -
    - -

    --Returns true if an inserted row can be detected with ResultSet::rowInserted(). -+Returns true if an inserted row can be detected with ResultSet::rowInserted(). -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1695,25 +1982,24 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::isCatalogAtStart bool odbc::DatabaseMetaData::isCatalogAtStart (   )   ) 
    -
    - -

    --Returns true if the catalog is positioned at the beginning of a fully qualified identifier. -+Returns true if the catalog is positioned at the beginning of a fully qualified identifier. -

    - For example mysql would say true, while oracle would say false.

    --

    -- -+

    -+

    - -- - -@@ -1726,31 +2012,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::othersDeletesAreVisible bool odbc::DatabaseMetaData::othersDeletesAreVisible ( int   type )  type  ) 
    -
    - -

    --Returns true if rows deleted by others disapear from a ResultSet. -+Returns true if rows deleted by others disapear from a ResultSet. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1763,31 +2047,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::othersInsertsAreVisible bool odbc::DatabaseMetaData::othersInsertsAreVisible ( int   type )  type  ) 
    -
    - -

    --Returns true if rows inserted by others become available in a ResultSet. -+Returns true if rows inserted by others become available in a ResultSet. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1800,31 +2082,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::othersUpdatesAreVisible bool odbc::DatabaseMetaData::othersUpdatesAreVisible ( int   type )  type  ) 
    -
    - -

    --Returns true if rows updated by others are visible with their new values. -+Returns true if rows updated by others are visible with their new values. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1837,31 +2117,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::ownDeletesAreVisible bool odbc::DatabaseMetaData::ownDeletesAreVisible ( int   type )  type  ) 
    -
    - -

    --Returns true if deleted rows dissapear from a ResultSet. -+Returns true if deleted rows dissapear from a ResultSet. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1874,31 +2152,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::ownInsertsAreVisible bool odbc::DatabaseMetaData::ownInsertsAreVisible ( int   type )  type  ) 
    -
    - -

    --Returns true if inserted rows become available in a ResultSet. -+Returns true if inserted rows become available in a ResultSet. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1911,30 +2187,28 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::ownUpdatesAreVisible bool odbc::DatabaseMetaData::ownUpdatesAreVisible ( int   type )  type  ) 
    -
    - -

    --Returns true if updated rows are available with their new values in the ResultSet. -+Returns true if updated rows are available with their new values in the ResultSet. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1947,26 +2221,24 @@ - -+
    Returns:
    true if the data source supports both data manipulation (eg. UPDATE, INSERT) and data definition (eg. CREATE TABLE) within a transaction.
    -+If this method returns true, supportsDataManipulationTransactionsOnly(), dataDefinitionCausesTransactionCommit() and dataDefinitionIgnoredInTransactions() all return false. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions bool odbc::DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions (   )   ) 
    -
    - -

    --Checks if the data source supports both DML and DDL in transactions. -+Checks if the data source supports both DML and DDL in transactions. -

    --

    --Returns:
    --true if the data source supports both data manipulation (eg. UPDATE, INSERT) and data definition (eg. CREATE TABLE) within a transaction.
    If this method returns true, supportsDataManipulationTransactionsOnly(), dataDefinitionCausesTransactionCommit() and dataDefinitionIgnoredInTransactions() all return false.
    --

    -- -+

    -+

    - -- - -@@ -1979,28 +2251,25 @@ - -+
    Returns:
    true if the data source only supports data manipulation (eg. UPDATE, INSERT) within a transaction.
    -+Attempts to use data definition (eg. CREATE TABLE) in a transaction will trigger an error.

    -+If this method returns true, supportsDataDefinitionAndDataManipulationTransactions(), dataDefinitionCausesTransactionCommit() and dataDefinitionIgnoredInTransactions() all return false. -

    -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsDataManipulationTransactionsOnly bool odbc::DatabaseMetaData::supportsDataManipulationTransactionsOnly (   )   ) 
    -
    - -

    --Checks if the data source only supports DML in transactions. --

    --

    --Returns:
    --true if the data source only supports data manipulation (eg. UPDATE, INSERT) within a transaction.
    Attempts to use data definition (eg. CREATE TABLE) in a transaction will trigger an error. -+Checks if the data source only supports DML in transactions. -

    --If this method returns true, supportsDataDefinitionAndDataManipulationTransactions(), dataDefinitionCausesTransactionCommit() and dataDefinitionIgnoredInTransactions() all return false.

    --

    -- -+

    -+

    - -- - -@@ -2013,24 +2282,23 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsOpenCursorsAcrossCommit bool odbc::DatabaseMetaData::supportsOpenCursorsAcrossCommit (   )   ) 
    -
    - -

    --Returns true if the data source and the driver can handle open cursors (eg. -+Returns true if the data source and the driver can handle open cursors (eg. -

    - ResultSets) across a commit, or false if they are invalidated.

    --

    -- -+

    -+

    - -- - -@@ -2043,24 +2311,23 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsOpenCursorsAcrossRollback bool odbc::DatabaseMetaData::supportsOpenCursorsAcrossRollback (   )   ) 
    -
    - -

    --Returns true if the data source and the driver can handle open cursors (eg. -+Returns true if the data source and the driver can handle open cursors (eg. -

    - ResultSets) across a rollback, or false if they are invalidated.

    --

    -- -+

    -+

    - -- - -@@ -2073,26 +2340,24 @@ - -+
    Returns:
    true if ("DELETE WHERE CURRENT OF ...") is supported
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsPositionedDelete bool odbc::DatabaseMetaData::supportsPositionedDelete (   )   ) 
    -
    - -

    --Checks if the data source supports positioned delete. -+Checks if the data source supports positioned delete. -

    --

    --Returns:
    --true if ("DELETE WHERE CURRENT OF ...") is supported
    --

    -- -+

    -+

    - -- - -@@ -2105,36 +2370,34 @@ - -+
    Returns:
    true if ("UPDATE ... WHERE CURRENT OF ...") is supported
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsPositionedUpdate bool odbc::DatabaseMetaData::supportsPositionedUpdate (   )   ) 
    -
    - -

    --Checks if the data source supports positioned update. -+Checks if the data source supports positioned update. -

    --

    --Returns:
    --true if ("UPDATE ... WHERE CURRENT OF ...") is supported
    --

    -- -+

    -+

    - -- - -@@ -2147,35 +2410,31 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    bool odbc::DatabaseMetaData::supportsResultSetConcurrency bool odbc::DatabaseMetaData::supportsResultSetConcurrency ( int   type, type,
    int   concurrency concurrency
    ) 
    -
    - -

    --Returns true if the data source supports the given result set concurrency for the given result set type. -+Returns true if the data source supports the given result set concurrency for the given result set type. -

    --

    --Parameters:
    -- -- -- --
    type  --The type to check for.
    concurrency  --The concurrency level to check for.
    --
    --See also:
    --ResultSet
    -+ -+ -+
    type The type to check for.
    concurrency The concurrency level to check for.
    -+ -+

    See also:
    ResultSet
    -+ - - --

    -- -+

    -+

    - -- - -@@ -2188,32 +2447,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsResultSetType bool odbc::DatabaseMetaData::supportsResultSetType ( int   type )  type  ) 
    -
    - -

    --Returns true if the data source supports the given result set type. -+Returns true if the data source supports the given result set type. -

    --

    --Parameters:
    -- -- --
    type  --The type to check for
    --
    --See also:
    --ResultSet
    -+ -+
    type The type to check for
    -+ -+

    See also:
    ResultSet
    -+ - - --

    -- -+

    -+

    - -- - -@@ -2226,27 +2482,25 @@ - -+
    Returns:
    true if ("SELECT ... FOR UPDATE") is supported
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsSelectForUpdate bool odbc::DatabaseMetaData::supportsSelectForUpdate (   )   ) 
    -
    - -

    --Checks if the data source supports. -+Checks if the data source supports. -

    --

    --Returns:
    --true if ("SELECT ... FOR UPDATE") is supported
    --

    -- -+

    -+

    - -- - -@@ -2259,31 +2513,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::supportsTransactionIsolationLevel bool odbc::DatabaseMetaData::supportsTransactionIsolationLevel ( int   lev )  lev  ) 
    -
    - -

    --Returns true if the data source supports the specified transaction isolation level. -+Returns true if the data source supports the specified transaction isolation level. -

    --

    --Parameters:
    -- -- --
    lev  --The isolation level to check for
    --
    -+ -+
    lev The isolation level to check for
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2296,19 +2548,18 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::DatabaseMetaData::updatesAreDetected bool odbc::DatabaseMetaData::updatesAreDetected ( int   type )  type  ) 
    -
    - -

    --Returns true if ResultSet::rowUpdated can determine whether a row has been updated. -+Returns true if ResultSet::rowUpdated can determine whether a row has been updated. -

    --

    --Parameters:
    -- -- --
    type  --The type of ResultSet of interest
    --
    -+ -+
    type The type of ResultSet of interest
    -+ -+ - - -

    The documentation for this class was generated from the following file: -+
  • odbc++/databasemetadata.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_database_meta_data-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_database_meta_data-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_database_meta_data-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_database_meta_data-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,160 +1,159 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DatabaseMetaData Member List

    This is the complete list of members for odbc::DatabaseMetaData, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DatabaseMetaData Member List

    This is the complete list of members for odbc::DatabaseMetaData, including all inherited members.

    allProceduresAreCallable()odbc::DatabaseMetaData
    allTablesAreSelectable()odbc::DatabaseMetaData
    dataDefinitionCausesTransactionCommit()odbc::DatabaseMetaData
    dataDefinitionIgnoredInTransactions()odbc::DatabaseMetaData
    deletesAreDetected(int type)odbc::DatabaseMetaData
    doesMaxRowSizeIncludeBlobs()odbc::DatabaseMetaData
    getBestRowIdentifier(const std::string &catalog, const std::string &schema, const std::string &table, int scope, bool nullable)odbc::DatabaseMetaData
    getCatalogs()odbc::DatabaseMetaData
    getCatalogSeparator()odbc::DatabaseMetaData
    getCatalogTerm()odbc::DatabaseMetaData
    getColumnPrivileges(const std::string &catalog, const std::string &schema, const std::string &table, const std::string &columnNamePattern)odbc::DatabaseMetaData
    getColumns(const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::string &columnNamePattern)odbc::DatabaseMetaData
    getConnection()odbc::DatabaseMetaData
    getCrossReference(const std::string &primaryCatalog, const std::string &primarySchema, const std::string &primaryTable, const std::string &foreignCatalog, const std::string &foreignSchema, const std::string &foreignTable)odbc::DatabaseMetaData
    getDatabaseProductName()odbc::DatabaseMetaData
    getDatabaseProductVersion()odbc::DatabaseMetaData
    getDefaultTransactionIsolation()odbc::DatabaseMetaData
    getDriverMajorVersion()odbc::DatabaseMetaData
    getDriverMinorVersion()odbc::DatabaseMetaData
    getDriverName()odbc::DatabaseMetaData
    getDriverVersion()odbc::DatabaseMetaData
    getExportedKeys(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    getExtraNameCharacters()odbc::DatabaseMetaData
    getIdentifierQuoteString()odbc::DatabaseMetaData
    getImportedKeys(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    getIndexInfo(const std::string &catalog, const std::string &schema, const std::string &table, bool unique, bool approximate)odbc::DatabaseMetaData
    getMaxBinaryLiteralLength()odbc::DatabaseMetaData
    getMaxCatalogNameLength()odbc::DatabaseMetaData
    getMaxCharLiteralLength()odbc::DatabaseMetaData
    getMaxColumnNameLength()odbc::DatabaseMetaData
    getMaxColumnsInGroupBy()odbc::DatabaseMetaData
    getMaxColumnsInIndex()odbc::DatabaseMetaData
    getMaxColumnsInOrderBy()odbc::DatabaseMetaData
    getMaxColumnsInSelect()odbc::DatabaseMetaData
    getMaxColumnsInTable()odbc::DatabaseMetaData
    getMaxConnections()odbc::DatabaseMetaData
    getMaxCursorNameLength()odbc::DatabaseMetaData
    getMaxIndexLength()odbc::DatabaseMetaData
    getMaxProcedureNameLength()odbc::DatabaseMetaData
    getMaxRowSize()odbc::DatabaseMetaData
    getMaxSchemaNameLength()odbc::DatabaseMetaData
    getMaxStatementLength()odbc::DatabaseMetaData
    getMaxStatements()odbc::DatabaseMetaData
    getMaxTableNameLength()odbc::DatabaseMetaData
    getMaxTablesInSelect()odbc::DatabaseMetaData
    getMaxUserNameLength()odbc::DatabaseMetaData
    getNumericFunctions()odbc::DatabaseMetaData
    getPrimaryKeys(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    getProcedureColumns(const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern, const std::string &columnNamePattern)odbc::DatabaseMetaData
    getProcedures(const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern)odbc::DatabaseMetaData
    getProcedureTerm()odbc::DatabaseMetaData
    getSchemas()odbc::DatabaseMetaData
    getSchemaTerm()odbc::DatabaseMetaData
    getSearchStringEscape()odbc::DatabaseMetaData
    getSQLKeywords()odbc::DatabaseMetaData
    getStringFunctions()odbc::DatabaseMetaData
    getSystemFunctions()odbc::DatabaseMetaData
    getTablePrivileges(const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern)odbc::DatabaseMetaData
    getTables(const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::vector< std::string > &types)odbc::DatabaseMetaData
    getTableTerm()odbc::DatabaseMetaData
    getTableTypes()odbc::DatabaseMetaData
    getTimeDateFunctions()odbc::DatabaseMetaData
    getTypeInfo()odbc::DatabaseMetaData
    getUserName()odbc::DatabaseMetaData
    getVersionColumns(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    insertsAreDetected(int type)odbc::DatabaseMetaData
    isCatalogAtStart()odbc::DatabaseMetaData
    isReadOnly()odbc::DatabaseMetaData
    nullPlusNonNullIsNull()odbc::DatabaseMetaData
    nullsAreSortedAtEnd()odbc::DatabaseMetaData
    nullsAreSortedAtStart()odbc::DatabaseMetaData
    nullsAreSortedHigh()odbc::DatabaseMetaData
    nullsAreSortedLow()odbc::DatabaseMetaData
    othersDeletesAreVisible(int type)odbc::DatabaseMetaData
    othersInsertsAreVisible(int type)odbc::DatabaseMetaData
    othersUpdatesAreVisible(int type)odbc::DatabaseMetaData
    ownDeletesAreVisible(int type)odbc::DatabaseMetaData
    ownInsertsAreVisible(int type)odbc::DatabaseMetaData
    ownUpdatesAreVisible(int type)odbc::DatabaseMetaData
    storesLowerCaseIdentifiers()odbc::DatabaseMetaData
    storesLowerCaseQuotedIdentifiers()odbc::DatabaseMetaData
    storesMixedCaseIdentifiers()odbc::DatabaseMetaData
    storesMixedCaseQuotedIdentifiers()odbc::DatabaseMetaData
    storesUpperCaseIdentifiers()odbc::DatabaseMetaData
    storesUpperCaseQuotedIdentifiers()odbc::DatabaseMetaData
    supportsAlterTableWithAddColumn()odbc::DatabaseMetaData
    supportsAlterTableWithDropColumn()odbc::DatabaseMetaData
    supportsANSI92EntryLevelSQL()odbc::DatabaseMetaData
    supportsANSI92FullSQL()odbc::DatabaseMetaData
    supportsANSI92IntermediateSQL()odbc::DatabaseMetaData
    supportsBatchUpdates()odbc::DatabaseMetaData
    supportsCatalogsInDataManipulation()odbc::DatabaseMetaData
    supportsCatalogsInIndexDefinitions()odbc::DatabaseMetaData
    supportsCatalogsInPrivilegeDefinitions()odbc::DatabaseMetaData
    supportsCatalogsInProcedureCalls()odbc::DatabaseMetaData
    supportsCatalogsInTableDefinitions()odbc::DatabaseMetaData
    supportsColumnAliasing()odbc::DatabaseMetaData
    supportsConvert()odbc::DatabaseMetaData
    supportsConvert(int fromType, int toType)odbc::DatabaseMetaData
    supportsCoreSQLGrammar()odbc::DatabaseMetaData
    supportsCorrelatedSubqueries()odbc::DatabaseMetaData
    supportsDataDefinitionAndDataManipulationTransactions()odbc::DatabaseMetaData
    supportsDataManipulationTransactionsOnly()odbc::DatabaseMetaData
    supportsExtendedSQLGrammar()odbc::DatabaseMetaData
    supportsFullOuterJoins()odbc::DatabaseMetaData
    supportsGroupBy()odbc::DatabaseMetaData
    supportsGroupByBeyondSelect()odbc::DatabaseMetaData
    supportsGroupByUnrelated()odbc::DatabaseMetaData
    supportsIntegrityEnhancementFacility()odbc::DatabaseMetaData
    supportsLikeEscapeClause()odbc::DatabaseMetaData
    supportsLimitedOuterJoins()odbc::DatabaseMetaData
    supportsMinimumSQLGrammar()odbc::DatabaseMetaData
    supportsMixedCaseIdentifiers()odbc::DatabaseMetaData
    supportsMixedCaseQuotedIdentifiers()odbc::DatabaseMetaData
    supportsMultipleResultSets()odbc::DatabaseMetaData
    supportsMultipleTransactions()odbc::DatabaseMetaData
    supportsNonNullableColumns()odbc::DatabaseMetaData
    supportsOpenCursorsAcrossCommit()odbc::DatabaseMetaData
    supportsOpenCursorsAcrossRollback()odbc::DatabaseMetaData
    supportsOpenStatementsAcrossCommit()odbc::DatabaseMetaData
    supportsOpenStatementsAcrossRollback()odbc::DatabaseMetaData
    supportsOuterJoins()odbc::DatabaseMetaData
    supportsPositionedDelete()odbc::DatabaseMetaData
    supportsPositionedUpdate()odbc::DatabaseMetaData
    supportsResultSetConcurrency(int type, int concurrency)odbc::DatabaseMetaData
    supportsResultSetType(int type)odbc::DatabaseMetaData
    supportsSchemasInDataManipulation()odbc::DatabaseMetaData
    supportsSchemasInIndexDefinitions()odbc::DatabaseMetaData
    supportsSchemasInPrivilegeDefinitions()odbc::DatabaseMetaData
    supportsSchemasInProcedureCalls()odbc::DatabaseMetaData
    supportsSchemasInTableDefinitions()odbc::DatabaseMetaData
    supportsSelectForUpdate()odbc::DatabaseMetaData
    supportsStoredProcedures()odbc::DatabaseMetaData
    supportsSubqueriesInComparisons()odbc::DatabaseMetaData
    supportsSubqueriesInExists()odbc::DatabaseMetaData
    supportsSubqueriesInIns()odbc::DatabaseMetaData
    supportsSubqueriesInQuantifieds()odbc::DatabaseMetaData
    supportsTransactionIsolationLevel(int lev)odbc::DatabaseMetaData
    supportsTransactions()odbc::DatabaseMetaData
    supportsUnion()odbc::DatabaseMetaData
    supportsUnionAll()odbc::DatabaseMetaData
    typePredBasic enum valueodbc::DatabaseMetaData
    typePredChar enum valueodbc::DatabaseMetaData
    typePredNone enum valueodbc::DatabaseMetaData
    typeSearchable enum valueodbc::DatabaseMetaData
    updatesAreDetected(int type)odbc::DatabaseMetaData
    usesLocalFilePerTable()odbc::DatabaseMetaData
    usesLocalFiles()odbc::DatabaseMetaData
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    allProceduresAreCallable()odbc::DatabaseMetaData
    allTablesAreSelectable()odbc::DatabaseMetaData
    dataDefinitionCausesTransactionCommit()odbc::DatabaseMetaData
    dataDefinitionIgnoredInTransactions()odbc::DatabaseMetaData
    deletesAreDetected(int type)odbc::DatabaseMetaData
    doesMaxRowSizeIncludeBlobs()odbc::DatabaseMetaData
    getBestRowIdentifier(const std::string &catalog, const std::string &schema, const std::string &table, int scope, bool nullable)odbc::DatabaseMetaData
    getCatalogs()odbc::DatabaseMetaData
    getCatalogSeparator()odbc::DatabaseMetaData
    getCatalogTerm()odbc::DatabaseMetaData
    getColumnPrivileges(const std::string &catalog, const std::string &schema, const std::string &table, const std::string &columnNamePattern)odbc::DatabaseMetaData
    getColumns(const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::string &columnNamePattern)odbc::DatabaseMetaData
    getConnection()odbc::DatabaseMetaData
    getCrossReference(const std::string &primaryCatalog, const std::string &primarySchema, const std::string &primaryTable, const std::string &foreignCatalog, const std::string &foreignSchema, const std::string &foreignTable)odbc::DatabaseMetaData
    getDatabaseProductName()odbc::DatabaseMetaData
    getDatabaseProductVersion()odbc::DatabaseMetaData
    getDefaultTransactionIsolation()odbc::DatabaseMetaData
    getDriverMajorVersion()odbc::DatabaseMetaData
    getDriverMinorVersion()odbc::DatabaseMetaData
    getDriverName()odbc::DatabaseMetaData
    getDriverVersion()odbc::DatabaseMetaData
    getExportedKeys(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    getExtraNameCharacters()odbc::DatabaseMetaData
    getIdentifierQuoteString()odbc::DatabaseMetaData
    getImportedKeys(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    getIndexInfo(const std::string &catalog, const std::string &schema, const std::string &table, bool unique, bool approximate)odbc::DatabaseMetaData
    getMaxBinaryLiteralLength()odbc::DatabaseMetaData
    getMaxCatalogNameLength()odbc::DatabaseMetaData
    getMaxCharLiteralLength()odbc::DatabaseMetaData
    getMaxColumnNameLength()odbc::DatabaseMetaData
    getMaxColumnsInGroupBy()odbc::DatabaseMetaData
    getMaxColumnsInIndex()odbc::DatabaseMetaData
    getMaxColumnsInOrderBy()odbc::DatabaseMetaData
    getMaxColumnsInSelect()odbc::DatabaseMetaData
    getMaxColumnsInTable()odbc::DatabaseMetaData
    getMaxConnections()odbc::DatabaseMetaData
    getMaxCursorNameLength()odbc::DatabaseMetaData
    getMaxIndexLength()odbc::DatabaseMetaData
    getMaxProcedureNameLength()odbc::DatabaseMetaData
    getMaxRowSize()odbc::DatabaseMetaData
    getMaxSchemaNameLength()odbc::DatabaseMetaData
    getMaxStatementLength()odbc::DatabaseMetaData
    getMaxStatements()odbc::DatabaseMetaData
    getMaxTableNameLength()odbc::DatabaseMetaData
    getMaxTablesInSelect()odbc::DatabaseMetaData
    getMaxUserNameLength()odbc::DatabaseMetaData
    getNumericFunctions()odbc::DatabaseMetaData
    getPrimaryKeys(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    getProcedureColumns(const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern, const std::string &columnNamePattern)odbc::DatabaseMetaData
    getProcedures(const std::string &catalog, const std::string &schemaPattern, const std::string &procedureNamePattern)odbc::DatabaseMetaData
    getProcedureTerm()odbc::DatabaseMetaData
    getSchemas()odbc::DatabaseMetaData
    getSchemaTerm()odbc::DatabaseMetaData
    getSearchStringEscape()odbc::DatabaseMetaData
    getSQLKeywords()odbc::DatabaseMetaData
    getStringFunctions()odbc::DatabaseMetaData
    getSystemFunctions()odbc::DatabaseMetaData
    getTablePrivileges(const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern)odbc::DatabaseMetaData
    getTables(const std::string &catalog, const std::string &schemaPattern, const std::string &tableNamePattern, const std::vector< std::string > &types)odbc::DatabaseMetaData
    getTableTerm()odbc::DatabaseMetaData
    getTableTypes()odbc::DatabaseMetaData
    getTimeDateFunctions()odbc::DatabaseMetaData
    getTypeInfo()odbc::DatabaseMetaData
    getUserName()odbc::DatabaseMetaData
    getVersionColumns(const std::string &catalog, const std::string &schema, const std::string &table)odbc::DatabaseMetaData
    insertsAreDetected(int type)odbc::DatabaseMetaData
    isCatalogAtStart()odbc::DatabaseMetaData
    isReadOnly()odbc::DatabaseMetaData
    nullPlusNonNullIsNull()odbc::DatabaseMetaData
    nullsAreSortedAtEnd()odbc::DatabaseMetaData
    nullsAreSortedAtStart()odbc::DatabaseMetaData
    nullsAreSortedHigh()odbc::DatabaseMetaData
    nullsAreSortedLow()odbc::DatabaseMetaData
    othersDeletesAreVisible(int type)odbc::DatabaseMetaData
    othersInsertsAreVisible(int type)odbc::DatabaseMetaData
    othersUpdatesAreVisible(int type)odbc::DatabaseMetaData
    ownDeletesAreVisible(int type)odbc::DatabaseMetaData
    ownInsertsAreVisible(int type)odbc::DatabaseMetaData
    ownUpdatesAreVisible(int type)odbc::DatabaseMetaData
    storesLowerCaseIdentifiers()odbc::DatabaseMetaData
    storesLowerCaseQuotedIdentifiers()odbc::DatabaseMetaData
    storesMixedCaseIdentifiers()odbc::DatabaseMetaData
    storesMixedCaseQuotedIdentifiers()odbc::DatabaseMetaData
    storesUpperCaseIdentifiers()odbc::DatabaseMetaData
    storesUpperCaseQuotedIdentifiers()odbc::DatabaseMetaData
    supportsAlterTableWithAddColumn()odbc::DatabaseMetaData
    supportsAlterTableWithDropColumn()odbc::DatabaseMetaData
    supportsANSI92EntryLevelSQL()odbc::DatabaseMetaData
    supportsANSI92FullSQL()odbc::DatabaseMetaData
    supportsANSI92IntermediateSQL()odbc::DatabaseMetaData
    supportsBatchUpdates()odbc::DatabaseMetaData
    supportsCatalogsInDataManipulation()odbc::DatabaseMetaData
    supportsCatalogsInIndexDefinitions()odbc::DatabaseMetaData
    supportsCatalogsInPrivilegeDefinitions()odbc::DatabaseMetaData
    supportsCatalogsInProcedureCalls()odbc::DatabaseMetaData
    supportsCatalogsInTableDefinitions()odbc::DatabaseMetaData
    supportsColumnAliasing()odbc::DatabaseMetaData
    supportsConvert()odbc::DatabaseMetaData
    supportsConvert(int fromType, int toType)odbc::DatabaseMetaData
    supportsCoreSQLGrammar()odbc::DatabaseMetaData
    supportsCorrelatedSubqueries()odbc::DatabaseMetaData
    supportsDataDefinitionAndDataManipulationTransactions()odbc::DatabaseMetaData
    supportsDataManipulationTransactionsOnly()odbc::DatabaseMetaData
    supportsExtendedSQLGrammar()odbc::DatabaseMetaData
    supportsFullOuterJoins()odbc::DatabaseMetaData
    supportsGroupBy()odbc::DatabaseMetaData
    supportsGroupByBeyondSelect()odbc::DatabaseMetaData
    supportsGroupByUnrelated()odbc::DatabaseMetaData
    supportsIntegrityEnhancementFacility()odbc::DatabaseMetaData
    supportsLikeEscapeClause()odbc::DatabaseMetaData
    supportsLimitedOuterJoins()odbc::DatabaseMetaData
    supportsMinimumSQLGrammar()odbc::DatabaseMetaData
    supportsMixedCaseIdentifiers()odbc::DatabaseMetaData
    supportsMixedCaseQuotedIdentifiers()odbc::DatabaseMetaData
    supportsMultipleResultSets()odbc::DatabaseMetaData
    supportsMultipleTransactions()odbc::DatabaseMetaData
    supportsNonNullableColumns()odbc::DatabaseMetaData
    supportsOpenCursorsAcrossCommit()odbc::DatabaseMetaData
    supportsOpenCursorsAcrossRollback()odbc::DatabaseMetaData
    supportsOpenStatementsAcrossCommit()odbc::DatabaseMetaData
    supportsOpenStatementsAcrossRollback()odbc::DatabaseMetaData
    supportsOuterJoins()odbc::DatabaseMetaData
    supportsPositionedDelete()odbc::DatabaseMetaData
    supportsPositionedUpdate()odbc::DatabaseMetaData
    supportsResultSetConcurrency(int type, int concurrency)odbc::DatabaseMetaData
    supportsResultSetType(int type)odbc::DatabaseMetaData
    supportsSchemasInDataManipulation()odbc::DatabaseMetaData
    supportsSchemasInIndexDefinitions()odbc::DatabaseMetaData
    supportsSchemasInPrivilegeDefinitions()odbc::DatabaseMetaData
    supportsSchemasInProcedureCalls()odbc::DatabaseMetaData
    supportsSchemasInTableDefinitions()odbc::DatabaseMetaData
    supportsSelectForUpdate()odbc::DatabaseMetaData
    supportsStoredProcedures()odbc::DatabaseMetaData
    supportsSubqueriesInComparisons()odbc::DatabaseMetaData
    supportsSubqueriesInExists()odbc::DatabaseMetaData
    supportsSubqueriesInIns()odbc::DatabaseMetaData
    supportsSubqueriesInQuantifieds()odbc::DatabaseMetaData
    supportsTransactionIsolationLevel(int lev)odbc::DatabaseMetaData
    supportsTransactions()odbc::DatabaseMetaData
    supportsUnion()odbc::DatabaseMetaData
    supportsUnionAll()odbc::DatabaseMetaData
    typePredBasic enum valueodbc::DatabaseMetaData
    typePredChar enum valueodbc::DatabaseMetaData
    typePredNone enum valueodbc::DatabaseMetaData
    typeSearchable enum valueodbc::DatabaseMetaData
    updatesAreDetected(int type)odbc::DatabaseMetaData
    usesLocalFilePerTable()odbc::DatabaseMetaData
    usesLocalFiles()odbc::DatabaseMetaData
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_data_source.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_data_source.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_data_source.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_data_source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,32 +1,31 @@ -- -+ - --odbc::DataSource class Reference -+libodbc++: odbc::DataSource Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DataSource Class Reference

    A Data Source. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DataSource Class Reference

    A Data Source. - More... -

    - #include <drivermanager.h> -

    --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - DataSource (const std::string &name, const std::string &description) --
      Constructor.

    • -+
      Constructor.
    • - virtual ~DataSource () --
      Destructor.

    • -+
      Destructor.
    • - const std::string & getName () const --
      Return the name of the data source.

    • -+
      Return the name of the data source.
    • - const std::string & getDescription () const --
      Return the description (if any) of the datasource.

    -+
    Return the description (if any) of the datasource.
    -

    Detailed Description

    --A Data Source. -+A Data Source. -

    -

    The documentation for this class was generated from the following file: -+
  • odbc++/drivermanager.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_data_source-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_data_source-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_data_source-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_data_source-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,16 +1,15 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DataSource Member List

    This is the complete list of members for odbc::DataSource, including all inherited members. -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DataSource Member List

    This is the complete list of members for odbc::DataSource, including all inherited members.

    DataSource(const std::string &name, const std::string &description)odbc::DataSource
    getDescription() constodbc::DataSource
    getName() constodbc::DataSource
    ~DataSource()odbc::DataSource [virtual]
    -+ -+ -+ -+ -
    DataSource(const std::string &name, const std::string &description)odbc::DataSource
    getDescription() constodbc::DataSource
    getName() constodbc::DataSource
    ~DataSource()odbc::DataSource [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_date.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_date.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3 +0,0 @@ --GIF89ahPòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,hPþºÜþ0ÊI«8ëÍ»ÿ`(Ž¡Bžhª®™É¾p|ºrm×ô­ïsÀ·ŸªQÚåŒÁ•0ùYÚŽÃœIè“Bšå"èÚ®3,uÌÔ–™â4Àü“Øp5ȹæPÑô”{?ûçZ^c^,{"}uŠŠyvx1‡E~]w‹‹˜jl†™=NSIV}DY¢–Ÿoª?­F¬®±2“²µJ°¶¹=º¼’¸½Àv¿ÁÄkÃÅÀÊËÌÍÎÈÑÔÓÕØÛÙØÛ×ÝÈßÜáÅãàåÄèéêìÑëî½ðñºóô¶ö÷²ùú®üý?þÜ!pà‚k Lc!îˆ(1ÅŠ'.b¡þqcˆŽ?€ Ùa$É &OfH©K•/OÆŒ1 ¦Í›8sêÜÉS§ž@ƒ --Í) ¨Ñ£H“*]Ê´©Ó§PÖŒJµªÕ«XNÍʵ«Wª[¿Š+6,Ù³hÁ° h[¶¼í:w¬Y¨oë²E«÷ë]· --ŽÎ+·î§†ÝÊUlôpã¼ ÏmKXqd¤'3ŽÌ™ñâω. ZtéÓ )SýùhfÓš[W~ºòìÙžaoöÜ÷õîߨ þ Ù1iÞŽmóNêõíÜMkgª|ºsæk‘ƆÌú9õ᧽WßNwÑ¿’¯^|9=ðÖá‘ž\œýôöZ³§Ý¶¯1kýüè•ù h ]M¡wà‚])ÈàƒV9á„OIHá…JYˆá†ç åᇠ†("N ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_date.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_date.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,72 +1,70 @@ -- -+ - --odbc::Date class Reference -+libodbc++: odbc::Date Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Date Class Reference

    An SQL DATE. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Date Class Reference

    An SQL DATE. - More... -

    - #include <types.h> -

    -

    Inheritance diagram for odbc::Date: --

    -+

    - - odbc::Timestamp - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - Date (int year, int month, int day) --
      Constructor.

    • Date () --
      Constructor. More...

    • Date (std::time_t t) --
      Constructor. More...

    • Date (const std::string &str) --
      Constructor. More...

    • --Date (const Date &d) --
      Copy constructor.

    • --Date & operator= (const Date &d) --
      Assignment operator.

    • -+
      Constructor.
    • Date () -+
      Constructor.
    • Date (std::time_t t) -+
      Constructor.
    • Date (const std::string &str) -+
      Constructor.
    • -+Date (const Date &d) -+
      Copy constructor.
    • -+Date & operator= (const Date &d) -+
      Assignment operator.
    • - virtual ~Date () --
      Destructor.

    • -+
      Destructor.
    • - virtual void setTime (std::time_t t) --
      Sets this date to the specified time_t value.

    • -+
      Sets this date to the specified time_t value.
    • - std::time_t getTime () const --
      Returns the time_t value of 00:00:00 at this date.

    • -+
      Returns the time_t value of 00:00:00 at this date.
    • - void parse (const std::string &str) --
      Sets this date from a string in the YYYY-MM-DD format.

    • -+
      Sets this date from a string in the YYYY-MM-DD format.
    • - int getYear () const --
      Gets the year of this date.

    • -+
      Gets the year of this date.
    • - int getMonth () const --
      Gets the month of this date.

    • -+
      Gets the month of this date.
    • - int getDay () const --
      Gets the monthday of this date.

    • -+
      Gets the monthday of this date.
    • - void setYear (int year) --
      Sets the year of this date.

    • -+
      Sets the year of this date.
    • - void setMonth (int month) --
      Sets the month of this date.

    • -+
      Sets the month of this date.
    • - void setDay (int day) --
      Sets the day of this date.

    • -+
      Sets the day of this date.
    • - virtual std::string toString () const --
      Gets the date as a string in the YYYY-MM-DD format.

    -+
    Gets the date as a string in the YYYY-MM-DD format.
    -

    Detailed Description

    --An SQL DATE. -+An SQL DATE. -

    -

    Constructor & Destructor Documentation

    --

    -- -+

    -+

    - -- - -@@ -79,25 +77,24 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    odbc::Date::Date odbc::Date::Date (   )   )  [explicit]
    -
    - -

    --Constructor. -+Constructor. -

    - Sets this date to today.

    --

    -- -+

    -+

    - -- - -@@ -110,25 +107,24 @@ - - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    odbc::Date::Date odbc::Date::Date ( std::time_t   t )  t  ) 
    -
    - -

    --Constructor. -+Constructor. -

    - Sets this date to the specified time_t value.

    --

    -- -+

    -+

    - -- - -@@ -141,13 +137,13 @@ - - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    odbc::Date::Date odbc::Date::Date ( const std::string &   str )  str  ) 
    -
    - -

    --Constructor. -+Constructor. -

    - Sets this date to the specified string in the YYYY-MM-DD format.

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_date-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_date-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,29 +1,28 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Date Member List

    This is the complete list of members for odbc::Date, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Date Member List

    This is the complete list of members for odbc::Date, including all inherited members.

    Date(int year, int month, int day)odbc::Date
    Date()odbc::Date [explicit]
    Date(std::time_t t)odbc::Date
    Date(const std::string &str)odbc::Date
    Date(const Date &d)odbc::Date
    getDay() constodbc::Date
    getMonth() constodbc::Date
    getTime() constodbc::Date
    getYear() constodbc::Date
    operator=(const Date &d)odbc::Date
    parse(const std::string &str)odbc::Date
    setDay(int day)odbc::Date
    setMonth(int month)odbc::Date
    setTime(std::time_t t)odbc::Date [virtual]
    setYear(int year)odbc::Date
    toString() constodbc::Date [virtual]
    ~Date()odbc::Date [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    Date(int year, int month, int day)odbc::Date
    Date()odbc::Date [explicit]
    Date(std::time_t t)odbc::Date
    Date(const std::string &str)odbc::Date
    Date(const Date &d)odbc::Date
    getDay() constodbc::Date
    getMonth() constodbc::Date
    getTime() constodbc::Date
    getYear() constodbc::Date
    operator=(const Date &d)odbc::Date
    parse(const std::string &str)odbc::Date
    setDay(int day)odbc::Date
    setMonth(int month)odbc::Date
    setTime(std::time_t t)odbc::Date [virtual]
    setYear(int year)odbc::Date
    toString() constodbc::Date [virtual]
    ~Date()odbc::Date [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_date.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_date.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_date.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,4 @@ -+‰PNG -+ -+ IHDRhP-RPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfIDATxœí•]ƒ ÇéËžio»Áv!“%Þÿk©àÇ@Å·8J²Ú”¿‰3xÀŒ5ÕÿY«,”vÕ@FË«Zְáä­Æ9$Yœ•Ð× i‰YÐÉ@ÀÃÄ:hoߢzwš«'È{äDY½½Ö /@‡>aeëêg8Ýú³ ¾ïN‚ÎS¯A jPƒ. -+=‹ö*VÌÃWÛýÚ¹”å}¢I—ó3ËCË®,„ä‘sì0vqè5F®³1a„/r²$z"Œ±z‰‘Ÿ&”Ä'Åf/ÅÛ+»s+ $¢üIéNŸãMüx§¹zIˆpvP·C§pR¯Âhñr ò×…ÊŸ°²½c_Ál;IEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_driver.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_driver.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,32 +1,31 @@ -- -+ - --odbc::Driver class Reference -+libodbc++: odbc::Driver Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Driver Class Reference

    An ODBC Driver with it's information. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Driver Class Reference

    An ODBC Driver with it's information. - More... -

    - #include <drivermanager.h> -

    --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - Driver (const std::string &description, const std::vector< std::string > &attributes) --
      Constructor.

    • -+
      Constructor.
    • - virtual ~Driver () --
      Destructor.

    • -+
      Destructor.
    • - const std::string & getDescription () const --
      Return a description of the driver.

    • -+
      Return a description of the driver.
    • - const std::vector< std::string > & getAttributes () const --
      Return a list of keys that can appear in a connect string using this driver.

    -+
    Return a list of keys that can appear in a connect string using this driver.
    -

    Detailed Description

    --An ODBC Driver with it's information. -+An ODBC Driver with it's information. -

    -

    The documentation for this class was generated from the following file: -+
  • odbc++/drivermanager.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_manager.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_manager.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_manager.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_manager.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,48 +1,46 @@ -- -+ - --odbc::DriverManager class Reference -+libodbc++: odbc::DriverManager Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DriverManager Class Reference

    The DriverManager. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DriverManager Class Reference

    The DriverManager. - More... -

    - #include <drivermanager.h> -

    --List of all members.

    Static Public Methods

    -+List of all members.

    Static Public Member Functions

    - -+
  • -+Connection * getConnection (const std::string &dsn, const std::string &user, const std::string &password) -+
    Opens a connection by it's DSN, a username and a password.
  • Connection * getConnection (const std::string &connectString) -+
    Opens a connection using an ODBC connect string.
  • int getLoginTimeout () -+
    Gets the current login timeout in seconds.
  • void setLoginTimeout (int seconds) -+
    Sets the login timeout in seconds.
  • -+DataSourceList * getDataSources () -+
    Fetch a list of all available data sources.
  • -+DriverList * getDrivers () -+
    Fetch a list of the available drivers.
  • -+void shutdown () -+
    Should be called before an application is to exit and after all connections have been closed.
    -

    Detailed Description

    --The DriverManager. -+The DriverManager. -

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -55,30 +53,28 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Connection* odbc::DriverManager::getConnection Connection* odbc::DriverManager::getConnection ( const std::string &   connectString )  connectString  )  [static]
    -
    - -

    --Opens a connection using an ODBC connect string. -+Opens a connection using an ODBC connect string. -

    --

    --Parameters:
    -- -- --
    connectString  --Usually something like "DSN=db;uid=user;pwd=password"
    --
    -+ -+
    connectString Usually something like "DSN=db;uid=user;pwd=password"
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -91,27 +87,25 @@ - -+
    Returns:
    The current login timeout in seconds, or 0 if disabled.
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    int odbc::DriverManager::getLoginTimeout int odbc::DriverManager::getLoginTimeout (   )   )  [static]
    -
    - -

    --Gets the current login timeout in seconds. -+Gets the current login timeout in seconds. -

    --

    --Returns:
    --The current login timeout in seconds, or 0 if disabled.
    --

    -- -+

    -+

    - -- - -@@ -124,19 +118,18 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    void odbc::DriverManager::setLoginTimeout void odbc::DriverManager::setLoginTimeout ( int   seconds )  seconds  )  [static]
    -
    - -

    --Sets the login timeout in seconds. -+Sets the login timeout in seconds. -

    --

    --Parameters:
    -- -- --
    seconds  --The number of seconds to wait for a connection to open. Set to 0 to disable.
    --
    -+ -+
    seconds The number of seconds to wait for a connection to open. Set to 0 to disable.
    -+ -+ - - -

    The documentation for this class was generated from the following file: -+
  • odbc++/drivermanager.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_manager-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_manager-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_manager-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_manager-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,19 +1,18 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DriverManager Member List

    This is the complete list of members for odbc::DriverManager, including all inherited members. -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DriverManager Member List

    This is the complete list of members for odbc::DriverManager, including all inherited members.

    getConnection(const std::string &dsn, const std::string &user, const std::string &password)odbc::DriverManager [static]
    getConnection(const std::string &connectString)odbc::DriverManager [static]
    getDataSources()odbc::DriverManager [static]
    getDrivers()odbc::DriverManager [static]
    getLoginTimeout()odbc::DriverManager [static]
    setLoginTimeout(int seconds)odbc::DriverManager [static]
    shutdown()odbc::DriverManager [static]
    -+ -+ -+ -+ -+ -+ -+ -
    getConnection(const std::string &dsn, const std::string &user, const std::string &password)odbc::DriverManager [static]
    getConnection(const std::string &connectString)odbc::DriverManager [static]
    getDataSources()odbc::DriverManager [static]
    getDrivers()odbc::DriverManager [static]
    getLoginTimeout()odbc::DriverManager [static]
    setLoginTimeout(int seconds)odbc::DriverManager [static]
    shutdown()odbc::DriverManager [static]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_driver-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_driver-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,16 +1,15 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Driver Member List

    This is the complete list of members for odbc::Driver, including all inherited members. -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Driver Member List

    This is the complete list of members for odbc::Driver, including all inherited members.

    Driver(const std::string &description, const std::vector< std::string > &attributes)odbc::Driver
    getAttributes() constodbc::Driver
    getDescription() constodbc::Driver
    ~Driver()odbc::Driver [virtual]
    -+ -+ -+ -+ -
    Driver(const std::string &description, const std::vector< std::string > &attributes)odbc::Driver
    getAttributes() constodbc::Driver
    getDescription() constodbc::Driver
    ~Driver()odbc::Driver [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_message.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_message.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_message.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_message.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,21 +1,20 @@ -- -+ - --odbc::DriverMessage class Reference -+libodbc++: odbc::DriverMessage Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DriverMessage Class Reference

    Used internally - represents the result of an SQLError call. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DriverMessage Class Reference

    Used internally - represents the result of an SQLError call. - More... -

    - #include <types.h> -

    - List of all members.

    Detailed Description

    --Used internally - represents the result of an SQLError call. -+Used internally - represents the result of an SQLError call. -

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_message-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_message-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_driver_message-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_driver_message-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,12 +1,11 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::DriverMessage Member List

    This is the complete list of members for odbc::DriverMessage, including all inherited members. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::DriverMessage Member List

    This is the complete list of members for odbc::DriverMessage, including all inherited members.

    -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_error_handler.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_error_handler.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_error_handler.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_error_handler.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,13 +0,0 @@ --GIF89aßÀòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,ßÀþºÜþ0ÊI«½8ËÀ»ÿ`(Ždižhª®Zë¾p,Ïtm߸ä|ï¿»ŸpH,ÈL0Él*ШtJý-«Øä5Ëíz¿È-x\“Ïè´ºa^»'í·|N7ÆeÁ{„g»ò>zuƒ„…@=€‚O ‹‰<Ž†“”• --’;€›qmœ—yž ¢[Kš£¦—¢¤§­°˜~–¶··´µ°¼¦¾£À‰¡ªÄÀ§Ç¥Á®Ëɺ¸ÑÒ„ÏÈͽւ|Ǽݪ±ÅÉ×ß0ÕÓéêMèÞäîÝ{™ÐïðÖ¤«æú®«ñ-íë -- t.›Ákòѳgî ¶rïýH±"”vûð1{èþOâB†÷R½Ëø dA‹(SØOc§+ý„…ãSVCg¨B¾"3@•@ƒŠ:å'Ñ£)"=¹´©Ó¡OÃDêT)UW³ --µªuCׯ¹‚…:¶l:±f¹¥][ mZ·lãFYA·®Ý»xóžË·¯ ~ x°áÖ (F̸1Å…Kž òbʘ3O±Y³çÏG:ƒMº‡èÒ¨SÇ8­ºµë --¬_Ëž½ 6íÛ­mãÞMZ7ïßš}.Y8ñã‡#G̹¹óçУKŸN½ºõëسkßν»÷ï৫VÞ›7yÇçA§ÿ¼ž¹ù÷©Û‡Z~fû˜ñ Ö?™þññôÝæ__6V cÆ•`r–·Û‚†A˜–„û58…aè—†`qÈ—‡r¨•ˆl‘¸–‰T¡h–Še±ÈÃ0Æ(ãŒ4Öhã8戣:öèã@Ò(ADi$Œ<©ä’7Éä“P& å”J --`å•Xf©å–\véå—`†)æ˜dŽ9Àe¦©æšl¶éæ—gF0À›tÖiçlˆçž|ö‰gœÌéç „ --& j袌ªg£Fj'¢(*饘’Ii–fêé§Z> --ꨣnÊ@§¤¦*©©  ªê«‹Š --묆²ª€«´æú'šºöʧ¬ƒ`¥°kz°(±Ä6þj+¸Š¬š¸ùì°x™ì¯¼B:mšÆÛåµw‚{'°~n[æµâò™n¬Ùjë-·X®+æ´è~;è²Íûî¹ñî«¥¼ÒúIn›Õ^ÉÏl°Â[Ê[0Â'+,ã«pµ3<1Àjâ,Å'l±ÃýRk±Á(CŒ1—?¼§Ç}º²· Sœ¥¸-_¬³Ä÷l2Ê;÷9p±)#kô»<÷lnÉJÓKoÑP+]ôÒn¬nÔ:#µ¿Û>í³×ßµÐ톋õÑRký5¸]«ÝtØm‡ö¯ùòëvÜû,öÝûâý/ß_[¶Ù€'w´}ûøÜÔ¦Ìø˃×iøØTþ›tÉ~§=¹Û/×MææsW¾÷ß…OÝ2é™ëý¦Õ{‚žº½}w+÷â•}ºÀ‘Óéz⪃Ùõíˆ{üØÛ¹;í¾³L9ï8£Î¼ãt²Žçñ ÃÎùÞ››KuÞmJoüòÈYoè×k®xøt¯vÖä+>õï—~~÷¹ë~vãí“.¿ÓëcN<ärŠÙýä7ý™¯Lè¢ç¹ÏÕLj5«žì*æ¸ÊLc[Øå¸g¦úéî"‹—Æ8—±“-Ls¶Ù ÉÀ˜f*¼Û¶±Ÿ!‚Ìã`š†æ«®É{> â=(Ä"z‰‡FLâ–€¨Ä&f‰‰NŒ"£¨D(R±þŠD¼b§¨E!Z±‹^Ì"{ÈÅ1úê‹f<£Ó˜«2²‘Vh|#×(ÇW¹±ŽªŠ#óHÇ=–ª~$• ªAÒSTJ¤"ÉH9©‘Œ¤${ôÈIZò’’\Ž&Ñà¢Mz2 ü¤(£™Qš2D—9¥*Ç™Uº²+­|¥,¯ÊYÚ2 µ¼¥.+³Ë^%—¾ æf„IL‹³˜È M2—™Žc2ó™±gR¬âû´øž,~qdÏÓØ@7^§sÌ ³ÓÇ?ò;… -+ - --odbc::ErrorHandler class Reference -+libodbc++: odbc::ErrorHandler Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::ErrorHandler Class Reference

    Base class for everything that might contain warnings. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::ErrorHandler Class Reference

    Base class for everything that might contain warnings. - More... -

    - #include <errorhandler.h> -

    -

    Inheritance diagram for odbc::ErrorHandler: --

    -+

    - - odbc::Connection - odbc::ResultSet -@@ -20,36 +19,35 @@ - odbc::PreparedStatement - odbc::CallableStatement - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - void clearWarnings () --
      Clears all the warnings stored in this object.

    • WarningList * getWarnings () --
      Fetches all the warnings in this object. More...

    • -+
      Clears all the warnings stored in this object.
    • WarningList * getWarnings () -+
      Fetches all the warnings in this object.
    • - virtual ~ErrorHandler () --
      Destructor.

    --

    Protected Methods

    -+
    Destructor.
    -+

    Protected Member Functions

    -
      --
    • -+
    • - ErrorHandler (bool collectWarnings=true) --
      Constructor.

    -+
    Constructor.
    -

    Detailed Description

    --Base class for everything that might contain warnings. -+Base class for everything that might contain warnings. -

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -62,13 +60,13 @@ - -+The caller is responsive for deleteing the returned object. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    WarningList* odbc::ErrorHandler::getWarnings WarningList* odbc::ErrorHandler::getWarnings (   )   ) 
    -
    - -

    --Fetches all the warnings in this object. -+Fetches all the warnings in this object. -

    --The caller is responsive for deleteing the returned object.

    -

    The documentation for this class was generated from the following file: -+
  • odbc++/errorhandler.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_error_handler-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_error_handler-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_error_handler-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_error_handler-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,16 +1,15 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::ErrorHandler Member List

    This is the complete list of members for odbc::ErrorHandler, including all inherited members. -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::ErrorHandler Member List

    This is the complete list of members for odbc::ErrorHandler, including all inherited members.

    clearWarnings()odbc::ErrorHandler
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    getWarnings()odbc::ErrorHandler
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    -+ -+ -+ -+ -
    clearWarnings()odbc::ErrorHandler
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    getWarnings()odbc::ErrorHandler
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_error_handler.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_error_handler.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_error_handler.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_error_handler.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,9 @@ -+‰PNG -+ -+ IHDRßÀ·Ùt‘PLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfXIDATxœí}n£<‡A¯Ô¿±o`öÕ®ôžg¤•zÿ#¬=6‚¡N136ÌS)„¯éï àTiFt]izUâé. ¯´Öeˆp%µ.C„+©u›}7Äç/ïÐ-Ö-·Û«U#‡Â/J·îíñTVÄMÐÆ=ôvÁàÖ  -+Û5CØÎ=ïût­jY†´*}§ìôî…· ó~òÛáó~Hת–pï'ˆ»†{\î••;ð}Ü…wjUË¡ðà7âZÏÂþõHÖª–w…ûÕîn ¯áîXXÝà”^ÒNjº†q”§´­‡y”Þ©U-ò—V%µ.C„+©u"\I­ËáJj]Æã>¦Íãƒ;5þîĥ̈́ã%·¬iÂ…6ÿ’|ámA=?äŸÒëQÚ%Qá©/àGé1ŒÒyÂëAuzò£´[î^àP6OxS߇Ý{ŽËÆŸßa¬ýFø­þ¥u¢šŸC„O#Â'«‰ð9Dø4Ÿ™ŸæñÆÇ´™¼ñ1mŸÝmîÔwb>×5ò4áÒ_¶¬žÇ ?nÐáÛܨîÔwj€;5À€à@ p ¸PܨîÔwj€;5À€à@ p ¸PܨîÔwj€;5À€à@ p(GÞ¿ºßh­ªâßʨa¾‰ðnïÓlHw™¦…÷š§°‡çÂÉÞ'­ÍÜN…3øu~übècr‹§Æ+׉Պp²÷ɵfÄvª03b³Lì©°óØeà¯:ÂÉÞ§QÏ­&z1ƒíA“°ž¦­ û‹4´'ùq*ÌÄþMß e¦ž¨[Çö$½œ™î8ÿM -+¿´*M§´ž…ñ^ -+7{J§zŸÆØD::J}G•Á”öã²oÆ /MCÂû¤{·÷ááˆpˆ°ßLøD›R›ÓæܨîÄ<®çqÂkãyœðã-¾=À€à@ p ¸PܨîÔwj€;5À€à@ p ¸PܨîÔwj€;5À€à@ p ¸PܨîÔw€räý«[ú–Úýʃ‹°ßE8u'¨ùÆC¸î°k©iáx“¦µða×RKÂûw‚Š÷~ -+ß|?èZjIx÷NPó½Ÿ|ƒËQ×Rs¯÷ ½+&£k©}aߘdÂÍ•|æA×RóÂë[!…þ¤ƒ®¥æ„“w‚Z_Ç]K- ïÝ -+%eâ(}صԒp!D¸FDX„EX„E¸fN´)m?¦ýj Ye›0éIEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,5 +0,0 @@ --GIF89a™ÀòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,™Àþ8ºÜþ0ÊI«½8Á»ÿ`(Ždižhª¦Êê¾p,ÏeKßx®ÃöîÿÀ\/H,IÃ]€³tžPZ³3]5«¾¤îúÂJ?^7¨µ>=g…K5³ ¯c§Q&¼šÖÏùu<1x~k‡~comˆ‰ŽTs†“Š‘•‚2…–”%Pyœœ›£ tž¤o,ƒ0›°—¬— €’·´ ·±{¡³'e)¼©c$Œh¹ÉÈ£»²‰Ë1ÁbÎ{•ÅÇnЫ´¨×†‹ÊÑ®¯t}v|ߺÏ趢¥qÌ“×å3ÒGøù:÷úýþ.üþ (" Áƒ "\ØO!ÇFBœøC"Å‹84hÜÈþ±£ÇˆI²¤É“(Sª\©ÒË—0cÊœI³¦M”.oêÜɳ§Ï”‚þJ´¨Ñ’As]Ê´éˤBJêªRªX³þ¼ªµ«×š\¿Š ”¬Ù³HѪ5v­[ªmßÊew®]¢uïêå™w¯_°÷ì+¸pKÈgNÌÀâƈC.,yràÊ–ýbάw3g»ž?Ë -Ú-éÒjO£>«z5ÙÖ®ÅÂF ²¶íÛ¸5bÜÏ"ïß+|nB8ñã!Œ#_ÎA¹¦g*Ö½ƒ¦„̸|Å¢/cõ‹õ ¡ª©i7ÂKžó‡Òe÷U­çƨ¥ïÖíN3yiâá÷þzþŽaÞLW)òHÌ}ù‡€NÏ"ëðgJƒ;ÀW5 --Æv÷™ç‰‡¨d¡à ¼Ì—a-â×!}*ö^9úÅA^}\ÑGz%²±M{"2ç#@#þ($¹[‘F^„d’-ÉäCN>¹P”R”Û•Xfyg³ÅÖU—^b•T˜‚I¦fP¹—UjjÖæ_`¾I—œkÒÙ™wʼn'^{Î¥gŸ>ý (_ƒšVèZ‚jS¢ŠÒÄh£2= --)L’NÊR¥––éW˜nzR§ž¦ªV Ž*R©¦¢:ªª¡²z”)°Æ*무Öjë­¸æªë®µšŠÕ¾Rl°R KlSÆþ»T²/ ’³4™ò´€2µ&a;”¶Õr»´Þ²„m¸NK’¹(‘»·Ì>›,°æ¾ÛîµçÒ ®±ÎÊ;nµîŽ›ï³Ù E¿ŒnÁü --Ìl»Ô¢«0ÀüBìp½îB±À7|°Ã—´±Äôv+òÇ"_p¶!7œ±Å)IrÄ&³¼òÌ*Ÿ[3Å$O sÎ'{œòÏ ›îµÖîL4¾Gc,sÐÝ*í²ÎOm3ÊLó,ôI7¿L²Ñ>3sÍ6Í=Süõ½UµÖÇÌ5×hÃüµØt»mõÔûk²¾uSp¾þþ+÷ÀDïLxÉþwÕHK¬í¼k©‹äjþI^åhY.æÊöÄyçëjºMŸNºè¦ÏÄëꬷîúë°ÇÊeêF¹š©™´Uî|¥ÉûNlþN¨ðƒ_¼ñÀ#Ÿ¼ò7Ù~;óÍC¿¨ô€Q¯˜õ×c“ó–r?©÷‚ߨøŠ’¨ù…¢?¨ú€²ß§û{§üvÒ/“–ø?`@þü3P¥”TúŸ@(@°€ú8 {¤O@':áA‘†¦3 ép³0Nv´Ã MDÙÀ}Á†Ç2BÃ)¨†tÀ#.tÏÑc£Âê±aA‚T"±ˆ?#”,„øû´) #Jx¡ŠPÝ"†€x}ȇ@J|â¤Á ÅŠç)"$ A‘q‰êã=ÀÅ)R(„A¼¢)˜¢yPŠod#åãÃ0CT´Æå¨ --,"hƒ[4!Œ,£aô‚<1Ò‘x„‡FVòçÀ$!Ùó(pi (óÉQ~Ç”Ì)%*{´J䨲•B%,!Ò¿ZÚ’ ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,78 +1,74 @@ -- -+ - --odbc::PreparedStatement class Reference -+libodbc++: odbc::PreparedStatement Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::PreparedStatement Class Reference

    A prepared statement. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::PreparedStatement Class Reference

    A prepared statement. - More... -

    - #include <preparedstatement.h> -

    -

    Inheritance diagram for odbc::PreparedStatement: --

    -+

    - - odbc::Statement - odbc::ErrorHandler - odbc::CallableStatement - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    - -+
    Executes this statement, assuming it returns an update count.
  • void setDouble (int idx, double val) -+
    Sets a parameter value to a double.
  • void setBoolean (int idx, bool val) -+
    Sets a parameter value to a bool.
  • void setByte (int idx, signed char val) -+
    Sets a parameter value to signed char.
  • void setBytes (int idx, const Bytes &val) -+
    Sets a parameter value to a chunk of bytes.
  • void setDate (int idx, const Date &val) -+
    Sets a parameter value to a Date.
  • void setFloat (int idx, float val) -+
    Sets a parameter value to a float.
  • void setInt (int idx, int val) -+
    Sets a parameter value to an int.
  • void setLong (int idx, Long val) -+
    Sets a parameter value to a Long.
  • void setShort (int idx, short val) -+
    Sets a parameter value to a short.
  • void setString (int idx, const std::string &val) -+
    Sets a parameter value to a string.
  • void setTime (int idx, const Time &val) -+
    Sets a parameter value to a Time.
  • void setTimestamp (int idx, const Timestamp &val) -+
    Sets a parameter value to a Timestamp.
  • void setAsciiStream (int idx, std::istream *s, int len) -+
    Sets a parameter value to an ascii stream.
  • void setBinaryStream (int idx, std::istream *s, int len) -+
    Sets a parameter value to a binary stream.
  • void setNull (int idx, int sqlType) -+
    Sets a parameter value to NULL.
    -

    Detailed Description

    --A prepared statement. -+A prepared statement. -

    --A prepared statement is precompiled by the driver and/or datasource, and can be executed multiple times with different parameters. --

    --Parameters are set using the setXXX methods. Note that it's advisable to use the set method compatible with the parameter's SQL type - for example, for a Types::DATE, setDate() should be used. Question marks ("?") are used in the SQL statement to represent a parameter, for example: 

    -- PreparedStatement* pstmt=con->prepareStatement
-+A prepared statement is precompiled by the driver and/or datasource, and can be executed multiple times with different parameters.
    
-+Parameters are set using the setXXX methods. Note that it's advisable to use the set method compatible with the parameter's SQL type - for example, for a Types::DATE, setDate() should be used. Question marks ("?") are used in the SQL statement to represent a parameter, for example: 
    -+ PreparedStatement* pstmt=con->prepareStatement
-     ("INSERT INTO SOMETABLE(AN_INTEGER_COL,A_VARCHAR_COL) VALUES(?,?)");
-  pstmt->setInt(1,10);
-  pstmt->setString(2,"Hello, world!");
-- int affectedRows=pstmt->executeUpdate();
-- 
     
    
--See also: 
    
--Connection::prepareStatement() 
    
-+ int affectedRows=pstmt->executeUpdate();
-+
    See also:
    Connection::prepareStatement()
    -+ -

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -85,24 +81,23 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    void odbc::PreparedStatement::clearParameters void odbc::PreparedStatement::clearParameters (   )   ) 
    -
    - -

    --Clears the parameters. -+Clears the parameters. -

    - The set of parameters stays around until they are set again. To explicitly clear them (and thus release buffers held by the driver), this method should be called.

    --

    -- -+

    -+

    - -- - -@@ -115,42 +110,40 @@ - -+
    Returns:
    True if the result is a ResultSet, false if it's an update count or unknown.
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::PreparedStatement::execute bool odbc::PreparedStatement::execute (   )   ) 
    -
    - -

    --Executes this statement. -+Executes this statement. -

    --

    --Returns:
    --True if the result is a ResultSet, false if it's an update count or unknown.
    --

    -- -+

    -+

    - -- - -@@ -163,50 +156,46 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setAsciiStream void odbc::PreparedStatement::setAsciiStream ( int   idx, idx,
    std::istream *   s, s,
    int   len len
    ) 
    -
    - -

    --Sets a parameter value to an ascii stream. -+Sets a parameter value to an ascii stream. -

    --

    --Parameters:
    -- -- -- -- --
    idx  --The parameter index, starting at 1
    s  --The stream to assign
    len  --The number of bytes available in the stream
    --
    -+ -+ -+ -+
    idx The parameter index, starting at 1
    s The stream to assign
    len The number of bytes available in the stream
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -219,44 +208,40 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setBinaryStream void odbc::PreparedStatement::setBinaryStream ( int   idx, idx,
    std::istream *   s, s,
    int   len len
    ) 
    -
    - -

    --Sets a parameter value to a binary stream. -+Sets a parameter value to a binary stream. -

    --

    --Parameters:
    -- -- -- -- --
    idx  --The parameter index, starting at 1
    s  --The stream to assign
    len  --The number of bytes available in the stream
    --
    -+ -+ -+ -+
    idx The parameter index, starting at 1
    s The stream to assign
    len The number of bytes available in the stream
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -269,42 +254,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setBoolean void odbc::PreparedStatement::setBoolean ( int   idx, idx,
    bool   val val
    ) 
    -
    - -

    --Sets a parameter value to a bool. -+Sets a parameter value to a bool. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -317,42 +299,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setByte void odbc::PreparedStatement::setByte ( int   idx, idx,
    signed char   val val
    ) 
    -
    - -

    --Sets a parameter value to signed char. -+Sets a parameter value to signed char. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -365,42 +344,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setBytes void odbc::PreparedStatement::setBytes ( int   idx, idx,
    const Bytes &   val val
    ) 
    -
    - -

    --Sets a parameter value to a chunk of bytes. -+Sets a parameter value to a chunk of bytes. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -413,42 +389,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setDate void odbc::PreparedStatement::setDate ( int   idx, idx,
    const Date &   val val
    ) 
    -
    - -

    --Sets a parameter value to a Date. -+Sets a parameter value to a Date. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -461,42 +434,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setDouble void odbc::PreparedStatement::setDouble ( int   idx, idx,
    double   val val
    ) 
    -
    - -

    --Sets a parameter value to a double. -+Sets a parameter value to a double. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -509,42 +479,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setFloat void odbc::PreparedStatement::setFloat ( int   idx, idx,
    float   val val
    ) 
    -
    - -

    --Sets a parameter value to a float. -+Sets a parameter value to a float. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -557,42 +524,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setInt void odbc::PreparedStatement::setInt ( int   idx, idx,
    int   val val
    ) 
    -
    - -

    --Sets a parameter value to an int. -+Sets a parameter value to an int. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -605,42 +569,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setLong void odbc::PreparedStatement::setLong ( int   idx, idx,
    Long   val val
    ) 
    -
    - -

    --Sets a parameter value to a Long. -+Sets a parameter value to a Long. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -653,44 +614,40 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setNull void odbc::PreparedStatement::setNull ( int   idx, idx,
    int   sqlType sqlType
    ) 
    -
    - -

    --Sets a parameter value to NULL. -+Sets a parameter value to NULL. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    sqlType  --The SQL type of the parameter
    --
    --See also:
    --Types
    -+ -+ -+
    idx The parameter index, starting at 1
    sqlType The SQL type of the parameter
    -+ -+

    See also:
    Types
    -+ - - --

    -- -+

    -+

    - -- - -@@ -703,42 +660,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setShort void odbc::PreparedStatement::setShort ( int   idx, idx,
    short   val val
    ) 
    -
    - -

    --Sets a parameter value to a short. -+Sets a parameter value to a short. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -751,42 +705,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setString void odbc::PreparedStatement::setString ( int   idx, idx,
    const std::string &   val val
    ) 
    -
    - -

    --Sets a parameter value to a string. -+Sets a parameter value to a string. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -799,42 +750,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setTime void odbc::PreparedStatement::setTime ( int   idx, idx,
    const Time &   val val
    ) 
    -
    - -

    --Sets a parameter value to a Time. -+Sets a parameter value to a Time. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -847,21 +795,19 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::PreparedStatement::setTimestamp void odbc::PreparedStatement::setTimestamp ( int   idx, idx,
    const Timestamp &   val val
    ) 
    -
    - -

    --Sets a parameter value to a Timestamp. -+Sets a parameter value to a Timestamp. -

    --

    --Parameters:
    -- -- -- --
    idx  --The parameter index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The parameter index, starting at 1
    val The value to set
    -+ -+ - - -

    The documentation for this class was generated from the following file: -+
  • odbc++/preparedstatement.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,59 +1,58 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::PreparedStatement Member List

    This is the complete list of members for odbc::PreparedStatement, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::PreparedStatement Member List

    This is the complete list of members for odbc::PreparedStatement, including all inherited members.

    cancel()odbc::Statement
    clearParameters()odbc::PreparedStatement
    clearWarnings()odbc::ErrorHandler
    close()odbc::Statement
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    execute()odbc::PreparedStatement
    odbc::Statement::execute(const std::string &sql)odbc::Statement [virtual]
    executeQuery()odbc::PreparedStatement
    odbc::Statement::executeQuery(const std::string &sql)odbc::Statement [virtual]
    executeUpdate()odbc::PreparedStatement
    odbc::Statement::executeUpdate(const std::string &sql)odbc::Statement [virtual]
    getConnection()odbc::Statement
    getEscapeProcessing()odbc::Statement
    getFetchSize()odbc::Statement
    getMaxFieldSize()odbc::Statement
    getMaxRows()odbc::Statement
    getMoreResults()odbc::Statement
    getQueryTimeout()odbc::Statement
    getResultSet()odbc::Statement
    getResultSetConcurrency()odbc::Statement
    getResultSetType()odbc::Statement
    getUpdateCount()odbc::Statement
    getWarnings()odbc::ErrorHandler
    setAsciiStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBinaryStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBoolean(int idx, bool val)odbc::PreparedStatement
    setByte(int idx, signed char val)odbc::PreparedStatement
    setBytes(int idx, const Bytes &val)odbc::PreparedStatement
    setCursorName(const std::string &name)odbc::Statement
    setDate(int idx, const Date &val)odbc::PreparedStatement
    setDouble(int idx, double val)odbc::PreparedStatement
    setEscapeProcessing(bool on)odbc::Statement
    setFetchSize(int size)odbc::Statement
    setFloat(int idx, float val)odbc::PreparedStatement
    setInt(int idx, int val)odbc::PreparedStatement
    setLong(int idx, Long val)odbc::PreparedStatement
    setMaxFieldSize(int maxFieldSize)odbc::Statement
    setMaxRows(int maxRows)odbc::Statement
    setNull(int idx, int sqlType)odbc::PreparedStatement
    setQueryTimeout(int seconds)odbc::Statement
    setShort(int idx, short val)odbc::PreparedStatement
    setString(int idx, const std::string &val)odbc::PreparedStatement
    setTime(int idx, const Time &val)odbc::PreparedStatement
    setTimestamp(int idx, const Timestamp &val)odbc::PreparedStatement
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~PreparedStatement()odbc::PreparedStatement [virtual]
    ~Statement()odbc::Statement [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    cancel()odbc::Statement
    clearParameters()odbc::PreparedStatement
    clearWarnings()odbc::ErrorHandler
    close()odbc::Statement
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    execute()odbc::PreparedStatement
    odbc::Statement::execute(const std::string &sql)odbc::Statement [virtual]
    executeQuery()odbc::PreparedStatement
    odbc::Statement::executeQuery(const std::string &sql)odbc::Statement [virtual]
    executeUpdate()odbc::PreparedStatement
    odbc::Statement::executeUpdate(const std::string &sql)odbc::Statement [virtual]
    getConnection()odbc::Statement
    getEscapeProcessing()odbc::Statement
    getFetchSize()odbc::Statement
    getMaxFieldSize()odbc::Statement
    getMaxRows()odbc::Statement
    getMoreResults()odbc::Statement
    getQueryTimeout()odbc::Statement
    getResultSet()odbc::Statement
    getResultSetConcurrency()odbc::Statement
    getResultSetType()odbc::Statement
    getUpdateCount()odbc::Statement
    getWarnings()odbc::ErrorHandler
    setAsciiStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBinaryStream(int idx, std::istream *s, int len)odbc::PreparedStatement
    setBoolean(int idx, bool val)odbc::PreparedStatement
    setByte(int idx, signed char val)odbc::PreparedStatement
    setBytes(int idx, const Bytes &val)odbc::PreparedStatement
    setCursorName(const std::string &name)odbc::Statement
    setDate(int idx, const Date &val)odbc::PreparedStatement
    setDouble(int idx, double val)odbc::PreparedStatement
    setEscapeProcessing(bool on)odbc::Statement
    setFetchSize(int size)odbc::Statement
    setFloat(int idx, float val)odbc::PreparedStatement
    setInt(int idx, int val)odbc::PreparedStatement
    setLong(int idx, Long val)odbc::PreparedStatement
    setMaxFieldSize(int maxFieldSize)odbc::Statement
    setMaxRows(int maxRows)odbc::Statement
    setNull(int idx, int sqlType)odbc::PreparedStatement
    setQueryTimeout(int seconds)odbc::Statement
    setShort(int idx, short val)odbc::PreparedStatement
    setString(int idx, const std::string &val)odbc::PreparedStatement
    setTime(int idx, const Time &val)odbc::PreparedStatement
    setTimestamp(int idx, const Timestamp &val)odbc::PreparedStatement
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~PreparedStatement()odbc::PreparedStatement [virtual]
    ~Statement()odbc::Statement [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_prepared_statement.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_prepared_statement.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,3 @@ -+‰PNG -+ -+ IHDR™ÀåóܶPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfùIDATxœí›]ŽÜ €ÃKŸ±o`NPµ©ÒÜÿÅ6†üLf‚º©Öd7 g”ÇL¿¦ŸÓ¯4.9m ©^Î$$/ÚuÒ–’7iy&„H”3¨4® -K¤A®–Vˆ;´,Î#ò‘‡ÖÑsoî(礤d­ìÍJcɤ‚× ¥^Pm89ºi¢i£©¦¦ƒ]¡ábné„V×í„Fgš.mÊ=lÝDbš’ÚÄlºK»šœæ´3ÚØ'`_zt¶ûÚç}iÏç㶴;ÛÔiNsšÓœæ4§¦±ßïü½÷»Óæî ýÙ»ñXຢƒFVúˆöÊ)ùg´žˆ«O„àœ¶qŠ°Ç£y,¡ùD:isǃøWTyó¹¬äïѤêÿ dùg4šMKt.y?måÁÙº½§éÆ)"÷²‹—D”:lz%9Íig´±OÀ±Oç/ ¹?äÃ4æ4§9ÍiNsšÓþ! ¦8Å8í2-†Z^7YTº¬göiÛÆ&ˆòHËã…CÈTZ®€Éê¤0òD9qµôŽRRZàñ\2Ë8´®r¢hô< ÎU³F+mÚºE«+—¥JCÆÚ{—¦ “?*¡.|)èÚOFN%ï 5ѼЦ5Ù²liuÝæ´ZmÝæ´×š.mZ†›´ uA lSV› ¨V”± Œ{þY‡ÒuúŸiï%§}JûìK¸?ä´;ÛÔiNsšÓœæ4§¦¾÷^:ߎÝù=àw¤-^烾Œo±"#Ûš±~ñO‡4*V4´F‡4õàH Pk h${Yd^(Â%Ô]¥W¡é“|”=%À¡5hxïÏHµIî Û5´ÛšV¢!RÓ¤lÀiýa Ä dc`  F†è–’²¸R¯BÍ{h3Më,gÓJuóÐKZ]·dA!›u›Óö5]ÚTL%—º)†ªMù~cª5†u¼õýv=9Íig´ á Û'à_‘q/?ÂÓ«IEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF89ayPòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,yPþ8ºÜþ0ÊI«½JèÍ»ÿ`(ŽdišÙ©®lë–é+Ït­Åv®ïÎÿ@™ÐY¤’vÜ4WÇ'j5¶¤ÌÖe Kg±›ä„?[°Z-;ÙZqsü,wn«t8·‚Û~}kwyn‚~okƒw€ƒ‹‰|‹‚–DJ†f‘ˆ™g• Šˆ”¢§#iuœ­›x‡¡©ž‘¥Tq¨„„!«¯Œ¸—¹¨¾¶…¡‡ŽµÅÅÀ£Á²ŽÊÏ=·Zy‰duš™µÛ¬Š£v¿b©á“ÖAìíSîðñ _òõAôöù:øúý3üþzY'°  €†ÀÀ°¡Ã‡'˜H±¢Å‹3jÜhþÑÇ CŠI²dE&Sª\ɤ—-cÊœ9ò%Jš8sÒ´ S§ÏŸ&yÞJ´èÆ¡F“*ˆt©S MŸJÅuªÕ–U¯j ºµ+ˬ^ÃKV$زhœMKv-Û°nßv+W+ݺVï╪w¯Ó¾~•lt0a¢†ÿL¬X'ãÆT!Õìõ1嘖‰zÚ̹³çÏ C‹M:ôe­IN_M­z*ëÖO_Ã^*»e€‰·Kzb™;7€L}‹¬Í·IáÂuÿ]1ysÝÎ?*i~»÷oäÄ)"×.ûµoëÓ£_ï=¸xß—³^¿œ¹{ëÚÛÇÿ^~òôîG–G??†}úè'_{ÖG]êw^Fø5Øß‚Žç~FGÞtù áEª÷ tÏehÑf !íÇà‡×á6‚#†Øá|/šXà†â8bwÕÇãŒ!Žw w^ˆÝw:9›S*.©S“Nâe”3MIeLV^É[’Zª”e—)•&æ˜d–i&h ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,158 +1,158 @@ -- -+ - --odbc::ResultSet class Reference -+libodbc++: odbc::ResultSet Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::ResultSet Class Reference

    A result set. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::ResultSet Class Reference

    A result set. - More... -

    - #include <resultset.h> -

    -

    Inheritance diagram for odbc::ResultSet: --

    -+

    - - odbc::ErrorHandler - - List of all members.

    Public Types

    - --

    Public Methods

    -+
    ResultSet type constants. More...
    -+

    Public Member Functions

    -
      --
    • -+
    • - virtual ~ResultSet () --
      Destructor.

    • bool absolute (int row) --
      Moves the cursor to a specific row in this result set. More...

    • bool relative (int rows) --
      Moves the cursor inside the result set relative to the current row. More...

    • -+
      Destructor.
    • bool absolute (int row) -+
      Moves the cursor to a specific row in this result set.
    • bool relative (int rows) -+
      Moves the cursor inside the result set relative to the current row.
    • - void afterLast () --
      Places the cursor after the last row in the result set.

    • -+
      Places the cursor after the last row in the result set.
    • - void beforeFirst () --
      Places the cursor before the first row in the result set.

    • -+
      Places the cursor before the first row in the result set.
    • - bool isAfterLast () --
      Checks if the cursor is after the last row in the result set.

    • -+
      Checks if the cursor is after the last row in the result set.
    • - bool isBeforeFirst () --
      Checks if the cursor is before the first row in the result set.

    • -+
      Checks if the cursor is before the first row in the result set.
    • - bool isFirst () --
      Checks if the cursor is on the first row in the result set.

    • -+
      Checks if the cursor is on the first row in the result set.
    • - bool isLast () --
      Checks if the cursor is on the last row in the result set.

    • int getRow () --
      Returns the current row number. More...

    • bool next () --
      Moves to the next row in the result set. More...

    • bool previous () --
      Moves to the previous row in the result set. More...

    • bool first () --
      Moves to the first row in the result set. More...

    • bool last () --
      Moves to the last row in the result set. More...

    • void moveToInsertRow () --
      Moves the cursor to the 'insert row' of this result set. More...

    • -+
      Checks if the cursor is on the last row in the result set.
    • int getRow () -+
      Returns the current row number.
    • bool next () -+
      Moves to the next row in the result set.
    • bool previous () -+
      Moves to the previous row in the result set.
    • bool first () -+
      Moves to the first row in the result set.
    • bool last () -+
      Moves to the last row in the result set.
    • void moveToInsertRow () -+
      Moves the cursor to the 'insert row' of this result set.
    • - void moveToCurrentRow () --
      Moves the cursor back to where it was before it was moved to the insert row.

    • -+
      Moves the cursor back to where it was before it was moved to the insert row.
    • - void refreshRow () --
      Refreshes the current row.

    • -+
      Refreshes the current row.
    • - void deleteRow () --
      Deletes the current row.

    • void insertRow () --
      Inserts the current row. More...

    • -+
      Deletes the current row.
    • void insertRow () -+
      Inserts the current row.
    • - void updateRow () --
      Updates the current row.

    • -+
      Updates the current row.
    • - void cancelRowUpdates () --
      Cancels any updates done to the current row.

    • ResultSetMetaData * getMetaData () --
      Returns meta data about this result set. More...

    • -+
      Cancels any updates done to the current row.
    • ResultSetMetaData * getMetaData () -+
      Returns meta data about this result set.
    • - int findColumn (const std::string &colName) --
      Find a column index by the column's name.

    • -+
      Find a column index by the column's name.
    • - bool rowDeleted () --
      Checks if the current row is deleted.

    • -+
      Checks if the current row is deleted.
    • - bool rowInserted () --
      Checks if the current row was inserted.

    • -+
      Checks if the current row was inserted.
    • - bool rowUpdated () --
      Checks if the current row was updated.

    • -+
      Checks if the current row was updated.
    • - int getType () --
      Gets the type of this result set.

    • -+
      Gets the type of this result set.
    • - int getConcurrency () --
      Gets the concurrency of this result set.

    • -+
      Gets the concurrency of this result set.
    • - int getFetchSize () --
      Gets this result set's current fetch size.

    • -+
      Gets this result set's current fetch size.
    • - void setFetchSize (int fetchSize) --
      Sets this result set's fetch size (doesn't apply immediately).

    • -+
      Sets this result set's fetch size (doesn't apply immediately).
    • - std::string getCursorName () --
      Gets the cursor name associated with this result set.

    • -+
      Gets the cursor name associated with this result set.
    • - Statement * getStatement () --
      Gets the Statement that created this result set.

    • double getDouble (int idx) --
      Gets a column's value as a double. More...

    • bool getBoolean (int idx) --
      Gets a column's value as a bool. More...

    • signed char getByte (int idx) --
      Gets a column's value as a signed char. More...

    • Bytes getBytes (int idx) --
      Gets a column's value as a chunk of bytes. More...

    • Date getDate (int idx) --
      Gets a column's value as a Date. More...

    • float getFloat (int idx) --
      Gets a column's value as a float. More...

    • int getInt (int idx) --
      Gets a column's value as an int. More...

    • Long getLong (int idx) --
      Gets a column's value as a Long. More...

    • short getShort (int idx) --
      Gets a column's value as a short. More...

    • std::string getString (int idx) --
      Gets a column's value as a string. More...

    • Time getTime (int idx) --
      Gets a column's value as a Time. More...

    • Timestamp getTimestamp (int idx) --
      Gets a column's value as a Timestamp. More...

    • double getDouble (const std::string &colName) --
      Gets a column's value as a double. More...

    • bool getBoolean (const std::string &colName) --
      Gets a column's value as a bool. More...

    • signed char getByte (const std::string &colName) --
      Gets a column's value as a signed char. More...

    • Bytes getBytes (const std::string &colName) --
      Gets a column's value as a chunk of bytes. More...

    • Date getDate (const std::string &colName) --
      Gets a column's value as a Date. More...

    • float getFloat (const std::string &colName) --
      Gets a column's value as a float. More...

    • int getInt (const std::string &colName) --
      Gets a column's value as an int. More...

    • Long getLong (const std::string &colName) --
      Gets a column's value as a Long. More...

    • short getShort (const std::string &colName) --
      Gets a column's value as a short. More...

    • std::string getString (const std::string &colName) --
      Gets a column's value as a string. More...

    • Time getTime (const std::string &colName) --
      Gets a column's value as a Time. More...

    • Timestamp getTimestamp (const std::string &colName) --
      Gets a column's value as a Timestamp. More...

    • std::istream * getAsciiStream (int idx) --
      Fetches a column's value as a stream. More...

    • std::istream * getAsciiStream (const std::string &colName) --
      Fetches a column's value as a stream. More...

    • std::istream * getBinaryStream (int idx) --
      Fetches a column's value as a stream. More...

    • std::istream * getBinaryStream (const std::string &colName) --
      Fetches a column's value as a stream. More...

    • bool wasNull () --
      Checks if the last fetched column value was NULL. More...

    • void updateDouble (int idx, double val) --
      Sets the value of a column to a double. More...

    • void updateBoolean (int idx, bool val) --
      Sets the value of a column to a bool. More...

    • void updateByte (int idx, signed char val) --
      Sets the value of a column to a signed char. More...

    • void updateBytes (int idx, const Bytes &val) --
      Sets the value of a column to a chunk of bytes. More...

    • void updateDate (int idx, const Date &val) --
      Sets the value of a column to a Date. More...

    • void updateFloat (int idx, float val) --
      Sets the value of a column to a float. More...

    • void updateInt (int idx, int val) --
      Sets the value of a column to an int. More...

    • void updateLong (int idx, Long val) --
      Sets the value of a column to a Long. More...

    • void updateShort (int idx, short val) --
      Sets the value of a column to a short. More...

    • void updateString (int idx, const std::string &val) --
      Sets the value of a column to a string. More...

    • void updateTime (int idx, const Time &val) --
      Sets the value of a column to a Time. More...

    • void updateTimestamp (int idx, const Timestamp &val) --
      Sets the value of a column to a Timestamp. More...

    • void updateNull (int idx) --
      Sets the value of a column to NULL. More...

    • void updateDouble (const std::string &colName, double val) --
      Sets the value of a column to a double. More...

    • void updateBoolean (const std::string &colName, bool val) --
      Sets the value of a column to a bool. More...

    • void updateByte (const std::string &colName, signed char val) --
      Sets the value of a column to a signed char. More...

    • void updateBytes (const std::string &colName, const Bytes &val) --
      Sets the value of a column to a chunk of bytes. More...

    • void updateDate (const std::string &colName, const Date &val) --
      Sets the value of a column to a Date. More...

    • void updateFloat (const std::string &colName, float val) --
      Sets the value of a column to a float. More...

    • void updateInt (const std::string &colName, int val) --
      Sets the value of a column to an int. More...

    • void updateLong (const std::string &colName, Long val) --
      Sets the value of a column to a Long. More...

    • void updateShort (const std::string &colName, short val) --
      Sets the value of a column to a short. More...

    • void updateString (const std::string &colName, const std::string &val) --
      Sets the value of a column to a string. More...

    • void updateTime (const std::string &colName, const Time &val) --
      Sets the value of a column to a Time. More...

    • void updateTimestamp (const std::string &colName, const Timestamp &val) --
      Sets the value of a column to a Timestamp. More...

    • void updateAsciiStream (int idx, std::istream *s, int len) --
      Sets the value of a column to a stream. More...

    • void updateAsciiStream (const std::string &colName, std::istream *s, int len) --
      Sets the value of a column to the contens of a stream. More...

    • void updateBinaryStream (int idx, std::istream *s, int len) --
      Sets the value of a column to the contens of a stream. More...

    • void updateBinaryStream (const std::string &colName, std::istream *s, int len) --
      Sets the value of a column to the contens of a stream. More...

    • void updateNull (const std::string &colName) --
      Sets the value of a column to NULL. More...

    -+
    Gets the Statement that created this result set.
  • double getDouble (int idx) -+
    Gets a column's value as a double.
  • bool getBoolean (int idx) -+
    Gets a column's value as a bool.
  • signed char getByte (int idx) -+
    Gets a column's value as a signed char.
  • Bytes getBytes (int idx) -+
    Gets a column's value as a chunk of bytes.
  • Date getDate (int idx) -+
    Gets a column's value as a Date.
  • float getFloat (int idx) -+
    Gets a column's value as a float.
  • int getInt (int idx) -+
    Gets a column's value as an int.
  • Long getLong (int idx) -+
    Gets a column's value as a Long.
  • short getShort (int idx) -+
    Gets a column's value as a short.
  • std::string getString (int idx) -+
    Gets a column's value as a string.
  • Time getTime (int idx) -+
    Gets a column's value as a Time.
  • Timestamp getTimestamp (int idx) -+
    Gets a column's value as a Timestamp.
  • double getDouble (const std::string &colName) -+
    Gets a column's value as a double.
  • bool getBoolean (const std::string &colName) -+
    Gets a column's value as a bool.
  • signed char getByte (const std::string &colName) -+
    Gets a column's value as a signed char.
  • Bytes getBytes (const std::string &colName) -+
    Gets a column's value as a chunk of bytes.
  • Date getDate (const std::string &colName) -+
    Gets a column's value as a Date.
  • float getFloat (const std::string &colName) -+
    Gets a column's value as a float.
  • int getInt (const std::string &colName) -+
    Gets a column's value as an int.
  • Long getLong (const std::string &colName) -+
    Gets a column's value as a Long.
  • short getShort (const std::string &colName) -+
    Gets a column's value as a short.
  • std::string getString (const std::string &colName) -+
    Gets a column's value as a string.
  • Time getTime (const std::string &colName) -+
    Gets a column's value as a Time.
  • Timestamp getTimestamp (const std::string &colName) -+
    Gets a column's value as a Timestamp.
  • std::istream * getAsciiStream (int idx) -+
    Fetches a column's value as a stream.
  • std::istream * getAsciiStream (const std::string &colName) -+
    Fetches a column's value as a stream.
  • std::istream * getBinaryStream (int idx) -+
    Fetches a column's value as a stream.
  • std::istream * getBinaryStream (const std::string &colName) -+
    Fetches a column's value as a stream.
  • bool wasNull () -+
    Checks if the last fetched column value was NULL.
  • void updateDouble (int idx, double val) -+
    Sets the value of a column to a double.
  • void updateBoolean (int idx, bool val) -+
    Sets the value of a column to a bool.
  • void updateByte (int idx, signed char val) -+
    Sets the value of a column to a signed char.
  • void updateBytes (int idx, const Bytes &val) -+
    Sets the value of a column to a chunk of bytes.
  • void updateDate (int idx, const Date &val) -+
    Sets the value of a column to a Date.
  • void updateFloat (int idx, float val) -+
    Sets the value of a column to a float.
  • void updateInt (int idx, int val) -+
    Sets the value of a column to an int.
  • void updateLong (int idx, Long val) -+
    Sets the value of a column to a Long.
  • void updateShort (int idx, short val) -+
    Sets the value of a column to a short.
  • void updateString (int idx, const std::string &val) -+
    Sets the value of a column to a string.
  • void updateTime (int idx, const Time &val) -+
    Sets the value of a column to a Time.
  • void updateTimestamp (int idx, const Timestamp &val) -+
    Sets the value of a column to a Timestamp.
  • void updateNull (int idx) -+
    Sets the value of a column to NULL.
  • void updateDouble (const std::string &colName, double val) -+
    Sets the value of a column to a double.
  • void updateBoolean (const std::string &colName, bool val) -+
    Sets the value of a column to a bool.
  • void updateByte (const std::string &colName, signed char val) -+
    Sets the value of a column to a signed char.
  • void updateBytes (const std::string &colName, const Bytes &val) -+
    Sets the value of a column to a chunk of bytes.
  • void updateDate (const std::string &colName, const Date &val) -+
    Sets the value of a column to a Date.
  • void updateFloat (const std::string &colName, float val) -+
    Sets the value of a column to a float.
  • void updateInt (const std::string &colName, int val) -+
    Sets the value of a column to an int.
  • void updateLong (const std::string &colName, Long val) -+
    Sets the value of a column to a Long.
  • void updateShort (const std::string &colName, short val) -+
    Sets the value of a column to a short.
  • void updateString (const std::string &colName, const std::string &val) -+
    Sets the value of a column to a string.
  • void updateTime (const std::string &colName, const Time &val) -+
    Sets the value of a column to a Time.
  • void updateTimestamp (const std::string &colName, const Timestamp &val) -+
    Sets the value of a column to a Timestamp.
  • void updateAsciiStream (int idx, std::istream *s, int len) -+
    Sets the value of a column to a stream.
  • void updateAsciiStream (const std::string &colName, std::istream *s, int len) -+
    Sets the value of a column to the contens of a stream.
  • void updateBinaryStream (int idx, std::istream *s, int len) -+
    Sets the value of a column to the contens of a stream.
  • void updateBinaryStream (const std::string &colName, std::istream *s, int len) -+
    Sets the value of a column to the contens of a stream.
  • void updateNull (const std::string &colName) -+
    Sets the value of a column to NULL.
    -

    Detailed Description

    --A result set. -+A result set. -

    -

    Member Enumeration Documentation

    --

    -- -+

    -+

    - -- - -@@ -165,27 +165,27 @@ - - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --ResultSet concurrency constants. -+ResultSet concurrency constants. -

    --

    --Enumeration values:
    -+
    Enumeration values:
    - -- -- -+ -+ -
    CONCUR_READ_ONLY  --The ResultSet is read only.
    CONCUR_UPDATABLE  --The ResultSet is updatable.
    CONCUR_READ_ONLY  -+The ResultSet is read only.
    CONCUR_UPDATABLE  -+The ResultSet is updatable.
    -
    -
    --

    -- -+

    -+

    - -- - -@@ -198,37 +198,35 @@ - - -
    -+ - - -- -+ -
    anonymous enum -+ anonymous enum
    -
    - -

    --ResultSet type constants. -+ResultSet type constants. -

    --

    --Enumeration values:
    -+
    Enumeration values:
    - -- -- -- -+ -+ -+ -
    TYPE_FORWARD_ONLY  --The result set only goes forward.
    TYPE_SCROLL_INSENSITIVE  --The result set is scrollable, but the data in it is not affected by changes in the database.
    TYPE_SCROLL_SENSITIVE  --The result set is scrollable and sensitive to database changes.
    TYPE_FORWARD_ONLY  -+The result set only goes forward.
    TYPE_SCROLL_INSENSITIVE  -+The result set is scrollable, but the data in it is not affected by changes in the database.
    TYPE_SCROLL_SENSITIVE  -+The result set is scrollable and sensitive to database changes.
    -
    -
    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -241,26 +239,24 @@ - -+If row is negative, the actual row number is calculated from the end of the result set. Calling absolute(0) is equivalent to calling beforeFirst()
    Returns:
    true if the cursor is in the result set
    -+ - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::absolute bool odbc::ResultSet::absolute ( int   row )  row  ) 
    -
    - -

    --Moves the cursor to a specific row in this result set. -+Moves the cursor to a specific row in this result set. -

    --If row is negative, the actual row number is calculated from the end of the result set. Calling absolute(0) is equivalent to calling beforeFirst()

    --Returns:
    --true if the cursor is in the result set
    --

    -- -+

    -+

    - -- - -@@ -273,27 +269,25 @@ - -+
    Returns:
    true if the cursor is in the result set
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::first bool odbc::ResultSet::first (   )   ) 
    -
    - -

    --Moves to the first row in the result set. -+Moves to the first row in the result set. -

    --

    --Returns:
    --true if the cursor is in the result set
    --

    -- -+

    -+

    - -- - -@@ -306,31 +300,29 @@ - -+Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::istream* odbc::ResultSet::getAsciiStream std::istream* odbc::ResultSet::getAsciiStream ( const std::string &   colName )  colName  ) 
    -
    - -

    --Fetches a column's value as a stream. -+Fetches a column's value as a stream. -

    --Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.

    --Parameters:
    -- -- --
    colName  --The column name
    --
    -+ -+
    colName The column name
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -343,31 +335,29 @@ - -+Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::istream* odbc::ResultSet::getAsciiStream std::istream* odbc::ResultSet::getAsciiStream ( int   idx )  idx  ) 
    -
    - -

    --Fetches a column's value as a stream. -+Fetches a column's value as a stream. -

    --Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -380,31 +370,29 @@ - -+Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::istream* odbc::ResultSet::getBinaryStream std::istream* odbc::ResultSet::getBinaryStream ( const std::string &   colName )  colName  ) 
    -
    - -

    --Fetches a column's value as a stream. -+Fetches a column's value as a stream. -

    --Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.

    --Parameters:
    -- -- --
    colName  --The column name
    --
    -+ -+
    colName The column name
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -417,31 +405,29 @@ - -+Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::istream* odbc::ResultSet::getBinaryStream std::istream* odbc::ResultSet::getBinaryStream ( int   idx )  idx  ) 
    -
    - -

    --Fetches a column's value as a stream. -+Fetches a column's value as a stream. -

    --Note that the stream is owned by the result set and should in no case be deleted by the caller. Also, the returned stream is only valid while the cursor remains on this position.

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -454,31 +440,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::getBoolean bool odbc::ResultSet::getBoolean ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a bool. -+Gets a column's value as a bool. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -491,31 +475,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::getBoolean bool odbc::ResultSet::getBoolean ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a bool. -+Gets a column's value as a bool. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -528,31 +510,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    signed char odbc::ResultSet::getByte signed char odbc::ResultSet::getByte ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a signed char. -+Gets a column's value as a signed char. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -565,31 +545,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    signed char odbc::ResultSet::getByte signed char odbc::ResultSet::getByte ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a signed char. -+Gets a column's value as a signed char. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -602,31 +580,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Bytes odbc::ResultSet::getBytes Bytes odbc::ResultSet::getBytes ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a chunk of bytes. -+Gets a column's value as a chunk of bytes. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -639,31 +615,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Bytes odbc::ResultSet::getBytes Bytes odbc::ResultSet::getBytes ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a chunk of bytes. -+Gets a column's value as a chunk of bytes. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -676,31 +650,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Date odbc::ResultSet::getDate Date odbc::ResultSet::getDate ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a Date. -+Gets a column's value as a Date. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -713,31 +685,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Date odbc::ResultSet::getDate Date odbc::ResultSet::getDate ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a Date. -+Gets a column's value as a Date. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -750,31 +720,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    double odbc::ResultSet::getDouble double odbc::ResultSet::getDouble ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a double. -+Gets a column's value as a double. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -787,31 +755,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    double odbc::ResultSet::getDouble double odbc::ResultSet::getDouble ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a double. -+Gets a column's value as a double. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -824,31 +790,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    float odbc::ResultSet::getFloat float odbc::ResultSet::getFloat ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a float. -+Gets a column's value as a float. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -861,31 +825,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    float odbc::ResultSet::getFloat float odbc::ResultSet::getFloat ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a float. -+Gets a column's value as a float. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -898,31 +860,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSet::getInt int odbc::ResultSet::getInt ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as an int. -+Gets a column's value as an int. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -935,31 +895,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSet::getInt int odbc::ResultSet::getInt ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as an int. -+Gets a column's value as an int. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -972,31 +930,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Long odbc::ResultSet::getLong Long odbc::ResultSet::getLong ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a Long. -+Gets a column's value as a Long. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1009,30 +965,28 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Long odbc::ResultSet::getLong Long odbc::ResultSet::getLong ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a Long. -+Gets a column's value as a Long. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1045,26 +999,24 @@ - -+
    See also:
    ResultSetMetaData
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    ResultSetMetaData* odbc::ResultSet::getMetaData ResultSetMetaData* odbc::ResultSet::getMetaData (   )   ) 
    -
    - -

    --Returns meta data about this result set. -+Returns meta data about this result set. -

    --

    --See also:
    --ResultSetMetaData
    --

    -- -+

    -+

    - -- - -@@ -1077,27 +1029,25 @@ - -+
    Returns:
    The current row number in the result set, or 0 if it can't be determined.
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    int odbc::ResultSet::getRow int odbc::ResultSet::getRow (   )   ) 
    -
    - -

    --Returns the current row number. -+Returns the current row number. -

    --

    --Returns:
    --The current row number in the result set, or 0 if it can't be determined.
    --

    -- -+

    -+

    - -- - -@@ -1110,31 +1060,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    short odbc::ResultSet::getShort short odbc::ResultSet::getShort ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a short. -+Gets a column's value as a short. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1147,31 +1095,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    short odbc::ResultSet::getShort short odbc::ResultSet::getShort ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a short. -+Gets a column's value as a short. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1184,31 +1130,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSet::getString std::string odbc::ResultSet::getString ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a string. -+Gets a column's value as a string. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1221,31 +1165,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSet::getString std::string odbc::ResultSet::getString ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a string. -+Gets a column's value as a string. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1258,31 +1200,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Time odbc::ResultSet::getTime Time odbc::ResultSet::getTime ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a Time. -+Gets a column's value as a Time. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1295,31 +1235,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Time odbc::ResultSet::getTime Time odbc::ResultSet::getTime ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a Time. -+Gets a column's value as a Time. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1332,31 +1270,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Timestamp odbc::ResultSet::getTimestamp Timestamp odbc::ResultSet::getTimestamp ( const std::string &   colName )  colName  ) 
    -
    - -

    --Gets a column's value as a Timestamp. -+Gets a column's value as a Timestamp. -

    --

    --Parameters:
    -- -- --
    colName  --The name of the column
    --
    -+ -+
    colName The name of the column
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1369,30 +1305,28 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    Timestamp odbc::ResultSet::getTimestamp Timestamp odbc::ResultSet::getTimestamp ( int   idx )  idx  ) 
    -
    - -

    --Gets a column's value as a Timestamp. -+Gets a column's value as a Timestamp. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1405,26 +1339,24 @@ - -+Only valid while on the insert row.
    See also:
    moveToInsertRow()
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    void odbc::ResultSet::insertRow void odbc::ResultSet::insertRow (   )   ) 
    -
    - -

    --Inserts the current row. -+Inserts the current row. -

    --Only valid while on the insert row.

    --See also:
    --moveToInsertRow()
    --

    -- -+

    -+

    - -- - -@@ -1437,26 +1369,24 @@ - -+
    Returns:
    true if the cursor is in the result set
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::last bool odbc::ResultSet::last (   )   ) 
    -
    - -

    --Moves to the last row in the result set. -+Moves to the last row in the result set. -

    --

    --Returns:
    --true if the cursor is in the result set
    --

    -- -+

    -+

    - -- - -@@ -1469,28 +1399,25 @@ - -+
    Warning:
    The only valid methods while on the insert row are updateXXX(), insertRow() and moveToCurrentRow().
    -+
    See also:
    moveToCurrentRow()
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    void odbc::ResultSet::moveToInsertRow void odbc::ResultSet::moveToInsertRow (   )   ) 
    -
    - -

    --Moves the cursor to the 'insert row' of this result set. -+Moves the cursor to the 'insert row' of this result set. -

    --

    --Warning:
    --The only valid methods while on the insert row are updateXXX(), insertRow() and moveToCurrentRow().
    --See also:
    --moveToCurrentRow()
    --

    -- -+

    -+

    - -- - -@@ -1503,26 +1430,24 @@ - -+
    Returns:
    true if the cursor is in the result set
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::next bool odbc::ResultSet::next (   )   ) 
    -
    - -

    --Moves to the next row in the result set. -+Moves to the next row in the result set. -

    --

    --Returns:
    --true if the cursor is in the result set
    --

    -- -+

    -+

    - -- - -@@ -1535,27 +1460,25 @@ - -+
    Returns:
    true if the cursor is in the result set
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::previous bool odbc::ResultSet::previous (   )   ) 
    -
    - -

    --Moves to the previous row in the result set. -+Moves to the previous row in the result set. -

    --

    --Returns:
    --true if the cursor is in the result set
    --

    -- -+

    -+

    - -- - -@@ -1568,42 +1491,40 @@ - -+Negative values are allowed. This call is illegal if there is no current row.
    Returns:
    true if the cursor is in the result set
    -+ - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::relative bool odbc::ResultSet::relative ( int   rows )  rows  ) 
    -
    - -

    --Moves the cursor inside the result set relative to the current row. -+Moves the cursor inside the result set relative to the current row. -

    --Negative values are allowed. This call is illegal if there is no current row.

    --Returns:
    --true if the cursor is in the result set
    --

    -- -+

    -+

    - -- - -@@ -1616,50 +1537,46 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateAsciiStream void odbc::ResultSet::updateAsciiStream ( const std::string &   colName, colName,
    std::istream *   s, s,
    int   len len
    ) 
    -
    - -

    --Sets the value of a column to the contens of a stream. -+Sets the value of a column to the contens of a stream. -

    --

    --Parameters:
    -- -- -- -- --
    colName  --The column name
    s  --The stream to assign
    len  --The number of bytes in the stream
    --
    -+ -+ -+ -+
    colName The column name
    s The stream to assign
    len The number of bytes in the stream
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1672,50 +1589,46 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateAsciiStream void odbc::ResultSet::updateAsciiStream ( int   idx, idx,
    std::istream *   s, s,
    int   len len
    ) 
    -
    - -

    --Sets the value of a column to a stream. -+Sets the value of a column to a stream. -

    --

    --Parameters:
    -- -- -- -- --
    idx  --The column index, starting at 1
    s  --The stream to assign
    len  --The number of bytes in the stream
    --
    -+ -+ -+ -+
    idx The column index, starting at 1
    s The stream to assign
    len The number of bytes in the stream
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1728,50 +1641,46 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateBinaryStream void odbc::ResultSet::updateBinaryStream ( const std::string &   colName, colName,
    std::istream *   s, s,
    int   len len
    ) 
    -
    - -

    --Sets the value of a column to the contens of a stream. -+Sets the value of a column to the contens of a stream. -

    --

    --Parameters:
    -- -- -- -- --
    colName  --The column name
    s  --The stream to assign
    len  --The number of bytes in the stream
    --
    -+ -+ -+ -+
    colName The column name
    s The stream to assign
    len The number of bytes in the stream
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1784,44 +1693,40 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateBinaryStream void odbc::ResultSet::updateBinaryStream ( int   idx, idx,
    std::istream *   s, s,
    int   len len
    ) 
    -
    - -

    --Sets the value of a column to the contens of a stream. -+Sets the value of a column to the contens of a stream. -

    --

    --Parameters:
    -- -- -- -- --
    idx  --The column index, starting at 1
    s  --The stream to assign
    len  --The number of bytes in the stream
    --
    -+ -+ -+ -+
    idx The column index, starting at 1
    s The stream to assign
    len The number of bytes in the stream
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1834,42 +1739,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateBoolean void odbc::ResultSet::updateBoolean ( const std::string &   colName, colName,
    bool   val val
    ) 
    -
    - -

    --Sets the value of a column to a bool. -+Sets the value of a column to a bool. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1882,42 +1784,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateBoolean void odbc::ResultSet::updateBoolean ( int   idx, idx,
    bool   val val
    ) 
    -
    - -

    --Sets the value of a column to a bool. -+Sets the value of a column to a bool. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1930,42 +1829,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateByte void odbc::ResultSet::updateByte ( const std::string &   colName, colName,
    signed char   val val
    ) 
    -
    - -

    --Sets the value of a column to a signed char. -+Sets the value of a column to a signed char. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -1978,42 +1874,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateByte void odbc::ResultSet::updateByte ( int   idx, idx,
    signed char   val val
    ) 
    -
    - -

    --Sets the value of a column to a signed char. -+Sets the value of a column to a signed char. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2026,42 +1919,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateBytes void odbc::ResultSet::updateBytes ( const std::string &   colName, colName,
    const Bytes &   val val
    ) 
    -
    - -

    --Sets the value of a column to a chunk of bytes. -+Sets the value of a column to a chunk of bytes. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2074,42 +1964,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateBytes void odbc::ResultSet::updateBytes ( int   idx, idx,
    const Bytes &   val val
    ) 
    -
    - -

    --Sets the value of a column to a chunk of bytes. -+Sets the value of a column to a chunk of bytes. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2122,42 +2009,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateDate void odbc::ResultSet::updateDate ( const std::string &   colName, colName,
    const Date &   val val
    ) 
    -
    - -

    --Sets the value of a column to a Date. -+Sets the value of a column to a Date. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2170,42 +2054,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateDate void odbc::ResultSet::updateDate ( int   idx, idx,
    const Date &   val val
    ) 
    -
    - -

    --Sets the value of a column to a Date. -+Sets the value of a column to a Date. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2218,42 +2099,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateDouble void odbc::ResultSet::updateDouble ( const std::string &   colName, colName,
    double   val val
    ) 
    -
    - -

    --Sets the value of a column to a double. -+Sets the value of a column to a double. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2266,42 +2144,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateDouble void odbc::ResultSet::updateDouble ( int   idx, idx,
    double   val val
    ) 
    -
    - -

    --Sets the value of a column to a double. -+Sets the value of a column to a double. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2314,42 +2189,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateFloat void odbc::ResultSet::updateFloat ( const std::string &   colName, colName,
    float   val val
    ) 
    -
    - -

    --Sets the value of a column to a float. -+Sets the value of a column to a float. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2362,42 +2234,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateFloat void odbc::ResultSet::updateFloat ( int   idx, idx,
    float   val val
    ) 
    -
    - -

    --Sets the value of a column to a float. -+Sets the value of a column to a float. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2410,42 +2279,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateInt void odbc::ResultSet::updateInt ( const std::string &   colName, colName,
    int   val val
    ) 
    -
    - -

    --Sets the value of a column to an int. -+Sets the value of a column to an int. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2458,42 +2324,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateInt void odbc::ResultSet::updateInt ( int   idx, idx,
    int   val val
    ) 
    -
    - -

    --Sets the value of a column to an int. -+Sets the value of a column to an int. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2506,42 +2369,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateLong void odbc::ResultSet::updateLong ( const std::string &   colName, colName,
    Long   val val
    ) 
    -
    - -

    --Sets the value of a column to a Long. -+Sets the value of a column to a Long. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2554,33 +2414,30 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateLong void odbc::ResultSet::updateLong ( int   idx, idx,
    Long   val val
    ) 
    -
    - -

    --Sets the value of a column to a Long. -+Sets the value of a column to a Long. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2593,31 +2450,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    void odbc::ResultSet::updateNull void odbc::ResultSet::updateNull ( const std::string &   colName )  colName  ) 
    -
    - -

    --Sets the value of a column to NULL. -+Sets the value of a column to NULL. -

    --

    --Parameters:
    -- -- --
    colName  --The column name
    --
    -+ -+
    colName The column name
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2630,40 +2485,38 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    void odbc::ResultSet::updateNull void odbc::ResultSet::updateNull ( int   idx )  idx  ) 
    -
    - -

    --Sets the value of a column to NULL. -+Sets the value of a column to NULL. -

    --

    --Parameters:
    -- -- --
    idx  --The column index, starting at 1
    --
    -+ -+
    idx The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2676,42 +2529,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateShort void odbc::ResultSet::updateShort ( const std::string &   colName, colName,
    short   val val
    ) 
    -
    - -

    --Sets the value of a column to a short. -+Sets the value of a column to a short. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2724,42 +2574,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateShort void odbc::ResultSet::updateShort ( int   idx, idx,
    short   val val
    ) 
    -
    - -

    --Sets the value of a column to a short. -+Sets the value of a column to a short. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2772,42 +2619,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateString void odbc::ResultSet::updateString ( const std::string &   colName, colName,
    const std::string &   val val
    ) 
    -
    - -

    --Sets the value of a column to a string. -+Sets the value of a column to a string. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2820,42 +2664,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateString void odbc::ResultSet::updateString ( int   idx, idx,
    const std::string &   val val
    ) 
    -
    - -

    --Sets the value of a column to a string. -+Sets the value of a column to a string. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2868,42 +2709,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateTime void odbc::ResultSet::updateTime ( const std::string &   colName, colName,
    const Time &   val val
    ) 
    -
    - -

    --Sets the value of a column to a Time. -+Sets the value of a column to a Time. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2916,42 +2754,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateTime void odbc::ResultSet::updateTime ( int   idx, idx,
    const Time &   val val
    ) 
    -
    - -

    --Sets the value of a column to a Time. -+Sets the value of a column to a Time. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -2964,42 +2799,39 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateTimestamp void odbc::ResultSet::updateTimestamp ( const std::string &   colName, colName,
    const Timestamp &   val val
    ) 
    -
    - -

    --Sets the value of a column to a Timestamp. -+Sets the value of a column to a Timestamp. -

    --

    --Parameters:
    -- -- -- --
    colName  --The name of the column
    val  --The value to set
    --
    -+ -+ -+
    colName The name of the column
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -3012,32 +2844,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - - - - -- -
    void odbc::ResultSet::updateTimestamp void odbc::ResultSet::updateTimestamp ( int   idx, idx,
    const Timestamp &   val val
    ) 
    -
    - -

    --Sets the value of a column to a Timestamp. -+Sets the value of a column to a Timestamp. -

    --

    --Parameters:
    -- -- -- --
    idx  --The column index, starting at 1
    val  --The value to set
    --
    -+ -+ -+
    idx The column index, starting at 1
    val The value to set
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -3050,13 +2879,13 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::ResultSet::wasNull bool odbc::ResultSet::wasNull (   )   ) 
    -
    - -

    --Checks if the last fetched column value was NULL. -+Checks if the last fetched column value was NULL. -

    - Note that if this is true, the returned value was undefined.

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/resultset.h
    -+
  • odbc++/resultset.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,112 +1,111 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::ResultSet Member List

    This is the complete list of members for odbc::ResultSet, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::ResultSet Member List

    This is the complete list of members for odbc::ResultSet, including all inherited members.

    absolute(int row)odbc::ResultSet
    afterLast()odbc::ResultSet
    beforeFirst()odbc::ResultSet
    cancelRowUpdates()odbc::ResultSet
    clearWarnings()odbc::ErrorHandler
    CONCUR_READ_ONLY enum valueodbc::ResultSet
    CONCUR_UPDATABLE enum valueodbc::ResultSet
    deleteRow()odbc::ResultSet
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    findColumn(const std::string &colName)odbc::ResultSet
    first()odbc::ResultSet
    getAsciiStream(int idx)odbc::ResultSet
    getAsciiStream(const std::string &colName)odbc::ResultSet
    getBinaryStream(int idx)odbc::ResultSet
    getBinaryStream(const std::string &colName)odbc::ResultSet
    getBoolean(int idx)odbc::ResultSet
    getBoolean(const std::string &colName)odbc::ResultSet
    getByte(int idx)odbc::ResultSet
    getByte(const std::string &colName)odbc::ResultSet
    getBytes(int idx)odbc::ResultSet
    getBytes(const std::string &colName)odbc::ResultSet
    getConcurrency()odbc::ResultSet
    getCursorName()odbc::ResultSet
    getDate(int idx)odbc::ResultSet
    getDate(const std::string &colName)odbc::ResultSet
    getDouble(int idx)odbc::ResultSet
    getDouble(const std::string &colName)odbc::ResultSet
    getFetchSize()odbc::ResultSet
    getFloat(int idx)odbc::ResultSet
    getFloat(const std::string &colName)odbc::ResultSet
    getInt(int idx)odbc::ResultSet
    getInt(const std::string &colName)odbc::ResultSet
    getLong(int idx)odbc::ResultSet
    getLong(const std::string &colName)odbc::ResultSet
    getMetaData()odbc::ResultSet
    getRow()odbc::ResultSet
    getShort(int idx)odbc::ResultSet
    getShort(const std::string &colName)odbc::ResultSet
    getStatement()odbc::ResultSet
    getString(int idx)odbc::ResultSet
    getString(const std::string &colName)odbc::ResultSet
    getTime(int idx)odbc::ResultSet
    getTime(const std::string &colName)odbc::ResultSet
    getTimestamp(int idx)odbc::ResultSet
    getTimestamp(const std::string &colName)odbc::ResultSet
    getType()odbc::ResultSet
    getWarnings()odbc::ErrorHandler
    insertRow()odbc::ResultSet
    isAfterLast()odbc::ResultSet
    isBeforeFirst()odbc::ResultSet
    isFirst()odbc::ResultSet
    isLast()odbc::ResultSet
    last()odbc::ResultSet
    moveToCurrentRow()odbc::ResultSet
    moveToInsertRow()odbc::ResultSet
    next()odbc::ResultSet
    previous()odbc::ResultSet
    refreshRow()odbc::ResultSet
    relative(int rows)odbc::ResultSet
    rowDeleted()odbc::ResultSet
    rowInserted()odbc::ResultSet
    rowUpdated()odbc::ResultSet
    setFetchSize(int fetchSize)odbc::ResultSet
    TYPE_FORWARD_ONLY enum valueodbc::ResultSet
    TYPE_SCROLL_INSENSITIVE enum valueodbc::ResultSet
    TYPE_SCROLL_SENSITIVE enum valueodbc::ResultSet
    updateAsciiStream(int idx, std::istream *s, int len)odbc::ResultSet
    updateAsciiStream(const std::string &colName, std::istream *s, int len)odbc::ResultSet
    updateBinaryStream(int idx, std::istream *s, int len)odbc::ResultSet
    updateBinaryStream(const std::string &colName, std::istream *s, int len)odbc::ResultSet
    updateBoolean(int idx, bool val)odbc::ResultSet
    updateBoolean(const std::string &colName, bool val)odbc::ResultSet
    updateByte(int idx, signed char val)odbc::ResultSet
    updateByte(const std::string &colName, signed char val)odbc::ResultSet
    updateBytes(int idx, const Bytes &val)odbc::ResultSet
    updateBytes(const std::string &colName, const Bytes &val)odbc::ResultSet
    updateDate(int idx, const Date &val)odbc::ResultSet
    updateDate(const std::string &colName, const Date &val)odbc::ResultSet
    updateDouble(int idx, double val)odbc::ResultSet
    updateDouble(const std::string &colName, double val)odbc::ResultSet
    updateFloat(int idx, float val)odbc::ResultSet
    updateFloat(const std::string &colName, float val)odbc::ResultSet
    updateInt(int idx, int val)odbc::ResultSet
    updateInt(const std::string &colName, int val)odbc::ResultSet
    updateLong(int idx, Long val)odbc::ResultSet
    updateLong(const std::string &colName, Long val)odbc::ResultSet
    updateNull(int idx)odbc::ResultSet
    updateNull(const std::string &colName)odbc::ResultSet
    updateRow()odbc::ResultSet
    updateShort(int idx, short val)odbc::ResultSet
    updateShort(const std::string &colName, short val)odbc::ResultSet
    updateString(int idx, const std::string &val)odbc::ResultSet
    updateString(const std::string &colName, const std::string &val)odbc::ResultSet
    updateTime(int idx, const Time &val)odbc::ResultSet
    updateTime(const std::string &colName, const Time &val)odbc::ResultSet
    updateTimestamp(int idx, const Timestamp &val)odbc::ResultSet
    updateTimestamp(const std::string &colName, const Timestamp &val)odbc::ResultSet
    wasNull()odbc::ResultSet
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~ResultSet()odbc::ResultSet [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    absolute(int row)odbc::ResultSet
    afterLast()odbc::ResultSet
    beforeFirst()odbc::ResultSet
    cancelRowUpdates()odbc::ResultSet
    clearWarnings()odbc::ErrorHandler
    CONCUR_READ_ONLY enum valueodbc::ResultSet
    CONCUR_UPDATABLE enum valueodbc::ResultSet
    deleteRow()odbc::ResultSet
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    findColumn(const std::string &colName)odbc::ResultSet
    first()odbc::ResultSet
    getAsciiStream(int idx)odbc::ResultSet
    getAsciiStream(const std::string &colName)odbc::ResultSet
    getBinaryStream(int idx)odbc::ResultSet
    getBinaryStream(const std::string &colName)odbc::ResultSet
    getBoolean(int idx)odbc::ResultSet
    getBoolean(const std::string &colName)odbc::ResultSet
    getByte(int idx)odbc::ResultSet
    getByte(const std::string &colName)odbc::ResultSet
    getBytes(int idx)odbc::ResultSet
    getBytes(const std::string &colName)odbc::ResultSet
    getConcurrency()odbc::ResultSet
    getCursorName()odbc::ResultSet
    getDate(int idx)odbc::ResultSet
    getDate(const std::string &colName)odbc::ResultSet
    getDouble(int idx)odbc::ResultSet
    getDouble(const std::string &colName)odbc::ResultSet
    getFetchSize()odbc::ResultSet
    getFloat(int idx)odbc::ResultSet
    getFloat(const std::string &colName)odbc::ResultSet
    getInt(int idx)odbc::ResultSet
    getInt(const std::string &colName)odbc::ResultSet
    getLong(int idx)odbc::ResultSet
    getLong(const std::string &colName)odbc::ResultSet
    getMetaData()odbc::ResultSet
    getRow()odbc::ResultSet
    getShort(int idx)odbc::ResultSet
    getShort(const std::string &colName)odbc::ResultSet
    getStatement()odbc::ResultSet
    getString(int idx)odbc::ResultSet
    getString(const std::string &colName)odbc::ResultSet
    getTime(int idx)odbc::ResultSet
    getTime(const std::string &colName)odbc::ResultSet
    getTimestamp(int idx)odbc::ResultSet
    getTimestamp(const std::string &colName)odbc::ResultSet
    getType()odbc::ResultSet
    getWarnings()odbc::ErrorHandler
    insertRow()odbc::ResultSet
    isAfterLast()odbc::ResultSet
    isBeforeFirst()odbc::ResultSet
    isFirst()odbc::ResultSet
    isLast()odbc::ResultSet
    last()odbc::ResultSet
    moveToCurrentRow()odbc::ResultSet
    moveToInsertRow()odbc::ResultSet
    next()odbc::ResultSet
    previous()odbc::ResultSet
    refreshRow()odbc::ResultSet
    relative(int rows)odbc::ResultSet
    rowDeleted()odbc::ResultSet
    rowInserted()odbc::ResultSet
    rowUpdated()odbc::ResultSet
    setFetchSize(int fetchSize)odbc::ResultSet
    TYPE_FORWARD_ONLY enum valueodbc::ResultSet
    TYPE_SCROLL_INSENSITIVE enum valueodbc::ResultSet
    TYPE_SCROLL_SENSITIVE enum valueodbc::ResultSet
    updateAsciiStream(int idx, std::istream *s, int len)odbc::ResultSet
    updateAsciiStream(const std::string &colName, std::istream *s, int len)odbc::ResultSet
    updateBinaryStream(int idx, std::istream *s, int len)odbc::ResultSet
    updateBinaryStream(const std::string &colName, std::istream *s, int len)odbc::ResultSet
    updateBoolean(int idx, bool val)odbc::ResultSet
    updateBoolean(const std::string &colName, bool val)odbc::ResultSet
    updateByte(int idx, signed char val)odbc::ResultSet
    updateByte(const std::string &colName, signed char val)odbc::ResultSet
    updateBytes(int idx, const Bytes &val)odbc::ResultSet
    updateBytes(const std::string &colName, const Bytes &val)odbc::ResultSet
    updateDate(int idx, const Date &val)odbc::ResultSet
    updateDate(const std::string &colName, const Date &val)odbc::ResultSet
    updateDouble(int idx, double val)odbc::ResultSet
    updateDouble(const std::string &colName, double val)odbc::ResultSet
    updateFloat(int idx, float val)odbc::ResultSet
    updateFloat(const std::string &colName, float val)odbc::ResultSet
    updateInt(int idx, int val)odbc::ResultSet
    updateInt(const std::string &colName, int val)odbc::ResultSet
    updateLong(int idx, Long val)odbc::ResultSet
    updateLong(const std::string &colName, Long val)odbc::ResultSet
    updateNull(int idx)odbc::ResultSet
    updateNull(const std::string &colName)odbc::ResultSet
    updateRow()odbc::ResultSet
    updateShort(int idx, short val)odbc::ResultSet
    updateShort(const std::string &colName, short val)odbc::ResultSet
    updateString(int idx, const std::string &val)odbc::ResultSet
    updateString(const std::string &colName, const std::string &val)odbc::ResultSet
    updateTime(int idx, const Time &val)odbc::ResultSet
    updateTime(const std::string &colName, const Time &val)odbc::ResultSet
    updateTimestamp(int idx, const Timestamp &val)odbc::ResultSet
    updateTimestamp(const std::string &colName, const Timestamp &val)odbc::ResultSet
    wasNull()odbc::ResultSet
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~ResultSet()odbc::ResultSet [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set_meta_data.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set_meta_data.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set_meta_data.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set_meta_data.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,12 +1,11 @@ -- -+ - --odbc::ResultSetMetaData class Reference -+libodbc++: odbc::ResultSetMetaData Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::ResultSetMetaData Class Reference

    Provides meta data about a result set. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::ResultSetMetaData Class Reference

    Provides meta data about a result set. - More... -

    - #include <resultsetmetadata.h> -@@ -14,49 +13,48 @@ - List of all members.

    Public Types

    -
      -
    • enum --
      Nullability constants.

    --

    Public Methods

    -+
    Nullability constants.
    -+

    Public Member Functions

    - -+
    Fetch the number of columns in this result set.
  • const std::string & getColumnName (int column) const -+
    Get the name of a column.
  • int getColumnType (int column) const -+
    Get the SQL type of a column.
  • int getPrecision (int column) const -+
    Get the precision of a column.
  • int getScale (int column) const -+
    Get the scale of a column.
  • int getColumnDisplaySize (int column) -+
    Get the display size of a column.
  • std::string getCatalogName (int column) -+
    Get the catalog name for a column.
  • std::string getColumnLabel (int column) -+
    Get the label (if any) for a column.
  • std::string getColumnTypeName (int column) -+
    Get the name of a columns SQL type.
  • std::string getSchemaName (int column) -+
    Get the schema name for a column.
  • std::string getTableName (int column) -+
    Get the table name for a column.
  • bool isAutoIncrement (int column) -+
    Check if a column is autoincrementing.
  • bool isCaseSensitive (int column) -+
    Check if a column is case sensitive.
  • bool isCurrency (int column) -+
    Check if a column can be a currency (eg fixed precision).
  • bool isDefinitelyWritable (int column) -+
    Check if a column can be updated.
  • int isNullable (int column) -+
    Check if a column can be set to NULL.
  • bool isReadOnly (int column) -+
    Check if a column is read only.
  • bool isSearchable (int column) -+
    Check if a column can be used in a where-clause.
  • bool isSigned (int column) -+
    Check if a column is signed.
  • bool isWritable (int column) -+
    Check if a column is 'probably' writeable.
    -

    Detailed Description

    --Provides meta data about a result set. -+Provides meta data about a result set. -

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -69,31 +67,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSetMetaData::getCatalogName std::string odbc::ResultSetMetaData::getCatalogName ( int   column )  column  ) 
    -
    - -

    --Get the catalog name for a column. -+Get the catalog name for a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -106,31 +102,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSetMetaData::getColumnDisplaySize int odbc::ResultSetMetaData::getColumnDisplaySize ( int   column )  column  ) 
    -
    - -

    --Get the display size of a column. -+Get the display size of a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -143,31 +137,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSetMetaData::getColumnLabel std::string odbc::ResultSetMetaData::getColumnLabel ( int   column )  column  ) 
    -
    - -

    --Get the label (if any) for a column. -+Get the label (if any) for a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -180,31 +172,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    const std::string& odbc::ResultSetMetaData::getColumnName const std::string& odbc::ResultSetMetaData::getColumnName ( int   column )  column  )  const
    -
    - -

    --Get the name of a column. -+Get the name of a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -217,33 +207,30 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSetMetaData::getColumnType int odbc::ResultSetMetaData::getColumnType ( int   column )  column  )  const
    -
    - -

    --Get the SQL type of a column. -+Get the SQL type of a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    --See also:
    --Types
    -+ -+
    column The column index, starting at 1
    -+ -+

    See also:
    Types
    -+ - - --

    -- -+

    -+

    - -- - -@@ -256,31 +243,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSetMetaData::getColumnTypeName std::string odbc::ResultSetMetaData::getColumnTypeName ( int   column )  column  ) 
    -
    - -

    --Get the name of a columns SQL type. -+Get the name of a columns SQL type. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -293,31 +278,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSetMetaData::getPrecision int odbc::ResultSetMetaData::getPrecision ( int   column )  column  )  const
    -
    - -

    --Get the precision of a column. -+Get the precision of a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -330,31 +313,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSetMetaData::getScale int odbc::ResultSetMetaData::getScale ( int   column )  column  )  const
    -
    - -

    --Get the scale of a column. -+Get the scale of a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -367,31 +348,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSetMetaData::getSchemaName std::string odbc::ResultSetMetaData::getSchemaName ( int   column )  column  ) 
    -
    - -

    --Get the schema name for a column. -+Get the schema name for a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -404,31 +383,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    std::string odbc::ResultSetMetaData::getTableName std::string odbc::ResultSetMetaData::getTableName ( int   column )  column  ) 
    -
    - -

    --Get the table name for a column. -+Get the table name for a column. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -441,31 +418,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isAutoIncrement bool odbc::ResultSetMetaData::isAutoIncrement ( int   column )  column  ) 
    -
    - -

    --Check if a column is autoincrementing. -+Check if a column is autoincrementing. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -478,31 +453,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isCaseSensitive bool odbc::ResultSetMetaData::isCaseSensitive ( int   column )  column  ) 
    -
    - -

    --Check if a column is case sensitive. -+Check if a column is case sensitive. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -515,31 +488,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isCurrency bool odbc::ResultSetMetaData::isCurrency ( int   column )  column  ) 
    -
    - -

    --Check if a column can be a currency (eg fixed precision). -+Check if a column can be a currency (eg fixed precision). -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -552,31 +523,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isDefinitelyWritable bool odbc::ResultSetMetaData::isDefinitelyWritable ( int   column )  column  ) 
    -
    - -

    --Check if a column can be updated. -+Check if a column can be updated. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -589,31 +558,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    int odbc::ResultSetMetaData::isNullable int odbc::ResultSetMetaData::isNullable ( int   column )  column  ) 
    -
    - -

    --Check if a column can be set to NULL. -+Check if a column can be set to NULL. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -626,31 +593,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isReadOnly bool odbc::ResultSetMetaData::isReadOnly ( int   column )  column  ) 
    -
    - -

    --Check if a column is read only. -+Check if a column is read only. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -663,31 +628,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isSearchable bool odbc::ResultSetMetaData::isSearchable ( int   column )  column  ) 
    -
    - -

    --Check if a column can be used in a where-clause. -+Check if a column can be used in a where-clause. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -700,31 +663,29 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isSigned bool odbc::ResultSetMetaData::isSigned ( int   column )  column  ) 
    -
    - -

    --Check if a column is signed. -+Check if a column is signed. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - --

    -- -+

    -+

    - -- - -@@ -737,19 +698,18 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    bool odbc::ResultSetMetaData::isWritable bool odbc::ResultSetMetaData::isWritable ( int   column )  column  ) 
    -
    - -

    --Check if a column is 'probably' writeable. -+Check if a column is 'probably' writeable. -

    --

    --Parameters:
    -- -- --
    column  --The column index, starting at 1
    --
    -+ -+
    column The column index, starting at 1
    -+ -+ - - -

    The documentation for this class was generated from the following file: -+
  • odbc++/resultsetmetadata.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set_meta_data-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set_meta_data-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set_meta_data-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set_meta_data-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,32 +1,31 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::ResultSetMetaData Member List

    This is the complete list of members for odbc::ResultSetMetaData, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::ResultSetMetaData Member List

    This is the complete list of members for odbc::ResultSetMetaData, including all inherited members.

    getCatalogName(int column)odbc::ResultSetMetaData
    getColumnCount() constodbc::ResultSetMetaData
    getColumnDisplaySize(int column)odbc::ResultSetMetaData
    getColumnLabel(int column)odbc::ResultSetMetaData
    getColumnName(int column) constodbc::ResultSetMetaData
    getColumnType(int column) constodbc::ResultSetMetaData
    getColumnTypeName(int column)odbc::ResultSetMetaData
    getPrecision(int column) constodbc::ResultSetMetaData
    getScale(int column) constodbc::ResultSetMetaData
    getSchemaName(int column)odbc::ResultSetMetaData
    getTableName(int column)odbc::ResultSetMetaData
    isAutoIncrement(int column)odbc::ResultSetMetaData
    isCaseSensitive(int column)odbc::ResultSetMetaData
    isCurrency(int column)odbc::ResultSetMetaData
    isDefinitelyWritable(int column)odbc::ResultSetMetaData
    isNullable(int column)odbc::ResultSetMetaData
    isReadOnly(int column)odbc::ResultSetMetaData
    isSearchable(int column)odbc::ResultSetMetaData
    isSigned(int column)odbc::ResultSetMetaData
    isWritable(int column)odbc::ResultSetMetaData
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    getCatalogName(int column)odbc::ResultSetMetaData
    getColumnCount() constodbc::ResultSetMetaData
    getColumnDisplaySize(int column)odbc::ResultSetMetaData
    getColumnLabel(int column)odbc::ResultSetMetaData
    getColumnName(int column) constodbc::ResultSetMetaData
    getColumnType(int column) constodbc::ResultSetMetaData
    getColumnTypeName(int column)odbc::ResultSetMetaData
    getPrecision(int column) constodbc::ResultSetMetaData
    getScale(int column) constodbc::ResultSetMetaData
    getSchemaName(int column)odbc::ResultSetMetaData
    getTableName(int column)odbc::ResultSetMetaData
    isAutoIncrement(int column)odbc::ResultSetMetaData
    isCaseSensitive(int column)odbc::ResultSetMetaData
    isCurrency(int column)odbc::ResultSetMetaData
    isDefinitelyWritable(int column)odbc::ResultSetMetaData
    isNullable(int column)odbc::ResultSetMetaData
    isReadOnly(int column)odbc::ResultSetMetaData
    isSearchable(int column)odbc::ResultSetMetaData
    isSigned(int column)odbc::ResultSetMetaData
    isWritable(int column)odbc::ResultSetMetaData
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_result_set.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_result_set.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,3 @@ -+‰PNG -+ -+ IHDRyPÏwÇ„PLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfÊÄ,„˜\[t¨Âþ.é.ÑŠ¦5¦ Ð²ˆp”N=l¯²ÞµöÞ…ö{Cӈݞ'³÷Üôõy‹ÖzþÂô÷Ñ]_ä_Ü_åkŒãé/IEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3 +0,0 @@ --GIF89a~PòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,~PþºÜþ0ÊI«½èÍ»ÿ`(Ždižœ‚®lë¾¥ --Ïtmoò­ï<˜÷À`íÓ\ŒNçqìŽ(‹H‚JQWi–©^[ÔèOe§ÂÆÏ7šîºÛ‹³Ö,>jsö5=ŵúá}m{‚o|lˆˆsteŠ}gM…Ž€&x’‰8 š\‡””¡Mk‹¥“–‚¤>‹r2¦Ÿ¢J«•±„>‡[¹·™©•°¿ƒÀŠ¶jž[¾´iÂǪŭœ£YvÎÖÏq®ÆÛNËÛF—x×â­¤zBê+é0hëðU<ïñõÉOíöú^ùûþøÿª£'°à ‚bÁÀ°¡Ã‡/(,a`¢E/jDaþ ãÆ$:fI²ƒH%S89ReÉ–._Æt sæÇš65âÌiq'O…> *T Ñ¢ÿŽ"ݧt©½¦NãAºn*U!V¯ɪ•×®:¾‚µ!v,²f1¦õ‡vm‹¶nWÀ{b.]Š.èÝË·¯ß¿€ l`°áÈ X̸±ãÇ#KžL¹²å˘ëÍ̹³çÏ -oMº´éÓŒG£^ͺudÕ®cË6 ›s€Å·=3p¼›qîÆ¿ƒƒþ ºvæÜÄ1î»9oç’φlœ·à·‘G_~=²ôèµ?Ç }pðÙ™§Ç^rõòä·ã¯>¾üóã¿Ó‡?¿¯{äûÝ÷Ú“ÕŸ–u×~ú¡· ~ ˆàw©(Ù„ö‰§\†B–ƒ¾™Ça‡Ž8`Îaø w ž§áx2W"‰*žxaŠþu§!…ËA7cx>Ê($‰ÿùgã… --ʧ]’"9_’Û]`“?>éäŒ;†¸¢cïMçål.Öå—dš&#u–©&kT¢¹æ›kŽ 眨ÉIç¡Ù‰çžœéÉ矕%&è „jè¡$; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,54 +1,52 @@ -- -+ - --odbc::SQLException class Reference -+libodbc++: odbc::SQLException Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::SQLException Class Reference

    The exception thrown when errors occur inside the library. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::SQLException Class Reference

    The exception thrown when errors occur inside the library. - More... -

    - #include <types.h> -

    -

    Inheritance diagram for odbc::SQLException: --

    -+

    - - odbc::SQLWarning - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - SQLException (const std::string &reason="", const std::string &sqlState="", int vendorCode=0) --
      Constructor.

    • -+
      Constructor.
    • - SQLException (const DriverMessage &dm) --
      Copy from a DriverMessage.

    • -+
      Copy from a DriverMessage.
    • - virtual ~SQLException () throw () --
      Destructor.

    • -+
      Destructor.
    • - int getErrorCode () const --
      Get the vendor error code of this exception.

    • const std::string & getSQLState () const --
      Gets the SQLSTATE of this exception. More...

    • -+
      Get the vendor error code of this exception.
    • const std::string & getSQLState () const -+
      Gets the SQLSTATE of this exception.
    • - const std::string & getMessage () const --
      Gets the description of this message.

    • -+
      Gets the description of this message.
    • - virtual const char * what () const throw () --
      Gets the description of this message.

    -+
    Gets the description of this message.
    -

    Detailed Description

    --The exception thrown when errors occur inside the library. -+The exception thrown when errors occur inside the library. -

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -61,13 +59,13 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    const std::string& odbc::SQLException::getSQLState const std::string& odbc::SQLException::getSQLState (   )   )  const
    -
    - -

    --Gets the SQLSTATE of this exception. -+Gets the SQLSTATE of this exception. -

    - Consult your local ODBC reference for SQLSTATE values.

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,19 +1,18 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::SQLException Member List

    This is the complete list of members for odbc::SQLException, including all inherited members. -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::SQLException Member List

    This is the complete list of members for odbc::SQLException, including all inherited members.

    getErrorCode() constodbc::SQLException
    getMessage() constodbc::SQLException
    getSQLState() constodbc::SQLException
    SQLException(const std::string &reason="", const std::string &sqlState="", int vendorCode=0)odbc::SQLException
    SQLException(const DriverMessage &dm)odbc::SQLException
    what() constodbc::SQLException [virtual]
    ~SQLException()odbc::SQLException [virtual]
    -+ -+ -+ -+ -+ -+ -+ -
    getErrorCode() constodbc::SQLException
    getMessage() constodbc::SQLException
    getSQLState() constodbc::SQLException
    SQLException(const std::string &reason="", const std::string &sqlState="", int vendorCode=0)odbc::SQLException
    SQLException(const DriverMessage &dm)odbc::SQLException
    what() constodbc::SQLException [virtual]
    ~SQLException()odbc::SQLException [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_exception.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_exception.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,5 @@ -+‰PNG -+ -+ IHDR~P-«ÜýPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØf\IDATxœí”KrÄ DÑfÖ’n€sƒ¤*çÉÊ÷?Bh$ãø3Τ«°€~ÚŸ }8ô ¾¤Lu8ùH8PÎe¿æ6Ÿ2 1ôcƒÔä˜F%f¢t“¢ ²$Ûz˜I:–Ô²gΣ.”E#-Ê ¥äž-y,›•ÊãüÄÎ¥¼÷J}çóëúOVšÛý»›;üýüþçµÖç¯|ëöÏž?cÇéü­ÿäþWþ‰XÉ_Ž_Åà{ÿß'qëÚ^??]ÊßæùRþrÿ?øÁ~ðÿ”ÿ8ŽÏ“ùð>õÄÛàkGcÍE¦)ŠNÒ|UÙ|4*nñ[õQI5Ætç ­<$ -+“©.xÔш R4²à1—%®ðfÍ›ªlT| -+Ų˜ŸhŸ÷^åEžà£•V³´XyÌßÏ¿ö“oÎßúŸý³ç¯I^Ê·þÿ&úxíäí5û[ßßKò'ÿç³øíâ †’ÂIEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,6 +0,0 @@ --GIF89a~PòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,~Pþ8ºÜþ0ÊI«½OèÍ»ÿ`(Ždižœ‚®lë¾¥ --Ïtmoò­ï<˜÷À`íW --hŒ­€¹Y2Ï£3JCRMD’5Éa>½žëM|ÊB•]ãÝd®Ôm'Þ•~Ýj+Ú‹?²`PRƒ‚……r~usGaoŒ†ˆzrlT€M‡™†ZŠqSmœŠ›“§¨˜©‘š&®¦¥sŸmKš”¸º¬²±d¤²‚ˆÁœÄ¯»¹­½”’¾ _ÁµÈjÆÆÊ¿Åf·£kw•¶QN‡ægæÒéi`x×v¤—BõUÁ¦çž|öégj ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,37 +1,36 @@ -- -+ - --odbc::SQLWarning class Reference -+libodbc++: odbc::SQLWarning Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::SQLWarning Class Reference

    Represents an SQL warning. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::SQLWarning Class Reference

    Represents an SQL warning. - More... -

    - #include <types.h> -

    -

    Inheritance diagram for odbc::SQLWarning: --

    -+

    - - odbc::SQLException - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    - -+
    Destructor.
    -

    Detailed Description

    --Represents an SQL warning. -+Represents an SQL warning. -

    - Contains the same info as an SQLException. -

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,22 +1,21 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::SQLWarning Member List

    This is the complete list of members for odbc::SQLWarning, including all inherited members. -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::SQLWarning Member List

    This is the complete list of members for odbc::SQLWarning, including all inherited members.

    getErrorCode() constodbc::SQLException
    getMessage() constodbc::SQLException
    getSQLState() constodbc::SQLException
    SQLException(const std::string &reason="", const std::string &sqlState="", int vendorCode=0)odbc::SQLException
    SQLException(const DriverMessage &dm)odbc::SQLException
    SQLWarning(const std::string &reason="", const std::string &sqlState="", int vendorCode=0)odbc::SQLWarning
    SQLWarning(const DriverMessage &dm)odbc::SQLWarning
    what() constodbc::SQLException [virtual]
    ~SQLException()odbc::SQLException [virtual]
    ~SQLWarning()odbc::SQLWarning [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    getErrorCode() constodbc::SQLException
    getMessage() constodbc::SQLException
    getSQLState() constodbc::SQLException
    SQLException(const std::string &reason="", const std::string &sqlState="", int vendorCode=0)odbc::SQLException
    SQLException(const DriverMessage &dm)odbc::SQLException
    SQLWarning(const std::string &reason="", const std::string &sqlState="", int vendorCode=0)odbc::SQLWarning
    SQLWarning(const DriverMessage &dm)odbc::SQLWarning
    what() constodbc::SQLException [virtual]
    ~SQLException()odbc::SQLException [virtual]
    ~SQLWarning()odbc::SQLWarning [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_s_q_l_warning.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_s_q_l_warning.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,4 @@ -+‰PNG -+ -+ IHDR~P-«ÜýPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfXIDATxœí”KrÃ0†Å&kà(7H/Ô•ï„ -+¢Ç8uRMÇMGxFFŸ€ßð1gágìºøâ²Ôe¢…8Jö©g$òŸ<ŽJëÇÁš<Îk&f‘t£!åH¶ót'Å1¥‘Ýs^ó°è¥iu žeGÒŽúîµ¼-–b©òÚ¿°•Q¸÷˜÷YÉï<Ñs¼Xjîëw5ð÷þwôÏgýW¾×?ëgÏŸµâÔ¯¿¸þ•Á†·áíøÁ?ûÿ>°ËQÀ/óÛç©üeÛNåO×ñ‹_üâÿOyš³€SåÁâë¡úIÙ„A—0_5ì Œ‚=~/¿fBH7rÞÐÊkh„…!6¼æAÐKCu †×½â>Œ¼E•B©á“y”Ã0ð>«<Ñ =g…K5³ ¯c§Q&¼šÖÏùu<1x~k‡~comˆ‰ŽTs†“Š‘•‚2…–”%Pyœœ›£ tž¤o,ƒ0›°—¬— €’·´ ·±{¡³'e)¼©c$Œh¹ÉÈ£»²‰Ë1ÁbÎ{•ÅÇnЫ´¨×†‹ÊÑ®¯t}v|ߺÏ趢¥qÌ“×å3ÒGøù:÷úýþ.üþ (" Áƒ "\ØO!ÇFBœøC"Å‹84hÜÈþ±£ÇˆI²¤É“(Sª\©ÒË—0cÊœI³¦M”.oêÜɳ§Ï”‚þJ´¨Ñ’As]Ê´éˤBJêªRªX³þ¼ªµ«×š\¿Š ”¬Ù³HѪ5v­[ªmßÊew®]¢uïêå™w¯_°÷ì+¸pKÈgNÌÀâƈC.,yràÊ–ýbάw3g»ž?Ë -Ú-éÒjO£>«z5ÙÖ®ÅÂFkª¶íÛ¸sëÞÍ»·ïßÀuÇFüd¸áâÆ#Oþw9ó½Î©9½&¨‘ÕOf'º{÷©Õ¿¿Ü>¥øžçÑ§ç …dñòÎÛ£ü.¿>rù¦—Ǿ\þøè?èSvûÝW vÔ%H]wûå§ æ§Ÿ‚JøàR¢‡`…BÈ!Ký™tà…RØ`ƒEeÈÞ†¶8Ó‰õ-c‰ÎH£Q*îä"‰7šç#þH#},b¸žN;ä|Bž¸ä&Fù¡wF’7¡ƒñ…ÈáuÖˆåIòça‡GÞ”ãsk‰&me®i–šn’gœbÍI§WvÞ©UžzbÜŸ€*è „ÚÆÙl}…h¢[EÅ(kŽ>:–U’¾U¥laÊš¦™r:©§Ÿ‚úÕ¢¢*VªW¤ž --Sªª²Äj«‡Á --—¬³Ò*Õ«¶¦•kS¸î*R¯¾»«°¹k«±´"þ+«²°2Ûª³ªB»HÔ‚d@µØv„ѶøXÄí·+x î¸&ˆKî¹!˜‹îºXTŒ --¦ „‡/#üBî># 4ý¼û.@xQF(Õ¨ÑN½Ú(’N9õ\Áp*l8,ñ‘ø»ðÄhÁË!àxâ/»t\J3Õ`ÒÍÉÇ##C21úº±.ÞL3.˜x!rÇ5ÓÆÔÀüN6D÷ɼéüq4ÑH/²ÏOý³Ë+ýoÑ6=Ì6Y,ôÕ<×"u»Toì0Êb ËÎá8ÍÊ={luÌ?l0I_ÍÎÅx«|0ÈMƒÜË9Ë]øÊX¨›½ì–K5EŒ7ŽÄãþE.yA”_®yÆ™o¾¹âžo zèNúDÙ¦®úê«ê+]¯•TìŠFJ;_—Þ>XîºÖûPÒ–¼¨ÃƒZ¼§Çsš¼¦ËcÚ|¥ÏKý£Ó3Z}¢×÷™½žÛßÙ=ßǾ›ã¯Y>šç?—>së'×¾qï£Äúü\Kÿý œ®¿éú3ÄÿùÒ¹’Ë\zÁÒÆ --ƒ^"°œ&÷Š˜Mƒ6k`Ú°–À¡á`÷ ˜9âð7¬!o«Ø*’Ö·Âå^+ÇX! ³Yƒd ÜXÈ 7²eèðÛ!Ä𕹭½ aŸ@ÅÜ„&8­Á‡qA —è³Öë|…À¢ÇfæÈ9M‹_\š§†Ä¯Í„Ê`[ÕœHvqˆkÄ\ÝV²šq‡BT£-¢øÃ(‘sD‡%æ3.FÁo)Œ E苉‘ðp;[¤É> @þ£’–lH3É-Lr²[›üdéB)JÔ‘²”ñ$*É€¿VºÒ• ; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_statement.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_statement.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_statement.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_statement.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,80 +1,78 @@ -- -+ - --odbc::Statement class Reference -+libodbc++: odbc::Statement Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Statement Class Reference

    A simple non-prepared statement. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Statement Class Reference

    A simple non-prepared statement. - More... -

    - #include <statement.h> -

    -

    Inheritance diagram for odbc::Statement: --

    -+

    - - odbc::ErrorHandler - odbc::PreparedStatement - odbc::CallableStatement - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      -
    • virtual ~Statement () --
      Destructor. More...

    • -+
      Destructor.
    • - Connection * getConnection () --
      Returns the connection that created this statement.

    • -+
      Returns the connection that created this statement.
    • - void cancel () --
      Cancel an ongoing operation that was executed in another thread.

    • virtual bool execute (const std::string &sql) --
      Execute a given SQL statement. More...

    • virtual ResultSet * executeQuery (const std::string &sql) --
      Execute an SQL statement, expected to return a resultset. More...

    • virtual int executeUpdate (const std::string &sql) --
      Execute an SQL statement, expected to return an update count. More...

    • int getUpdateCount () --
      Fetch the current result as an update count. More...

    • -+
      Cancel an ongoing operation that was executed in another thread.
    • virtual bool execute (const std::string &sql) -+
      Execute a given SQL statement.
    • virtual ResultSet * executeQuery (const std::string &sql) -+
      Execute an SQL statement, expected to return a resultset.
    • virtual int executeUpdate (const std::string &sql) -+
      Execute an SQL statement, expected to return an update count.
    • int getUpdateCount () -+
      Fetch the current result as an update count.
    • - ResultSet * getResultSet () --
      Fetch the current result as a ResultSet.

    • bool getMoreResults () --
      Check if there are more results available on this statment. More...

    • -+
      Fetch the current result as a ResultSet.
    • bool getMoreResults () -+
      Check if there are more results available on this statment.
    • - void setCursorName (const std::string &name) --
      Set the cursor name for this statement.

    • -+
      Set the cursor name for this statement.
    • - int getFetchSize () --
      Fetch the current fetch size (also called rowset size) for resultsets created by this statement.

    • -+
      Fetch the current fetch size (also called rowset size) for resultsets created by this statement.
    • - void setFetchSize (int size) --
      Set the current fetch size for resultsets created by this statement.

    • -+
      Set the current fetch size for resultsets created by this statement.
    • - int getResultSetConcurrency () --
      Get the concurrency type for resultsets created by this statement.

    • -+
      Get the concurrency type for resultsets created by this statement.
    • - int getResultSetType () --
      Get the type for resultsets created by this statement.

    • -+
      Get the type for resultsets created by this statement.
    • - int getQueryTimeout () --
      Get the query timeout for this statement.

    • -+
      Get the query timeout for this statement.
    • - void setQueryTimeout (int seconds) --
      Set the query timeout for this statement.

    • -+
      Set the query timeout for this statement.
    • - int getMaxRows () --
      Get the maximum number of rows to return in a resultset.

    • -+
      Get the maximum number of rows to return in a resultset.
    • - void setMaxRows (int maxRows) --
      Set the maximum number of rows to return in a resultset.

    • -+
      Set the maximum number of rows to return in a resultset.
    • - int getMaxFieldSize () --
      Get the maximum field size for resultsets create by this statement.

    • -+
      Get the maximum field size for resultsets create by this statement.
    • - void setMaxFieldSize (int maxFieldSize) --
      Set the maximum field size for resultsets create by this statement.

    • void setEscapeProcessing (bool on) --
      Sets escape processing on or off. More...

    • bool getEscapeProcessing () --
      Gets the current escape processing setting. More...

    • void close () --
      Closes all result sets from this execution. More...

    -+
    Set the maximum field size for resultsets create by this statement.
  • void setEscapeProcessing (bool on) -+
    Sets escape processing on or off.
  • bool getEscapeProcessing () -+
    Gets the current escape processing setting.
  • void close () -+
    Closes all result sets from this execution.
    -

    Detailed Description

    --A simple non-prepared statement. -+A simple non-prepared statement. -

    -

    Constructor & Destructor Documentation

    --

    -- -+

    -+

    - -- - -@@ -87,25 +85,24 @@ - -+Destroys/closes this statement as well as all created resultsets. - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    virtual odbc::Statement::~Statement virtual odbc::Statement::~Statement (   )   )  [virtual]
    -
    - -

    --Destructor. -+Destructor. -

    --Destroys/closes this statement as well as all created resultsets.

    -

    Member Function Documentation

    --

    -- -+

    -+

    - -- - -@@ -118,25 +115,24 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    void odbc::Statement::close void odbc::Statement::close (   )   ) 
    -
    - -

    --Closes all result sets from this execution. -+Closes all result sets from this execution. -

    - This is useful if you don't wish to iterate through all remaining results, or if your driver does not auto-close cursors.

    --

    -- -+

    -+

    - -- - -@@ -149,33 +145,30 @@ - -+The statement can return multiple results. To get to the next result after processing the first one, getMoreResults() should be called.
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    virtual bool odbc::Statement::execute virtual bool odbc::Statement::execute ( const std::string &   sql )  sql  )  [virtual]
    -
    - -

    --Execute a given SQL statement. -+Execute a given SQL statement. -

    --The statement can return multiple results. To get to the next result after processing the first one, getMoreResults() should be called.

    --Parameters:
    -- -- --
    sql  --The string to execute
    --
    --Returns:
    --true if a resultset is available
    -+ -+
    sql The string to execute
    -+ -+

    Returns:
    true if a resultset is available
    -+ - - --

    -- -+

    -+

    - -- - -@@ -188,33 +181,30 @@ - -+
    Parameters:
    -+
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    virtual ResultSet* odbc::Statement::executeQuery virtual ResultSet* odbc::Statement::executeQuery ( const std::string &   sql )  sql  )  [virtual]
    -
    - -

    --Execute an SQL statement, expected to return a resultset. -+Execute an SQL statement, expected to return a resultset. -

    --

    --Parameters:
    -- -- --
    sql  --The string to execute
    --
    --Returns:
    --A ResultSet object.
    -+ -+
    sql The string to execute
    -+ -+

    Returns:
    A ResultSet object.
    -+ - - --

    -- -+

    -+

    - -- - -@@ -227,26 +217,24 @@ - -+
    Returns:
    The number of affected rows
    -+ - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    virtual int odbc::Statement::executeUpdate virtual int odbc::Statement::executeUpdate ( const std::string &   sql )  sql  )  [virtual]
    -
    - -

    --Execute an SQL statement, expected to return an update count. -+Execute an SQL statement, expected to return an update count. -

    --

    --Returns:
    --The number of affected rows
    --

    -- -+

    -+

    - -- - -@@ -259,26 +247,24 @@ - -+
    Returns:
    true if escape processing is on, false otherwise
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::Statement::getEscapeProcessing bool odbc::Statement::getEscapeProcessing (   )   ) 
    -
    - -

    --Gets the current escape processing setting. -+Gets the current escape processing setting. -

    --

    --Returns:
    --true if escape processing is on, false otherwise
    --

    -- -+

    -+

    - -- - -@@ -291,26 +277,24 @@ - -+
    Returns:
    True if this statement has more results to offer.
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    bool odbc::Statement::getMoreResults bool odbc::Statement::getMoreResults (   )   ) 
    -
    - -

    --Check if there are more results available on this statment. -+Check if there are more results available on this statment. -

    --

    --Returns:
    --True if this statement has more results to offer.
    --

    -- -+

    -+

    - -- - -@@ -323,27 +307,25 @@ - -+
    Returns:
    the current result's update count (affected rows), or -1 if the result is a ResultSet or if there are no more results.
    -+ - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    int odbc::Statement::getUpdateCount int odbc::Statement::getUpdateCount (   )   ) 
    -
    - -

    --Fetch the current result as an update count. -+Fetch the current result as an update count. -

    --

    --Returns:
    --the current result's update count (affected rows), or -1 if the result is a ResultSet or if there are no more results.
    --

    -- -+

    -+

    - -- - -@@ -356,13 +338,13 @@ - -+For PreparedStatements, the command has been parsed on creation, so this setting won't really have any effect. - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    void odbc::Statement::setEscapeProcessing void odbc::Statement::setEscapeProcessing ( bool   on )  on  ) 
    -
    - -

    --Sets escape processing on or off. -+Sets escape processing on or off. -

    --For PreparedStatements, the command has been parsed on creation, so this setting won't really have any effect.

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/statement.h
    -+
  • odbc++/statement.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_statement-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_statement-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_statement-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_statement-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,39 +1,38 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Statement Member List

    This is the complete list of members for odbc::Statement, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Statement Member List

    This is the complete list of members for odbc::Statement, including all inherited members.

    cancel()odbc::Statement
    clearWarnings()odbc::ErrorHandler
    close()odbc::Statement
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    execute(const std::string &sql)odbc::Statement [virtual]
    executeQuery(const std::string &sql)odbc::Statement [virtual]
    executeUpdate(const std::string &sql)odbc::Statement [virtual]
    getConnection()odbc::Statement
    getEscapeProcessing()odbc::Statement
    getFetchSize()odbc::Statement
    getMaxFieldSize()odbc::Statement
    getMaxRows()odbc::Statement
    getMoreResults()odbc::Statement
    getQueryTimeout()odbc::Statement
    getResultSet()odbc::Statement
    getResultSetConcurrency()odbc::Statement
    getResultSetType()odbc::Statement
    getUpdateCount()odbc::Statement
    getWarnings()odbc::ErrorHandler
    setCursorName(const std::string &name)odbc::Statement
    setEscapeProcessing(bool on)odbc::Statement
    setFetchSize(int size)odbc::Statement
    setMaxFieldSize(int maxFieldSize)odbc::Statement
    setMaxRows(int maxRows)odbc::Statement
    setQueryTimeout(int seconds)odbc::Statement
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~Statement()odbc::Statement [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    cancel()odbc::Statement
    clearWarnings()odbc::ErrorHandler
    close()odbc::Statement
    ErrorHandler(bool collectWarnings=true)odbc::ErrorHandler [protected]
    execute(const std::string &sql)odbc::Statement [virtual]
    executeQuery(const std::string &sql)odbc::Statement [virtual]
    executeUpdate(const std::string &sql)odbc::Statement [virtual]
    getConnection()odbc::Statement
    getEscapeProcessing()odbc::Statement
    getFetchSize()odbc::Statement
    getMaxFieldSize()odbc::Statement
    getMaxRows()odbc::Statement
    getMoreResults()odbc::Statement
    getQueryTimeout()odbc::Statement
    getResultSet()odbc::Statement
    getResultSetConcurrency()odbc::Statement
    getResultSetType()odbc::Statement
    getUpdateCount()odbc::Statement
    getWarnings()odbc::ErrorHandler
    setCursorName(const std::string &name)odbc::Statement
    setEscapeProcessing(bool on)odbc::Statement
    setFetchSize(int size)odbc::Statement
    setMaxFieldSize(int maxFieldSize)odbc::Statement
    setMaxRows(int maxRows)odbc::Statement
    setQueryTimeout(int seconds)odbc::Statement
    ~ErrorHandler()odbc::ErrorHandler [virtual]
    ~Statement()odbc::Statement [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_statement.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_statement.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_statement.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_statement.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,5 @@ -+‰PNG -+ -+ IHDR™ÀåóܶPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfÎIDATxœí›kn¤0 €ÉŸý}ƒä«î…FZiî„õ#(!d j™­C•—×8nEcÌôg`ú=}„qÉhÃhèsÕàBâå§2®“¶–¼H£•xDï©€Lã‘x¡‘DP·ŒBÜ¡‘˜fä+ O­³ÓÝ|£äA%èC`om>–B:xßPúåU1M'W7M4-4Õ´Ðt²+4\­-Ðò¾Ðü‘¦k›òißD’4õj“dÓ]ÚÕd4£ÑÆ>ûÒ£sÜ7Ð~=ïK{>·¥ÝÙ¦F3šÑŒf4£­™``š§y FK›]©LÒr›A'h.µNÑè·ÆͳsT@‚ÀLuÉœ›D@r·iŽ®ÙñÅB΀;cú!–®gm.ÝZFë¾eüFþMZ¤'ÙCiRž£¹Å²DçXöÓò¾}¦½ªéÚ¦b*È€jE§jˤ6½’Œf´#ÚØ'`_z ÔÀü!· ÝÙ¦F3šÑŒf4£­™úÞ{ýí|;vç÷€?¶Ž ©—À}EÑ.m;8 0…-ìÓ*q!Èq!1D¢@8!Q P2î–»QZJ«Å…pà.£@4è‚fM!œ(°8¯­4$B‚bt„6¼ì›ÏÈ‘±KÓ Ñ Ý; ©P@ ³hÙ(Ë -+9\fC«Ä…à2 -+$îÛ’V×t¢´lS¯ ¶)«ÍT+Ê\ç=þ[ØƵÒ;Ó^KF;K»RyŽ}:Íü!'ÓP˜ÑŒf4£ÍhFûBZßÿyæyOZ:9KŠ=ªêñ˜+-oÈ>-yD>ÑšÞLKÎst­‡ãx‚Žgä†7$Óâ¡Êi=¤ã~ù@F¾ÏhxCÖ´|ØϚςïð†ÐÔá‘>QWUÃÒ¦-4Í«lyCvö-Ú´²oMoÈŽMÅTRÕb|¶iÓò>YFû_hÜÛ'à?&%_ZzÖ­IEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_time.gif libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time.gif ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_time.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --GIF89ahPòÿÿÿÿÿÀŸŸ`ÀÀÀ!ù,hPþºÜþ0ÊI«8ëÍ»ÿ`(Ž¡Bžhª®™É¾p|ºrm×ô­ïsÀ·_êþ6¹Ð¨b;Éfδ,2%MµÚŠC`1¸äÍÚ´uÍ¿¼3ñ9(']éî6·×ñsn"wy€ 0}#‹ƒjh‚1‰Ž€d–…x„,“ƒS>[W4m‘œ]{|ªO­7Ÿ®±+°²µv¬¶¹·º¼³¸½ÀH¿ÁĴļÉÊËÌÍÇÐÓÒÔ×Ù×ÔÙÖÛÄÝÚßÁáÞãÀæçèêÇéìºîï¶ñò²ôõ®÷øOúû?ýþv xc ÁÆH¨ðÆ+BL!q≊G`Ìþb#Ç?v)2ZÉ‚'mL `eJ—5ÈœI³¦Í›8sÞ4 ³§ÏŸ6J´¨Ñ£H“*]Ê´éR™N£JJµêP¨V³jÝ+ׯ`¿z K¶l×SU›Ö¶Zá‚Û”­Ü´eïr¥»VQ¿vßÊ]°tðÚ·‡‡Vlׯ`¸jv\”/äÄŽ3'FÌٰ⾂;MºsäÈ 9µ<ú²jÉL=K† {skÌ›õ²ÆÍ»tῼ/{ñìÜFw—¦m[©ìàIC_žmQ×S3œôvé؃×Ê÷ñ_Ôˆ)›ï­Ú{ñÁ…§‡®þªu³øÉê]}?¿-ÿ­ûÙ÷߀q)Uju`‚ Nµ`ƒ2õ`„5a…’Ô†vèá‡5%; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_time.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_time.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,70 +1,68 @@ -- -+ - --odbc::Time class Reference -+libodbc++: odbc::Time Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Time Class Reference

    An SQL TIME. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Time Class Reference

    An SQL TIME. - More... -

    - #include <types.h> -

    -

    Inheritance diagram for odbc::Time: --

    -+

    - - odbc::Timestamp - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - Time (int hour, int minute, int second) --
      Constructor.

    • Time () --
      Constructor. More...

    • Time (std::time_t t) --
      Constructor. More...

    • Time (const std::string &str) --
      Constructor. More...

    • --Time (const Time &t) --
      Copy constructor.

    • --Time & operator= (const Time &t) --
      Assignment operator.

    • -+
      Constructor.
    • Time () -+
      Constructor.
    • Time (std::time_t t) -+
      Constructor.
    • Time (const std::string &str) -+
      Constructor.
    • -+Time (const Time &t) -+
      Copy constructor.
    • -+Time & operator= (const Time &t) -+
      Assignment operator.
    • - virtual ~Time () --
      Destructor.

    • -+
      Destructor.
    • - virtual void setTime (std::time_t t) --
      Sets the time to the specified time_t value.

    • -+
      Sets the time to the specified time_t value.
    • - std::time_t getTime () const --
      Returns the time_t value of 1970-01-01 at this time.

    • -+
      Returns the time_t value of 1970-01-01 at this time.
    • - void parse (const std::string &str) --
      Sets this time from a string in the HH:MM:SS format.

    • -+
      Sets this time from a string in the HH:MM:SS format.
    • - int getHour () const --
      Gets the hour of this time.

    • -+
      Gets the hour of this time.
    • - int getMinute () const --
      Gets the minute of this time.

    • -+
      Gets the minute of this time.
    • - int getSecond () const --
      Gets the second of this time.

    • -+
      Gets the second of this time.
    • - void setHour (int h) --
      Sets the hour of this time.

    • -+
      Sets the hour of this time.
    • - void setMinute (int m) --
      Sets the minute of this time.

    • -+
      Sets the minute of this time.
    • - void setSecond (int s) --
      Sets the second of this time.

    -+
    Sets the second of this time.
    -

    Detailed Description

    --An SQL TIME. -+An SQL TIME. -

    -

    Constructor & Destructor Documentation

    --

    -- -+

    -+

    - -- - -@@ -77,25 +75,24 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    odbc::Time::Time odbc::Time::Time (   )   )  [explicit]
    -
    - -

    --Constructor. -+Constructor. -

    - Sets the time to now.

    --

    -- -+

    -+

    - -- - -@@ -108,25 +105,24 @@ - - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    odbc::Time::Time odbc::Time::Time ( std::time_t   t )  t  ) 
    -
    - -

    --Constructor. -+Constructor. -

    - Sets the time to the specified time_t value.

    --

    -- -+

    -+

    - -- - -@@ -139,13 +135,13 @@ - - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    odbc::Time::Time odbc::Time::Time ( const std::string &   str )  str  ) 
    -
    - -

    --Constructor. -+Constructor. -

    - Sets the time to the specified string in the HH:MM:SS format.

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_time-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_time-members.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,28 +1,27 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Time Member List

    This is the complete list of members for odbc::Time, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Time Member List

    This is the complete list of members for odbc::Time, including all inherited members.

    getHour() constodbc::Time
    getMinute() constodbc::Time
    getSecond() constodbc::Time
    getTime() constodbc::Time
    operator=(const Time &t)odbc::Time
    parse(const std::string &str)odbc::Time
    setHour(int h)odbc::Time
    setMinute(int m)odbc::Time
    setSecond(int s)odbc::Time
    setTime(std::time_t t)odbc::Time [virtual]
    Time(int hour, int minute, int second)odbc::Time
    Time()odbc::Time [explicit]
    Time(std::time_t t)odbc::Time
    Time(const std::string &str)odbc::Time
    Time(const Time &t)odbc::Time
    ~Time()odbc::Time [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    getHour() constodbc::Time
    getMinute() constodbc::Time
    getSecond() constodbc::Time
    getTime() constodbc::Time
    operator=(const Time &t)odbc::Time
    parse(const std::string &str)odbc::Time
    setHour(int h)odbc::Time
    setMinute(int m)odbc::Time
    setSecond(int s)odbc::Time
    setTime(std::time_t t)odbc::Time [virtual]
    Time(int hour, int minute, int second)odbc::Time
    Time()odbc::Time [explicit]
    Time(std::time_t t)odbc::Time
    Time(const std::string &str)odbc::Time
    Time(const Time &t)odbc::Time
    ~Time()odbc::Time [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_time.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_time.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_time.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,5 @@ -+‰PNG -+ -+ IHDRhP-RPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfIDATxœí•Û †áÆkÚ7ß@_h‰ÉÞÿl‹ta.¦™”Äî§ý8üK¦†0ÎT‡ýÈY}$£\fÑmÈØu13Ö9k)A‚HÕȲ´Š^‚8~$ss–™(…u•Ÿ›jQy|‡m˜§‘–%˜{š«/“†¬n„¶¯¹¯º¹º¢£¥7ž»¸»µÀÁ¿¨¨¾±-³/ÆÁÀË)½‰É¾:ŒE?ÕâÊÔ­Ü×?Ó.ãÜ¿-ÚŸ·•ÂQÄ´íèÌ+‡çó¡9Ô½#—¯[¶mÖÚ-%Aw --ù™ƒˆÍ‡@:3i„vþ°VBˆûž0¼Wî2±úQäh‘$µP—öÀÜÄ«O¢˜ „^ýÔöï×/ÿþëüþù`y¿hà&¨à‚ 6è nFH€VH…fØŸ†ʇa‡ ~âˆÞ}H≣™ˆâŠ›©Èâ‹Â(c}3ÖøŸ8â—㎡¹ÈãŽ>þˆcBÞÖÇ‘H&©ä’L6éä“PY$dL‰A•V.†å”[f9J—B‚éå bòX昜™£šh²I–n¾‰$qj9ZVâ™æ•˜éù˜ŸŒúc™rh|š¦¢_š(Ÿ‹v©h¡t2Z%œ{2ê(šQˆ¹%¦•^ ê§Jºé¡¨BŠèª£îjª¡®º)§dÖZª«¤Êª˜©¬Þê««§úšë¬´«*¨½þ{ºk°ÉJ)*°}{¬­Å++²Øªº,®Òvúk«Éêªmµâ^[*œà–K,¸Ù6;­»±zJ®µ•Jzi¢öæÊk·Ÿjj)º÷²« ‚šY#›ï˜p„Ï ,Œ ;¬®ÂO¼fÅ ˜±ƒØñŒs2ÄQ–lòÉ(Ÿ^; -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_timestamp.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_timestamp.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_timestamp.html 2003-06-17 12:25:41.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_timestamp.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,65 +1,63 @@ -- -+ - --odbc::Timestamp class Reference -+libodbc++: odbc::Timestamp Class Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Timestamp Class Reference

    An SQL TIMESTAMP. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Timestamp Class Reference

    An SQL TIMESTAMP. - More... -

    - #include <types.h> -

    -

    Inheritance diagram for odbc::Timestamp: --

    -+

    - - odbc::Date - odbc::Time - --List of all members.

    Public Methods

    -+List of all members.

    Public Member Functions

    -
      --
    • -+
    • - Timestamp (int year, int month, int day, int hour, int minute, int second, int nanos=0) --
      Constructor.

    • Timestamp () --
      Constructor. More...

    • Timestamp (std::time_t t) --
      Constructor. More...

    • Timestamp (const std::string &s) --
      Constructor. More...

    • --Timestamp (const Timestamp &t) --
      Copy constructor.

    • --Timestamp & operator= (const Timestamp &t) --
      Assignment operator.

    • -+
      Constructor.
    • Timestamp () -+
      Constructor.
    • Timestamp (std::time_t t) -+
      Constructor.
    • Timestamp (const std::string &s) -+
      Constructor.
    • -+Timestamp (const Timestamp &t) -+
      Copy constructor.
    • -+Timestamp & operator= (const Timestamp &t) -+
      Assignment operator.
    • - virtual ~Timestamp () --
      Destructor.

    • -+
      Destructor.
    • - virtual void setTime (std::time_t t) --
      Sets this timestamp to the specified time_t value.

    • -+
      Sets this timestamp to the specified time_t value.
    • - virtual std::time_t getTime () --
      Gets the time_t value of this timestamp.

    • -+
      Gets the time_t value of this timestamp.
    • - void parse (const std::string &s) --
      Set this timestamp from a YYYY-MM-DD HH:MM:SS[.NNN...] format.

    • -+
      Set this timestamp from a YYYY-MM-DD HH:MM:SS[.NNN...] format.
    • - int getNanos () const --
      Gets the nanoseconds value of this timestamp.

    • -+
      Gets the nanoseconds value of this timestamp.
    • - void setNanos (int nanos) --
      Sets the nanoseconds value of this timestamp.

    • -+
      Sets the nanoseconds value of this timestamp.
    • - virtual std::string toString () const --
      Gets the date as a string in the YYYY-MM-DD format.

    -+
    Gets the date as a string in the YYYY-MM-DD format.
    -

    Detailed Description

    --An SQL TIMESTAMP. -+An SQL TIMESTAMP. -

    -

    Constructor & Destructor Documentation

    --

    -- -+

    -+

    - -- - -@@ -72,25 +70,24 @@ - - -
    -+ - - -- -+ - -- -- -+ -+ - - -- -
    odbc::Timestamp::Timestamp odbc::Timestamp::Timestamp (   )   )  [explicit]
    -
    - -

    --Constructor. -+Constructor. -

    - Sets the timestamp to now.

    --

    -- -+

    -+

    - -- - -@@ -103,25 +100,24 @@ - - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    odbc::Timestamp::Timestamp odbc::Timestamp::Timestamp ( std::time_t   t )  t  ) 
    -
    - -

    --Constructor. -+Constructor. -

    - Sets this timestamp to the specified time_t value.

    --

    -- -+

    -+

    - -- - -@@ -134,13 +130,13 @@ - - -
    -+ - - -- -+ - - -- -- -+ -+ - - -- -
    odbc::Timestamp::Timestamp odbc::Timestamp::Timestamp ( const std::string &   s )  s  ) 
    -
    - -

    --Constructor. -+Constructor. -

    - Sets this timestamp from a YYYY-MM-DD HH:MM:SS[.NNN...] format

    -

    The documentation for this class was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_timestamp-members.html libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_timestamp-members.html ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_timestamp-members.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_timestamp-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,53 +1,52 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Timestamp Member List

    This is the complete list of members for odbc::Timestamp, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Timestamp Member List

    This is the complete list of members for odbc::Timestamp, including all inherited members.

    Date(int year, int month, int day)odbc::Date
    Date()odbc::Date [explicit]
    Date(std::time_t t)odbc::Date
    Date(const std::string &str)odbc::Date
    Date(const Date &d)odbc::Date
    getDay() constodbc::Date
    getHour() constodbc::Time
    getMinute() constodbc::Time
    getMonth() constodbc::Date
    getNanos() constodbc::Timestamp
    getSecond() constodbc::Time
    getTime()odbc::Timestamp [virtual]
    odbc::Date::getTime() constodbc::Date
    odbc::Time::getTime() constodbc::Time
    getYear() constodbc::Date
    operator=(const Timestamp &t)odbc::Timestamp
    odbc::Date::operator=(const Date &d)odbc::Date
    odbc::Time::operator=(const Time &t)odbc::Time
    parse(const std::string &s)odbc::Timestamp
    setDay(int day)odbc::Date
    setHour(int h)odbc::Time
    setMinute(int m)odbc::Time
    setMonth(int month)odbc::Date
    setNanos(int nanos)odbc::Timestamp
    setSecond(int s)odbc::Time
    setTime(std::time_t t)odbc::Timestamp [virtual]
    setYear(int year)odbc::Date
    Time(int hour, int minute, int second)odbc::Time
    Time()odbc::Time [explicit]
    Time(std::time_t t)odbc::Time
    Time(const std::string &str)odbc::Time
    Time(const Time &t)odbc::Time
    Timestamp(int year, int month, int day, int hour, int minute, int second, int nanos=0)odbc::Timestamp
    Timestamp()odbc::Timestamp [explicit]
    Timestamp(std::time_t t)odbc::Timestamp
    Timestamp(const std::string &s)odbc::Timestamp
    Timestamp(const Timestamp &t)odbc::Timestamp
    toString() constodbc::Timestamp [virtual]
    ~Date()odbc::Date [virtual]
    ~Time()odbc::Time [virtual]
    ~Timestamp()odbc::Timestamp [virtual]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    Date(int year, int month, int day)odbc::Date
    Date()odbc::Date [explicit]
    Date(std::time_t t)odbc::Date
    Date(const std::string &str)odbc::Date
    Date(const Date &d)odbc::Date
    getDay() constodbc::Date
    getHour() constodbc::Time
    getMinute() constodbc::Time
    getMonth() constodbc::Date
    getNanos() constodbc::Timestamp
    getSecond() constodbc::Time
    getTime()odbc::Timestamp [virtual]
    odbc::Date::getTime() constodbc::Date
    odbc::Time::getTime() constodbc::Time
    getYear() constodbc::Date
    operator=(const Timestamp &t)odbc::Timestamp
    odbc::Date::operator=(const Date &d)odbc::Date
    odbc::Time::operator=(const Time &t)odbc::Time
    parse(const std::string &s)odbc::Timestamp
    setDay(int day)odbc::Date
    setHour(int h)odbc::Time
    setMinute(int m)odbc::Time
    setMonth(int month)odbc::Date
    setNanos(int nanos)odbc::Timestamp
    setSecond(int s)odbc::Time
    setTime(std::time_t t)odbc::Timestamp [virtual]
    setYear(int year)odbc::Date
    Time(int hour, int minute, int second)odbc::Time
    Time()odbc::Time [explicit]
    Time(std::time_t t)odbc::Time
    Time(const std::string &str)odbc::Time
    Time(const Time &t)odbc::Time
    Timestamp(int year, int month, int day, int hour, int minute, int second, int nanos=0)odbc::Timestamp
    Timestamp()odbc::Timestamp [explicit]
    Timestamp(std::time_t t)odbc::Timestamp
    Timestamp(const std::string &s)odbc::Timestamp
    Timestamp(const Timestamp &t)odbc::Timestamp
    toString() constodbc::Timestamp [virtual]
    ~Date()odbc::Date [virtual]
    ~Time()odbc::Time [virtual]
    ~Timestamp()odbc::Timestamp [virtual]
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/classodbc_1_1_timestamp.png libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_timestamp.png ---- libodbc++-0.2.3/doc/progref/classodbc_1_1_timestamp.png 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/classodbc_1_1_timestamp.png 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,4 @@ -+‰PNG -+ -+ IHDRÚPvVPLTEÿÿÿÿÿÀŸŸ`ÀÀÀ{ÂÿätRNS@æØfIDATxœí–KrÃ0†Å&k¡àÞ ½PV¾ÿ -+’ŸŠXXQ§1$c„ÍϧÉØý(̉©„ß]±}EšJh´¡š†„˜ü!ÚBˆˆ!Ó8RÑrÅ& CG!±ÃAC2Äâ]Z.Œó$ê¦xƒÆ•9G>œ&—HKÃ.,EíA˜h„¹H²iH¡´%ÇhKa¢m_Òˆ÷‘]IË„/iÃÞtKQÉÚVÂÝí4åçvp'×­%Éò{#ä%=9uI\ínOµÿûÏe4£ý1­í޾ݟ<{j*aSÚ­WÂT¶´¾¿ëh*a[Ú'÷¤ÑŒf´†´^kêiîÙ­vA£ÍhF3Ú¥i€åæõ4…Æh—¥Á\Dút5‹¬|]Ú«òçh€Îñb¼8?ÔãÐCŒÁósöøÓ4®Ž+Š¹D‚ãècì¡ ’sóÚ`¼-ß9~# ‘w’CÄ´”²ÚѺ綦e¾Â¹­{rì©žzRfâ}¤UèÉÒl£§9£]“Vû ïšm‰æÙh»¤IEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/config_8h-source.html libodbc++-0.2.3-20050404/doc/progref/config_8h-source.html ---- libodbc++-0.2.3/doc/progref/config_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/config_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,182 +1,181 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/config.h Source File -+libodbc++: odbc++/config.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/config.h

    00001 #if !defined(__ODBCXX_SETUP_H)
--00002 # error "Do not include this file directly. Use <odbc++/setup.h> instead"
--00003 #endif
--00004 /* config.h.  Generated by configure.  */
--00005 /* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/config.h
    00001 #if !defined(__ODBCXX_SETUP_H)
-+00002 # error "Do not include this file directly. Use <odbc++/setup.h> instead"
-+00003 #endif
-+00004 /* config.h.  Generated by configure.  */
-+00005 /* config.h.in.  Generated from configure.ac by autoheader.  */
- 00006 
--00007 /* Defined if threads enabled */
--00008 #define ODBCXX_ENABLE_THREADS 1
--00009 
--00010 /* Define to 1 if you have the <cstdio> header file. */
--00011 #define ODBCXX_HAVE_CSTDIO 1
--00012 
--00013 /* Define to 1 if you have the <cstdlib> header file. */
--00014 #define ODBCXX_HAVE_CSTDLIB 1
--00015 
--00016 /* Define to 1 if you have the <cstring> header file. */
--00017 #define ODBCXX_HAVE_CSTRING 1
--00018 
--00019 /* Define to 1 if you have the <ctime> header file. */
--00020 #define ODBCXX_HAVE_CTIME 1
--00021 
--00022 /* Define to 1 if you have the <dlfcn.h> header file. */
--00023 #define ODBCXX_HAVE_DLFCN_H 1
--00024 
--00025 /* Define to 1 if you have the <exception> header file. */
--00026 #define ODBCXX_HAVE_EXCEPTION 1
--00027 
--00028 /* Define to 1 if you have the <inttypes.h> header file. */
--00029 #define ODBCXX_HAVE_INTTYPES_H 1
--00030 
--00031 /* Define to 1 if you have the <iostream> header file. */
--00032 #define ODBCXX_HAVE_IOSTREAM 1
--00033 
--00034 /* Define to 1 if you have the <iostream.h> header file. */
--00035 #define ODBCXX_HAVE_IOSTREAM_H 1
--00036 
--00037 /* Defined if using iodbc */
--00038 /* #undef ODBCXX_HAVE_ISQLEXT_H */
-+00007 /* Defined if threads enabled */
-+00008 /* #undef ODBCXX_ENABLE_THREADS */
-+00009 
-+00010 /* Define to 1 if you have the <cstdio> header file. */
-+00011 #define ODBCXX_HAVE_CSTDIO 1
-+00012 
-+00013 /* Define to 1 if you have the <cstdlib> header file. */
-+00014 #define ODBCXX_HAVE_CSTDLIB 1
-+00015 
-+00016 /* Define to 1 if you have the <cstring> header file. */
-+00017 #define ODBCXX_HAVE_CSTRING 1
-+00018 
-+00019 /* Define to 1 if you have the <ctime> header file. */
-+00020 #define ODBCXX_HAVE_CTIME 1
-+00021 
-+00022 /* Define to 1 if you have the <dlfcn.h> header file. */
-+00023 #define ODBCXX_HAVE_DLFCN_H 1
-+00024 
-+00025 /* Define to 1 if you have the <exception> header file. */
-+00026 #define ODBCXX_HAVE_EXCEPTION 1
-+00027 
-+00028 /* Define to 1 if you have the <inttypes.h> header file. */
-+00029 #define ODBCXX_HAVE_INTTYPES_H 1
-+00030 
-+00031 /* Define to 1 if you have the <iostream> header file. */
-+00032 #define ODBCXX_HAVE_IOSTREAM 1
-+00033 
-+00034 /* Define to 1 if you have the <iostream.h> header file. */
-+00035 #define ODBCXX_HAVE_IOSTREAM_H 1
-+00036 
-+00037 /* Defined if using iodbc */
-+00038 /* #undef ODBCXX_HAVE_ISQLEXT_H */
- 00039 
--00040 /* Defined if using iodbc */
--00041 /* #undef ODBCXX_HAVE_ISQL_H */
-+00040 /* Defined if using iodbc */
-+00041 /* #undef ODBCXX_HAVE_ISQL_H */
- 00042 
--00043 /* Define to 1 if you have the <istream> header file. */
--00044 #define ODBCXX_HAVE_ISTREAM 1
--00045 
--00046 /* Defined if using iodbc */
--00047 /* #undef ODBCXX_HAVE_LIBIODBC */
-+00043 /* Define to 1 if you have the <istream> header file. */
-+00044 #define ODBCXX_HAVE_ISTREAM 1
-+00045 
-+00046 /* Defined if using iodbc */
-+00047 /* #undef ODBCXX_HAVE_LIBIODBC */
- 00048 
--00049 /* defined if using unixodbc */
--00050 #define ODBCXX_HAVE_LIBODBC 
--00051 
--00052 /* Define to 1 if you have the `localtime_r' function. */
--00053 #define ODBCXX_HAVE_LOCALTIME_R 1
--00054 
--00055 /* Define if we have long long */
--00056 #define ODBCXX_HAVE_LONG_LONG 1
--00057 
--00058 /* Define to 1 if you have the <memory.h> header file. */
--00059 #define ODBCXX_HAVE_MEMORY_H 1
--00060 
--00061 /* Define to 1 if you have the `pthread_create' function. */
--00062 /* #undef ODBCXX_HAVE_PTHREAD_CREATE */
-+00049 /* defined if using unixodbc */
-+00050 #define ODBCXX_HAVE_LIBODBC 
-+00051 
-+00052 /* Define to 1 if you have the `localtime_r' function. */
-+00053 /* #undef ODBCXX_HAVE_LOCALTIME_R */
-+00054 
-+00055 /* Define if we have long long */
-+00056 #define ODBCXX_HAVE_LONG_LONG 1
-+00057 
-+00058 /* Define to 1 if you have the <memory.h> header file. */
-+00059 #define ODBCXX_HAVE_MEMORY_H 1
-+00060 
-+00061 /* Define to 1 if you have the `pthread_create' function. */
-+00062 /* #undef ODBCXX_HAVE_PTHREAD_CREATE */
- 00063 
--00064 /* Defined if pthreads are available */
--00065 #define ODBCXX_HAVE_PTHREAD_H 1
--00066 
--00067 /* Define to 1 if you have the <readline/history.h> header file. */
--00068 #define ODBCXX_HAVE_READLINE_HISTORY_H 1
--00069 
--00070 /* Define to 1 if you have the <readline/readline.h> header file. */
--00071 #define ODBCXX_HAVE_READLINE_READLINE_H 1
--00072 
--00073 /* Define to 1 if you have the <set> header file. */
--00074 #define ODBCXX_HAVE_SET 1
--00075 
--00076 /* Define to 1 if you have the <set.h> header file. */
--00077 #define ODBCXX_HAVE_SET_H 1
--00078 
--00079 /* Define to 1 if you have the `snprintf' function. */
--00080 #define ODBCXX_HAVE_SNPRINTF 1
--00081 
--00082 /* Define to 1 if you have the <sqlext.h> header file. */
--00083 #define ODBCXX_HAVE_SQLEXT_H 1
--00084 
--00085 /* Define to 1 if you have the <sqlucode.h> header file. */
--00086 #define ODBCXX_HAVE_SQLUCODE_H 1
--00087 
--00088 /* Define to 1 if you have the <sql.h> header file. */
--00089 #define ODBCXX_HAVE_SQL_H 1
--00090 
--00091 /* Define to 1 if you have the <sstream> header file. */
--00092 #define ODBCXX_HAVE_SSTREAM 1
--00093 
--00094 /* Define to 1 if you have the <stdint.h> header file. */
--00095 #define ODBCXX_HAVE_STDINT_H 1
--00096 
--00097 /* Define to 1 if you have the <stdlib.h> header file. */
--00098 #define ODBCXX_HAVE_STDLIB_H 1
--00099 
--00100 /* Define to 1 if you have the <string> header file. */
--00101 #define ODBCXX_HAVE_STRING 1
--00102 
--00103 /* Define to 1 if you have the <strings.h> header file. */
--00104 #define ODBCXX_HAVE_STRINGS_H 1
--00105 
--00106 /* Define to 1 if you have the <string.h> header file. */
--00107 #define ODBCXX_HAVE_STRING_H 1
--00108 
--00109 /* Define to 1 if you have the <strstream> header file. */
--00110 #define ODBCXX_HAVE_STRSTREAM 1
--00111 
--00112 /* Define to 1 if you have the <strstream.h> header file. */
--00113 #define ODBCXX_HAVE_STRSTREAM_H 1
--00114 
--00115 /* Define to 1 if you have the `strtoll' function. */
--00116 /* #undef ODBCXX_HAVE_STRTOLL */
--00117 
--00118 /* Define to 1 if you have the `strtoq' function. */
--00119 /* #undef ODBCXX_HAVE_STRTOQ */
--00120 
--00121 /* Define to 1 if you have the <sys/stat.h> header file. */
--00122 #define ODBCXX_HAVE_SYS_STAT_H 1
--00123 
--00124 /* Define to 1 if you have the <sys/types.h> header file. */
--00125 #define ODBCXX_HAVE_SYS_TYPES_H 1
--00126 
--00127 /* Define to 1 if you have the <unistd.h> header file. */
--00128 #define ODBCXX_HAVE_UNISTD_H 1
--00129 
--00130 /* Define to 1 if you have the <vector> header file. */
--00131 #define ODBCXX_HAVE_VECTOR 1
--00132 
--00133 /* Define to 1 if you have the <vector.h> header file. */
--00134 #define ODBCXX_HAVE_VECTOR_H 1
--00135 
--00136 /* ODBC version */
--00137 /* #undef ODBCXX_ODBCVER */
-+00064 /* Defined if pthreads are available */
-+00065 /* #undef ODBCXX_HAVE_PTHREAD_H */
-+00066 
-+00067 /* Define to 1 if you have the <readline/history.h> header file. */
-+00068 /* #undef ODBCXX_HAVE_READLINE_HISTORY_H */
-+00069 
-+00070 /* Define to 1 if you have the <readline/readline.h> header file. */
-+00071 /* #undef ODBCXX_HAVE_READLINE_READLINE_H */
-+00072 
-+00073 /* Define to 1 if you have the <set> header file. */
-+00074 #define ODBCXX_HAVE_SET 1
-+00075 
-+00076 /* Define to 1 if you have the <set.h> header file. */
-+00077 #define ODBCXX_HAVE_SET_H 1
-+00078 
-+00079 /* Define to 1 if you have the `snprintf' function. */
-+00080 #define ODBCXX_HAVE_SNPRINTF 1
-+00081 
-+00082 /* Define to 1 if you have the <sqlext.h> header file. */
-+00083 #define ODBCXX_HAVE_SQLEXT_H 1
-+00084 
-+00085 /* Define to 1 if you have the <sqlucode.h> header file. */
-+00086 #define ODBCXX_HAVE_SQLUCODE_H 1
-+00087 
-+00088 /* Define to 1 if you have the <sql.h> header file. */
-+00089 #define ODBCXX_HAVE_SQL_H 1
-+00090 
-+00091 /* Define to 1 if you have the <sstream> header file. */
-+00092 #define ODBCXX_HAVE_SSTREAM 1
-+00093 
-+00094 /* Define to 1 if you have the <stdint.h> header file. */
-+00095 #define ODBCXX_HAVE_STDINT_H 1
-+00096 
-+00097 /* Define to 1 if you have the <stdlib.h> header file. */
-+00098 #define ODBCXX_HAVE_STDLIB_H 1
-+00099 
-+00100 /* Define to 1 if you have the <string> header file. */
-+00101 #define ODBCXX_HAVE_STRING 1
-+00102 
-+00103 /* Define to 1 if you have the <strings.h> header file. */
-+00104 #define ODBCXX_HAVE_STRINGS_H 1
-+00105 
-+00106 /* Define to 1 if you have the <string.h> header file. */
-+00107 #define ODBCXX_HAVE_STRING_H 1
-+00108 
-+00109 /* Define to 1 if you have the <strstream> header file. */
-+00110 #define ODBCXX_HAVE_STRSTREAM 1
-+00111 
-+00112 /* Define to 1 if you have the <strstream.h> header file. */
-+00113 /* #undef ODBCXX_HAVE_STRSTREAM_H */
-+00114 
-+00115 /* Define to 1 if you have the `strtoll' function. */
-+00116 #define ODBCXX_HAVE_STRTOLL 1
-+00117 
-+00118 /* Define to 1 if you have the `strtoq' function. */
-+00119 #define ODBCXX_HAVE_STRTOQ 1
-+00120 
-+00121 /* Define to 1 if you have the <sys/stat.h> header file. */
-+00122 #define ODBCXX_HAVE_SYS_STAT_H 1
-+00123 
-+00124 /* Define to 1 if you have the <sys/types.h> header file. */
-+00125 #define ODBCXX_HAVE_SYS_TYPES_H 1
-+00126 
-+00127 /* Define to 1 if you have the <unistd.h> header file. */
-+00128 #define ODBCXX_HAVE_UNISTD_H 1
-+00129 
-+00130 /* Define to 1 if you have the <vector> header file. */
-+00131 #define ODBCXX_HAVE_VECTOR 1
-+00132 
-+00133 /* Define to 1 if you have the <vector.h> header file. */
-+00134 #define ODBCXX_HAVE_VECTOR_H 1
-+00135 
-+00136 /* ODBC version */
-+00137 /* #undef ODBCXX_ODBCVER */
- 00138 
--00139 /* Name of package */
--00140 #define ODBCXX_PACKAGE "libodbc++"
--00141 
--00142 /* Define to the address where bug reports for this package should be sent. */
--00143 #define ODBCXX_PACKAGE_BUGREPORT "freeodbc++@orcane.net"
--00144 
--00145 /* Define to the full name of this package. */
--00146 #define ODBCXX_PACKAGE_NAME "libodbcxx"
--00147 
--00148 /* Define to the full name and version of this package. */
--00149 #define ODBCXX_PACKAGE_STRING "libodbcxx 0.2.3"
--00150 
--00151 /* Define to the one symbol short name of this package. */
--00152 #define ODBCXX_PACKAGE_TARNAME "libodbc++"
--00153 
--00154 /* Define to the version of this package. */
--00155 #define ODBCXX_PACKAGE_VERSION "0.2.3"
--00156 
--00157 /* The size of a `int', as computed by sizeof. */
--00158 #define ODBCXX_SIZEOF_INT 4
--00159 
--00160 /* The size of a `long', as computed by sizeof. */
--00161 #define ODBCXX_SIZEOF_LONG 4
--00162 
--00163 /* The size of a `long long', as computed by sizeof. */
--00164 #define ODBCXX_SIZEOF_LONG_LONG 8
--00165 
--00166 /* Define to 1 if you have the ANSI C header files. */
--00167 #define ODBCXX_STDC_HEADERS 1
--00168 
--00169 /* Version number of package */
--00170 #define ODBCXX_VERSION "0.2.3"
--
    -+00139 /* Name of package */ -+00140 #define ODBCXX_PACKAGE "libodbc++" -+00141 -+00142 /* Define to the address where bug reports for this package should be sent. */ -+00143 #define ODBCXX_PACKAGE_BUGREPORT "freeodbc++@orcane.net" -+00144 -+00145 /* Define to the full name of this package. */ -+00146 #define ODBCXX_PACKAGE_NAME "libodbcxx" -+00147 -+00148 /* Define to the full name and version of this package. */ -+00149 #define ODBCXX_PACKAGE_STRING "libodbcxx 0.2.3" -+00150 -+00151 /* Define to the one symbol short name of this package. */ -+00152 #define ODBCXX_PACKAGE_TARNAME "libodbc++" -+00153 -+00154 /* Define to the version of this package. */ -+00155 #define ODBCXX_PACKAGE_VERSION "0.2.3" -+00156 -+00157 /* The size of a `int', as computed by sizeof. */ -+00158 #define ODBCXX_SIZEOF_INT 4 -+00159 -+00160 /* The size of a `long', as computed by sizeof. */ -+00161 #define ODBCXX_SIZEOF_LONG 4 -+00162 -+00163 /* The size of a `long long', as computed by sizeof. */ -+00164 #define ODBCXX_SIZEOF_LONG_LONG 8 -+00165 -+00166 /* Define to 1 if you have the ANSI C header files. */ -+00167 #define ODBCXX_STDC_HEADERS 1 -+00168 -+00169 /* Version number of package */ -+00170 #define ODBCXX_VERSION "0.2.3" -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/config-win32_8h-source.html libodbc++-0.2.3-20050404/doc/progref/config-win32_8h-source.html ---- libodbc++-0.2.3/doc/progref/config-win32_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/config-win32_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,103 +1,102 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/config-win32.h Source File -+libodbc++: odbc++/config-win32.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/config-win32.h

    00001 #if !defined(__ODBCXX_SETUP_H)
--00002 # error "Do not include this file directly. Use <odbc++/setup.h> instead"
--00003 #endif
--00004 
--00005 #define ODBCXX_HAVE_SQL_H
--00006 #define ODBCXX_HAVE_SQLEXT_H
--00007 #define ODBCXX_HAVE_SQLUCODE_H
--00008 
--00009 #define ODBCXX_HAVE_CSTDIO
--00010 #define ODBCXX_HAVE_CSTDLIB
--00011 #define ODBCXX_HAVE_CSTRING
--00012 #define ODBCXX_HAVE_CTIME
--00013 #define ODBCXX_HAVE_IOSTREAM
--00014 #define ODBCXX_HAVE_STRSTREAM
--00015 #define ODBCXX_HAVE_SET
--00016 #define ODBCXX_HAVE_VECTOR
--00017 
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/config-win32.h
    00001 #if !defined(__ODBCXX_SETUP_H)
-+00002 # error "Do not include this file directly. Use <odbc++/setup.h> instead"
-+00003 #endif
-+00004 
-+00005 #define ODBCXX_HAVE_SQL_H
-+00006 #define ODBCXX_HAVE_SQLEXT_H
-+00007 #define ODBCXX_HAVE_SQLUCODE_H
-+00008 
-+00009 #define ODBCXX_HAVE_CSTDIO
-+00010 #define ODBCXX_HAVE_CSTDLIB
-+00011 #define ODBCXX_HAVE_CSTRING
-+00012 #define ODBCXX_HAVE_CTIME
-+00013 #define ODBCXX_HAVE_IOSTREAM
-+00014 #define ODBCXX_HAVE_STRSTREAM
-+00015 #define ODBCXX_HAVE_SET
-+00016 #define ODBCXX_HAVE_VECTOR
-+00017 
- 00018 
--00019 #define ODBCXX_ENABLE_THREADS
--00020 
--00021 #if defined(_MSC_VER)
--00022 // MSVC has a rather compliant CXX lib
--00023 # define ODBCXX_HAVE_ISO_CXXLIB
--00024 
--00025 # define ODBCXX_HAVE__ITOA
--00026 # define ODBCXX_HAVE__STRICMP
--00027 # define ODBCXX_HAVE__SNPRINTF
--00028 
--00029 # define ODBCXX_HAVE__I64TOA
--00030 # define ODBCXX_HAVE__ATOI64
--00031 # define ODBCXX_HAVE__ATOI
--00032 
--00033 // disable the 'identifier name truncated in debug info' warning
--00034 # pragma warning(disable:4786)
--00035 
--00036 // disable the 'class blah blah should be exported' warning
--00037 // don't know if this is dangerous, but it only whines about templated
--00038 // and/or inlined classes and it really bothers me =)
--00039 # if defined(ODBCXX_DLL)
--00040 #  pragma warning(disable:4251)
--00041 # endif
--00042 
--00043 # if _MSC_VER <= 1200
--00044 #  define ODBCXX_NO_STD_TIME_T
--00045 # endif
--00046 
--00047 #endif // _MSC_VER
--00048 
-+00019 #define ODBCXX_ENABLE_THREADS
-+00020 
-+00021 #if defined(_MSC_VER)
-+00022 // MSVC has a rather compliant CXX lib
-+00023 # define ODBCXX_HAVE_ISO_CXXLIB
-+00024 
-+00025 # define ODBCXX_HAVE__ITOA
-+00026 # define ODBCXX_HAVE__STRICMP
-+00027 # define ODBCXX_HAVE__SNPRINTF
-+00028 
-+00029 # define ODBCXX_HAVE__I64TOA
-+00030 # define ODBCXX_HAVE__ATOI64
-+00031 # define ODBCXX_HAVE__ATOI
-+00032 
-+00033 // disable the 'identifier name truncated in debug info' warning
-+00034 # pragma warning(disable:4786)
-+00035 
-+00036 // disable the 'class blah blah should be exported' warning
-+00037 // don't know if this is dangerous, but it only whines about templated
-+00038 // and/or inlined classes and it really bothers me =)
-+00039 # if defined(ODBCXX_DLL)
-+00040 #  pragma warning(disable:4251)
-+00041 # endif
-+00042 
-+00043 # if _MSC_VER <= 1200
-+00044 #  define ODBCXX_NO_STD_TIME_T
-+00045 # endif
-+00046 
-+00047 #endif // _MSC_VER
-+00048 
- 00049 
- 00050 
--00051 #if defined(__BORLANDC__)
--00052 
--00053 // FIXME: this should check for older versions
--00054 # define ODBCXX_HAVE_ISO_CXXLIB
--00055 
--00056 # if !defined(_RWSTD_NO_EX_SPEC)
--00057 #  define _RWSTD_NO_EX_SPEC 1
--00058 # endif
--00059 // sql.h only defines this for msc, but borland has __int64 as well
--00060 # if !defined(ODBCINT64)
--00061 #  define ODBCINT64 __int64
--00062 # endif
--00063 
--00064 # define ODBCXX_HAVE_ITOA 1
--00065 # define ODBCXX_HAVE_STRICMP 1
--00066 
--00067 #endif // __BORLANDC__
--00068 
-+00051 #if defined(__BORLANDC__)
-+00052 
-+00053 // FIXME: this should check for older versions
-+00054 # define ODBCXX_HAVE_ISO_CXXLIB
-+00055 
-+00056 # if !defined(_RWSTD_NO_EX_SPEC)
-+00057 #  define _RWSTD_NO_EX_SPEC 1
-+00058 # endif
-+00059 // sql.h only defines this for msc, but borland has __int64 as well
-+00060 # if !defined(ODBCINT64)
-+00061 #  define ODBCINT64 __int64
-+00062 # endif
-+00063 
-+00064 # define ODBCXX_HAVE_ITOA 1
-+00065 # define ODBCXX_HAVE_STRICMP 1
-+00066 
-+00067 #endif // __BORLANDC__
-+00068 
- 00069 
--00070 #if defined(__MINGW32__)
--00071 
--00072 // the MS runtime has those
--00073 # if defined(__MSVCRT__)
--00074 #  define ODBCXX_HAVE__I64TOA
--00075 #  define ODBCXX_HAVE__ATOI64
--00076 # endif
--00077 
--00078 #define ODBCXX_HAVE__ITOA
--00079 #define ODBCXX_HAVE__STRICMP
--00080 
--00081 #define ODBCXX_HAVE__SNPRINTF
--00082 
--00083 // same as with borland
--00084 # if !defined(ODBCINT64)
--00085 #  define ODBCINT64 __int64
--00086 # endif
--00087 
--00088 #endif // __MINGW32__
--00089 
--00090 #define WIN32_LEAN_AND_MEAN
--00091 #include <windows.h>
--
    -+00070 #if defined(__MINGW32__) -+00071 -+00072 // the MS runtime has those -+00073 # if defined(__MSVCRT__) -+00074 # define ODBCXX_HAVE__I64TOA -+00075 # define ODBCXX_HAVE__ATOI64 -+00076 # endif -+00077 -+00078 #define ODBCXX_HAVE__ITOA -+00079 #define ODBCXX_HAVE__STRICMP -+00080 -+00081 #define ODBCXX_HAVE__SNPRINTF -+00082 -+00083 // same as with borland -+00084 # if !defined(ODBCINT64) -+00085 # define ODBCINT64 __int64 -+00086 # endif -+00087 -+00088 #endif // __MINGW32__ -+00089 -+00090 #define WIN32_LEAN_AND_MEAN -+00091 #include <windows.h> -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/connection_8h-source.html libodbc++-0.2.3-20050404/doc/progref/connection_8h-source.html ---- libodbc++-0.2.3/doc/progref/connection_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/connection_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,89 +1,88 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/connection.h Source File -+libodbc++: odbc++/connection.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/connection.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/connection.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_CONNECTION_H
--00023 #define __ODBCXX_CONNECTION_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/errorhandler.h>
-+00022 #ifndef __ODBCXX_CONNECTION_H
-+00023 #define __ODBCXX_CONNECTION_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/errorhandler.h>
- 00028 
--00029 namespace odbc {
-+00029 namespace odbc {
- 00030 
--00031   class DriverInfo;
--00032   class DatabaseMetaData;
--00033   class Statement;
--00034   class PreparedStatement;
--00035   class CallableStatement;
-+00031   class DriverInfo;
-+00032   class DatabaseMetaData;
-+00033   class Statement;
-+00034   class PreparedStatement;
-+00035   class CallableStatement;
- 00036 
--00038   class ODBCXX_EXPORT Connection : public ErrorHandler {
--00039     friend class DriverManager;
--00040     friend class Statement;
--00041     friend class DatabaseMetaData;
--00042     friend class DriverInfo;
-+00038   class ODBCXX_EXPORT Connection : public ErrorHandler {
-+00039     friend class DriverManager;
-+00040     friend class Statement;
-+00041     friend class DatabaseMetaData;
-+00042     friend class DriverInfo;
- 00043 
--00044   private:
--00045     struct PD;
--00046     // private data
-+00044   private:
-+00045     struct PD;
-+00046     // private data
- 00047     PD* pd_;
- 00048 
- 00049     SQLHDBC hdbc_;
- 00050 
--00051     DatabaseMetaData* metaData_;
-+00051     DatabaseMetaData* metaData_;
- 00052     DriverInfo* driverInfo_;
- 00053     
--00054     //utilities
-+00054     //utilities
- 00055     SQLUINTEGER _getNumericOption(SQLINTEGER optnum);
- 00056     ODBCXX_STRING _getStringOption(SQLINTEGER optnum);
--00057     void _setNumericOption(SQLINTEGER optnum, SQLUINTEGER value);
--00058     void _setStringOption(SQLINTEGER optnum, const ODBCXX_STRING& value);
-+00057     void _setNumericOption(SQLINTEGER optnum, SQLUINTEGER value);
-+00058     void _setStringOption(SQLINTEGER optnum, const ODBCXX_STRING& value);
- 00059     
- 00060     SQLHSTMT _allocStmt();
- 00061 
--00062     //private constructor, called from DriverManager
-+00062     //private constructor, called from DriverManager
- 00063     Connection(SQLHDBC h);
- 00064 
--00065     void _connect(const ODBCXX_STRING& dsn,
--00066                   const ODBCXX_STRING& user,
--00067                   const ODBCXX_STRING& password);
-+00065     void _connect(const ODBCXX_STRING& dsn,
-+00066                   const ODBCXX_STRING& user,
-+00067                   const ODBCXX_STRING& password);
- 00068 
--00069     void _connect(const ODBCXX_STRING& connectString);
-+00069     void _connect(const ODBCXX_STRING& connectString);
- 00070 
--00071     void _registerStatement(Statement* stmt);
--00072     void _unregisterStatement(Statement* stmt);
-+00071     void _registerStatement(Statement* stmt);
-+00072     void _unregisterStatement(Statement* stmt);
- 00073 
--00074     const DriverInfo* _getDriverInfo() const {
--00075       return driverInfo_;
-+00074     const DriverInfo* _getDriverInfo() const {
-+00075       return driverInfo_;
- 00076     }
- 00077 
--00078   public:
--00081     enum TransactionIsolation {
-+00078   public:
-+00081     enum TransactionIsolation {
- 00083       TRANSACTION_NONE,
- 00085       TRANSACTION_READ_UNCOMMITTED,
- 00087       TRANSACTION_READ_COMMITTED,
-@@ -91,67 +90,67 @@
- 00091       TRANSACTION_SERIALIZABLE
- 00092     };
- 00093     
--00095     virtual ~Connection();
-+00095     virtual ~Connection();
- 00096     
--00098     bool getAutoCommit();
-+00098     bool getAutoCommit();
- 00099     
--00103     void setAutoCommit(bool autoCommit);
-+00103     void setAutoCommit(bool autoCommit);
- 00104 
--00106     void commit();
-+00106     void commit();
- 00107 
--00109     void rollback();
-+00109     void rollback();
- 00110 
- 00112     ODBCXX_STRING getCatalog();
- 00113 
--00115     void setCatalog(const ODBCXX_STRING& catalog);
-+00115     void setCatalog(const ODBCXX_STRING& catalog);
- 00116 
- 00118     TransactionIsolation getTransactionIsolation();
- 00119 
--00121     void setTransactionIsolation(TransactionIsolation isolation);
-+00121     void setTransactionIsolation(TransactionIsolation isolation);
- 00122 
--00124     bool isReadOnly();
-+00124     bool isReadOnly();
- 00125 
--00127     void setReadOnly(bool readOnly);
-+00127     void setReadOnly(bool readOnly);
- 00128 
--00131     bool getTrace();
-+00131     bool getTrace();
- 00132 
--00134     void setTrace(bool on);
-+00134     void setTrace(bool on);
- 00135 
- 00137     ODBCXX_STRING getTraceFile();
- 00138 
--00140     void setTraceFile(const ODBCXX_STRING& s);
-+00140     void setTraceFile(const ODBCXX_STRING& s);
- 00141 
--00147     DatabaseMetaData* getMetaData();
-+00147     DatabaseMetaData* getMetaData();
- 00148 
- 00149     
--00151     Statement* createStatement();
-+00151     Statement* createStatement();
- 00152 
--00159     Statement* createStatement(int resultSetType,
--00160                                int resultSetConcurrency);
-+00159     Statement* createStatement(int resultSetType,
-+00160                                int resultSetConcurrency);
- 00161     
- 00162     
--00167     PreparedStatement* prepareStatement(const ODBCXX_STRING& sql);
-+00167     PreparedStatement* prepareStatement(const ODBCXX_STRING& sql);
- 00168 
--00177     PreparedStatement* prepareStatement(const ODBCXX_STRING& sql,
--00178                                         int resultSetType,
--00179                                         int resultSetConcurrency);
-+00177     PreparedStatement* prepareStatement(const ODBCXX_STRING& sql,
-+00178                                         int resultSetType,
-+00179                                         int resultSetConcurrency);
- 00180     
--00185     CallableStatement* prepareCall(const ODBCXX_STRING& sql);
-+00185     CallableStatement* prepareCall(const ODBCXX_STRING& sql);
- 00186 
--00195     CallableStatement* prepareCall(const ODBCXX_STRING& sql,
--00196                                    int resultSetType,
--00197                                    int resultSetConcurrency);
-+00195     CallableStatement* prepareCall(const ODBCXX_STRING& sql,
-+00196                                    int resultSetType,
-+00197                                    int resultSetConcurrency);
- 00198 
--00202     ODBCXX_STRING nativeSQL(const ODBCXX_STRING& sql);
-+00202     ODBCXX_STRING nativeSQL(const ODBCXX_STRING& sql);
- 00203   };
- 00204 
- 00205 
- 00206 
--00207 }; // namespace odbc
-+00207 }; // namespace odbc
- 00208 
- 00209 
--00210 #endif // __ODBCXX_CONNECTION_H
--
    -+00210 #endif // __ODBCXX_CONNECTION_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/databasemetadata_8h-source.html libodbc++-0.2.3-20050404/doc/progref/databasemetadata_8h-source.html ---- libodbc++-0.2.3/doc/progref/databasemetadata_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/databasemetadata_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,108 +1,107 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/databasemetadata.h Source File -+libodbc++: odbc++/databasemetadata.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/databasemetadata.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/databasemetadata.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_DATABASEMETADATA_H
--00023 #define __ODBCXX_DATABASEMETADATA_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/connection.h>
-+00022 #ifndef __ODBCXX_DATABASEMETADATA_H
-+00023 #define __ODBCXX_DATABASEMETADATA_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/connection.h>
- 00028 
--00029 namespace odbc {
-+00029 namespace odbc {
- 00030 
--00031   class ResultSet;
--00032   class DriverInfo;
-+00031   class ResultSet;
-+00032   class DriverInfo;
- 00033 
--00043   class ODBCXX_EXPORT DatabaseMetaData {
--00044     friend class Connection;
--00045     friend class DriverInfo;
-+00043   class ODBCXX_EXPORT DatabaseMetaData {
-+00044     friend class Connection;
-+00045     friend class DriverInfo;
- 00046     
--00047   private:
--00048     Connection* connection_;
-+00047   private:
-+00048     Connection* connection_;
- 00049     
--00050     DatabaseMetaData(Connection* c);
-+00050     DatabaseMetaData(Connection* c);
- 00051     ~DatabaseMetaData();
- 00052 
--00053     const DriverInfo* _getDriverInfo() const {
--00054       return connection_->_getDriverInfo();
-+00053     const DriverInfo* _getDriverInfo() const {
-+00054       return connection_->_getDriverInfo();
- 00055     }
- 00056 
--00057     SQLUSMALLINT _getNumeric16(int what);
--00058     SQLUINTEGER _getNumeric32(int what);
-+00057     SQLUSMALLINT _getNumeric16(int what);
-+00058     SQLUINTEGER _getNumeric32(int what);
- 00059 
--00060     ODBCXX_STRING _getStringInfo(int what);
--00061     bool _ownXXXAreVisible(int type, int what);
-+00060     ODBCXX_STRING _getStringInfo(int what);
-+00061     bool _ownXXXAreVisible(int type, int what);
- 00062     
--00063 #if ODBCVER >= 0x0300
--00064     // returns all CA1 or-ed together
-+00063 #if ODBCVER >= 0x0300
-+00064     // returns all CA1 or-ed together
- 00065     SQLUINTEGER _getAllCursorAttributes1();
--00066 #endif
--00067 
--00068   public:
-+00066 #endif
-+00067 
-+00068   public:
- 00069 
--00071     Connection* getConnection() {
--00072       return connection_;
-+00071     Connection* getConnection() {
-+00072       return connection_;
- 00073     }
- 00074 
--00076     enum {
-+00076     enum {
- 00077       bestRowTemporary          = SQL_SCOPE_CURROW,
- 00078       bestRowTransaction        = SQL_SCOPE_TRANSACTION,
- 00079       bestRowSession            = SQL_SCOPE_SESSION
- 00080     };
- 00081 
--00083     enum {
-+00083     enum {
- 00084       bestRowUnknown            = SQL_PC_UNKNOWN,
- 00085       bestRowPseudo             = SQL_PC_PSEUDO,
- 00086       bestRowNotPseudo          = SQL_PC_NOT_PSEUDO
- 00087     };
- 00088     
- 00089 
--00093     enum {
-+00093     enum {
- 00094       versionColumnNotPseudo    = SQL_PC_NOT_PSEUDO,
- 00095       versionColumnPseudo       = SQL_PC_PSEUDO,
- 00096       versionColumnUnknown      = SQL_PC_UNKNOWN
- 00097     };
- 00098 
- 00099 
--00103     enum {
-+00103     enum {
- 00104       typeNoNulls               = SQL_NO_NULLS,
- 00105       typeNullable              = SQL_NULLABLE,
- 00106       typeNullableUnknown       = SQL_NULLABLE_UNKNOWN
- 00107     };
- 00108 
--00113     enum {
-+00113     enum {
- 00114       columnNoNulls             = SQL_NO_NULLS,
- 00115       columnNullable            = SQL_NULLABLE,
- 00116       columnNullableUnknown     = SQL_NULLABLE_UNKNOWN
- 00117     };
- 00118 
--00120     enum {
-+00120     enum {
- 00122       typePredNone              = SQL_UNSEARCHABLE,
- 00124       typePredChar              = SQL_LIKE_ONLY,
- 00126       typePredBasic             = SQL_ALL_EXCEPT_LIKE,
-@@ -110,17 +109,17 @@
- 00129     };
- 00130 
- 00131 
--00135 #if ODBCVER >= 0x0300
--00136     enum {
-+00135 #if ODBCVER >= 0x0300
-+00136     enum {
- 00137       importedKeyCascade        = SQL_CASCADE,
- 00138       importedKeySetNull        = SQL_SET_NULL,
- 00139       importedKeySetDefault     = SQL_SET_DEFAULT,
- 00140       importedKeyNoAction       = SQL_NO_ACTION,
- 00141       importedKeyRestrict       = SQL_RESTRICT
- 00142     };
--00143 #else
--00144     // workaround mode on
--00145     enum {
-+00143 #else
-+00144     // workaround mode on
-+00145     enum {
- 00146       importedKeyCascade        = SQL_CASCADE,
- 00147       importedKeySetNull        = SQL_SET_NULL,
- 00148       importedKeyRestrict       = SQL_RESTRICT,
-@@ -128,29 +127,29 @@
- 00150       importedKeySetDefault
- 00151     };
- 00152     
--00153 #endif
--00154 
--00155 #if ODBCVER >= 0x0300
--00156 #if !defined(SQL_NOT_DEFERRABLE)
--00157 # warning "Your sqlext.h is missing SQL_NOT_DEFERRABLE, consider upgrading"
--00158 # define SQL_NOT_DEFERRABLE 7
--00159 #endif
--00160 
--00161     enum {
-+00153 #endif
-+00154 
-+00155 #if ODBCVER >= 0x0300
-+00156 #if !defined(SQL_NOT_DEFERRABLE)
-+00157 # warning "Your sqlext.h is missing SQL_NOT_DEFERRABLE, consider upgrading"
-+00158 # define SQL_NOT_DEFERRABLE 7
-+00159 #endif
-+00160 
-+00161     enum {
- 00162       importedKeyInitiallyDeferred      = SQL_INITIALLY_DEFERRED,
- 00163       importedKeyInitiallyImmediate     = SQL_INITIALLY_IMMEDIATE,
- 00164       importedKeyNotDeferrable          = SQL_NOT_DEFERRABLE
- 00165     };
--00166 #endif
--00167 
--00169     enum {
-+00166 #endif
-+00167 
-+00169     enum {
- 00170       tableIndexClustered       = SQL_INDEX_CLUSTERED,
- 00171       tableIndexHashed          = SQL_INDEX_HASHED,
- 00172       tableIndexOther           = SQL_INDEX_OTHER,
- 00173       tableIndexStatistic       = SQL_TABLE_STAT
- 00174     };
- 00175 
--00179     enum {
-+00179     enum {
- 00180       procedureColumnIn         = SQL_PARAM_INPUT,
- 00181       procedureColumnInOut      = SQL_PARAM_INPUT_OUTPUT,
- 00182       procedureColumnOut        = SQL_PARAM_OUTPUT,
-@@ -159,13 +158,13 @@
- 00185       procedureColumnUnknown    = SQL_PARAM_TYPE_UNKNOWN
- 00186     };
- 00187 
--00191     enum {
-+00191     enum {
- 00192       procedureNoNulls          = SQL_NO_NULLS,
- 00193       procedureNullable         = SQL_NULLABLE,
- 00194       procedureNullableUnknown  = SQL_NULLABLE_UNKNOWN
- 00195     };
- 00196 
--00200     enum {
-+00200     enum {
- 00201       procedureReturnsResult    = SQL_PT_FUNCTION,
- 00202       procedureNoResult         = SQL_PT_PROCEDURE,
- 00203       procedureResultUnknown    = SQL_PT_UNKNOWN
-@@ -181,9 +180,9 @@
- 00219 
- 00222     ODBCXX_STRING getDriverVersion();
- 00223 
--00225     int getDriverMajorVersion();
-+00225     int getDriverMajorVersion();
- 00226 
--00228     int getDriverMinorVersion();
-+00228     int getDriverMinorVersion();
- 00229 
- 00233     ODBCXX_STRING getIdentifierQuoteString();
- 00234 
-@@ -199,82 +198,82 @@
- 00257 
- 00264     ODBCXX_STRING getCatalogSeparator();
- 00265 
--00271     bool isCatalogAtStart();
-+00271     bool isCatalogAtStart();
- 00272 
- 00276     ODBCXX_STRING getSQLKeywords();
- 00277     
- 00278     
--00281     bool supportsTransactions();
-+00281     bool supportsTransactions();
- 00282 
--00286     int getDefaultTransactionIsolation();
-+00286     int getDefaultTransactionIsolation();
- 00287 
--00292     bool supportsTransactionIsolationLevel(int lev);
-+00292     bool supportsTransactionIsolationLevel(int lev);
- 00293 
--00306     bool supportsDataDefinitionAndDataManipulationTransactions();
-+00306     bool supportsDataDefinitionAndDataManipulationTransactions();
- 00307 
--00322     bool supportsDataManipulationTransactionsOnly();
-+00322     bool supportsDataManipulationTransactionsOnly();
- 00323 
--00336     bool dataDefinitionCausesTransactionCommit();
-+00336     bool dataDefinitionCausesTransactionCommit();
- 00337 
--00350     bool dataDefinitionIgnoredInTransactions();
-+00350     bool dataDefinitionIgnoredInTransactions();
- 00351     
- 00352 
--00355     bool supportsTableCorrelationNames();
-+00355     bool supportsTableCorrelationNames();
- 00356 
--00359     bool supportsDifferentTableCorrelationNames();
-+00359     bool supportsDifferentTableCorrelationNames();
- 00360 
--00363     bool supportsOrderByUnrelated();
-+00363     bool supportsOrderByUnrelated();
- 00364 
--00367     bool supportsExpressionsInOrderBy();
-+00367     bool supportsExpressionsInOrderBy();
- 00368 
--00373     bool supportsOpenCursorsAcrossCommit();
-+00373     bool supportsOpenCursorsAcrossCommit();
- 00374 
- 00375 
--00380     bool supportsOpenCursorsAcrossRollback();
-+00380     bool supportsOpenCursorsAcrossRollback();
- 00381 
- 00382 
--00387     bool supportsOpenStatementsAcrossCommit();
-+00387     bool supportsOpenStatementsAcrossCommit();
- 00388 
--00393     bool supportsOpenStatementsAcrossRollback();
-+00393     bool supportsOpenStatementsAcrossRollback();
- 00394 
--00400     bool supportsResultSetType(int type);
-+00400     bool supportsResultSetType(int type);
- 00401 
--00408     bool supportsResultSetConcurrency(int type, int concurrency);
-+00408     bool supportsResultSetConcurrency(int type, int concurrency);
- 00409 
- 00410 
--00412     bool supportsCatalogsInDataManipulation();
-+00412     bool supportsCatalogsInDataManipulation();
- 00413 
--00415     bool supportsCatalogsInProcedureCalls();
-+00415     bool supportsCatalogsInProcedureCalls();
- 00416 
--00418     bool supportsCatalogsInTableDefinitions();
-+00418     bool supportsCatalogsInTableDefinitions();
- 00419 
--00421     bool supportsCatalogsInIndexDefinitions();
-+00421     bool supportsCatalogsInIndexDefinitions();
- 00422 
--00424     bool supportsCatalogsInPrivilegeDefinitions();
-+00424     bool supportsCatalogsInPrivilegeDefinitions();
- 00425 
- 00426 
--00428     bool supportsSchemasInDataManipulation();
-+00428     bool supportsSchemasInDataManipulation();
- 00429 
--00431     bool supportsSchemasInProcedureCalls();
-+00431     bool supportsSchemasInProcedureCalls();
- 00432 
--00434     bool supportsSchemasInTableDefinitions();
-+00434     bool supportsSchemasInTableDefinitions();
- 00435 
--00437     bool supportsSchemasInIndexDefinitions();
-+00437     bool supportsSchemasInIndexDefinitions();
- 00438 
--00440     bool supportsSchemasInPrivilegeDefinitions();
-+00440     bool supportsSchemasInPrivilegeDefinitions();
- 00441     
- 00442 
--00445     bool nullPlusNonNullIsNull();
-+00445     bool nullPlusNonNullIsNull();
- 00446 
--00450     bool supportsColumnAliasing();
-+00450     bool supportsColumnAliasing();
- 00451 
--00454     bool supportsConvert();
-+00454     bool supportsConvert();
- 00455 
--00458     bool supportsConvert(int fromType, int toType);
-+00458     bool supportsConvert(int fromType, int toType);
- 00459 
--00462     bool supportsAlterTableWithDropColumn();
-+00462     bool supportsAlterTableWithDropColumn();
- 00463 
--00466     bool supportsAlterTableWithAddColumn();
-+00466     bool supportsAlterTableWithAddColumn();
- 00467 
- 00471     ODBCXX_STRING getExtraNameCharacters();
- 00472 
-@@ -288,254 +287,254 @@
- 00488 
- 00491     ODBCXX_STRING getNumericFunctions();
- 00492 
--00495     bool supportsLikeEscapeClause();
-+00495     bool supportsLikeEscapeClause();
- 00496 
--00499     bool supportsMultipleResultSets();
-+00499     bool supportsMultipleResultSets();
- 00500 
--00504     bool supportsMultipleTransactions();
-+00504     bool supportsMultipleTransactions();
- 00505 
--00508     bool supportsNonNullableColumns();
-+00508     bool supportsNonNullableColumns();
- 00509 
--00512     bool supportsMinimumSQLGrammar();
-+00512     bool supportsMinimumSQLGrammar();
- 00513 
--00516     bool supportsCoreSQLGrammar();
-+00516     bool supportsCoreSQLGrammar();
- 00517     
--00520     bool supportsExtendedSQLGrammar();
-+00520     bool supportsExtendedSQLGrammar();
- 00521 
- 00522 
--00526     bool supportsANSI92EntryLevelSQL();
-+00526     bool supportsANSI92EntryLevelSQL();
- 00527 
--00531     bool supportsANSI92IntermediateSQL();
-+00531     bool supportsANSI92IntermediateSQL();
- 00532     
--00535     bool supportsANSI92FullSQL();
-+00535     bool supportsANSI92FullSQL();
- 00536 
--00542     bool supportsPositionedDelete();
-+00542     bool supportsPositionedDelete();
- 00543 
--00549     bool supportsPositionedUpdate();
-+00549     bool supportsPositionedUpdate();
- 00550 
--00556     bool supportsSelectForUpdate();
-+00556     bool supportsSelectForUpdate();
- 00557 
- 00558 
--00562     bool supportsIntegrityEnhancementFacility();
-+00562     bool supportsIntegrityEnhancementFacility();
- 00563     
--00566     bool supportsBatchUpdates();
-+00566     bool supportsBatchUpdates();
- 00567 
--00570     bool supportsSubqueriesInComparisons();
-+00570     bool supportsSubqueriesInComparisons();
- 00571 
--00575     bool supportsSubqueriesInExists();
-+00575     bool supportsSubqueriesInExists();
- 00576 
--00580     bool supportsSubqueriesInIns();
-+00580     bool supportsSubqueriesInIns();
- 00581 
--00585     bool supportsSubqueriesInQuantifieds();
-+00585     bool supportsSubqueriesInQuantifieds();
- 00586 
- 00587 
--00590     bool supportsCorrelatedSubqueries();
-+00590     bool supportsCorrelatedSubqueries();
- 00591 
--00596     bool ownUpdatesAreVisible(int type);
-+00596     bool ownUpdatesAreVisible(int type);
- 00597     
--00601     bool ownDeletesAreVisible(int type);
-+00601     bool ownDeletesAreVisible(int type);
- 00602     
--00606     bool ownInsertsAreVisible(int type);
-+00606     bool ownInsertsAreVisible(int type);
- 00607 
--00612     bool othersUpdatesAreVisible(int type);
-+00612     bool othersUpdatesAreVisible(int type);
- 00613 
--00618     bool othersDeletesAreVisible(int type);
-+00618     bool othersDeletesAreVisible(int type);
- 00619     
--00624     bool othersInsertsAreVisible(int type);
-+00624     bool othersInsertsAreVisible(int type);
- 00625 
--00630     bool deletesAreDetected(int type);
-+00630     bool deletesAreDetected(int type);
- 00631     
--00636     bool insertsAreDetected(int type);
-+00636     bool insertsAreDetected(int type);
- 00637     
--00642     bool updatesAreDetected(int type);
-+00642     bool updatesAreDetected(int type);
- 00643 
- 00644 
--00648     int getMaxBinaryLiteralLength();
-+00648     int getMaxBinaryLiteralLength();
- 00649 
--00652     int getMaxCharLiteralLength();
-+00652     int getMaxCharLiteralLength();
- 00653 
--00656     int getMaxColumnNameLength();
-+00656     int getMaxColumnNameLength();
- 00657 
--00661     int getMaxColumnsInGroupBy();
-+00661     int getMaxColumnsInGroupBy();
- 00662 
--00665     int getMaxColumnsInIndex();
-+00665     int getMaxColumnsInIndex();
- 00666     
--00670     int getMaxColumnsInOrderBy();
-+00670     int getMaxColumnsInOrderBy();
- 00671 
--00674     int getMaxColumnsInSelect();
-+00674     int getMaxColumnsInSelect();
- 00675 
--00678     int getMaxColumnsInTable();
-+00678     int getMaxColumnsInTable();
- 00679 
--00682     int getMaxCursorNameLength();
-+00682     int getMaxCursorNameLength();
- 00683 
--00686     int getMaxIndexLength();
-+00686     int getMaxIndexLength();
- 00687 
--00690     int getMaxSchemaNameLength();
-+00690     int getMaxSchemaNameLength();
- 00691 
--00694     int getMaxProcedureNameLength();
-+00694     int getMaxProcedureNameLength();
- 00695 
--00698     int getMaxCatalogNameLength();
-+00698     int getMaxCatalogNameLength();
- 00699 
--00702     int getMaxRowSize();
-+00702     int getMaxRowSize();
- 00703 
--00707     bool doesMaxRowSizeIncludeBlobs();
-+00707     bool doesMaxRowSizeIncludeBlobs();
- 00708 
- 00709     
--00712     int getMaxStatementLength();
-+00712     int getMaxStatementLength();
- 00713 
--00716     int getMaxTableNameLength();
-+00716     int getMaxTableNameLength();
- 00717 
--00721     int getMaxTablesInSelect();
-+00721     int getMaxTablesInSelect();
- 00722 
--00725     int getMaxUserNameLength();
-+00725     int getMaxUserNameLength();
- 00726 
--00730     int getMaxConnections();
-+00730     int getMaxConnections();
- 00731 
--00735     int getMaxStatements();
-+00735     int getMaxStatements();
- 00736 
- 00737 
--00741     bool supportsMixedCaseIdentifiers();
-+00741     bool supportsMixedCaseIdentifiers();
- 00742     
--00746     bool supportsMixedCaseQuotedIdentifiers();
-+00746     bool supportsMixedCaseQuotedIdentifiers();
- 00747 
--00751     bool supportsStoredProcedures();
-+00751     bool supportsStoredProcedures();
- 00752 
- 00753 
--00757     bool supportsGroupBy();
-+00757     bool supportsGroupBy();
- 00758 
--00762     bool supportsGroupByUnrelated();
-+00762     bool supportsGroupByUnrelated();
- 00763 
--00767     bool supportsGroupByBeyondSelect();
-+00767     bool supportsGroupByBeyondSelect();
- 00768 
- 00769 
--00772     bool supportsUnion();
-+00772     bool supportsUnion();
- 00773 
--00776     bool supportsUnionAll();
-+00776     bool supportsUnionAll();
- 00777 
--00781     bool supportsOuterJoins();
-+00781     bool supportsOuterJoins();
- 00782 
--00785     bool supportsFullOuterJoins();
-+00785     bool supportsFullOuterJoins();
- 00786 
--00790     bool supportsLimitedOuterJoins();
-+00790     bool supportsLimitedOuterJoins();
- 00791 
--00793     bool usesLocalFilePerTable();
-+00793     bool usesLocalFilePerTable();
- 00794 
--00796     bool usesLocalFiles();
-+00796     bool usesLocalFiles();
- 00797 
--00801     bool nullsAreSortedAtStart();
-+00801     bool nullsAreSortedAtStart();
- 00802     
--00806     bool nullsAreSortedAtEnd();
-+00806     bool nullsAreSortedAtEnd();
- 00807     
--00810     bool nullsAreSortedHigh();
-+00810     bool nullsAreSortedHigh();
- 00811 
--00814     bool nullsAreSortedLow();
-+00814     bool nullsAreSortedLow();
- 00815 
--00819     bool allProceduresAreCallable();
-+00819     bool allProceduresAreCallable();
- 00820 
--00824     bool allTablesAreSelectable();
-+00824     bool allTablesAreSelectable();
- 00825 
--00829     bool isReadOnly();
-+00829     bool isReadOnly();
- 00830 
--00834     bool storesLowerCaseIdentifiers();
-+00834     bool storesLowerCaseIdentifiers();
- 00835 
--00839     bool storesLowerCaseQuotedIdentifiers();
-+00839     bool storesLowerCaseQuotedIdentifiers();
- 00840 
--00844     bool storesMixedCaseIdentifiers();
-+00844     bool storesMixedCaseIdentifiers();
- 00845     
--00849     bool storesMixedCaseQuotedIdentifiers();
-+00849     bool storesMixedCaseQuotedIdentifiers();
- 00850 
--00854     bool storesUpperCaseIdentifiers();
-+00854     bool storesUpperCaseIdentifiers();
- 00855     
--00859     bool storesUpperCaseQuotedIdentifiers();
-+00859     bool storesUpperCaseQuotedIdentifiers();
- 00860 
- 00861 
- 00908     ResultSet* getTypeInfo();
- 00909 
--00945     ResultSet* getColumns(const ODBCXX_STRING& catalog,
--00946                           const ODBCXX_STRING& schemaPattern,
--00947                           const ODBCXX_STRING& tableNamePattern,
--00948                           const ODBCXX_STRING& columnNamePattern);
-+00945     ResultSet* getColumns(const ODBCXX_STRING& catalog,
-+00946                           const ODBCXX_STRING& schemaPattern,
-+00947                           const ODBCXX_STRING& tableNamePattern,
-+00948                           const ODBCXX_STRING& columnNamePattern);
- 00949     
- 00950 
--00965     ResultSet* getTables(const ODBCXX_STRING& catalog,
--00966                          const ODBCXX_STRING& schemaPattern,
--00967                          const ODBCXX_STRING& tableNamePattern,
--00968                          const std::vector<ODBCXX_STRING>& types);
-+00965     ResultSet* getTables(const ODBCXX_STRING& catalog,
-+00966                          const ODBCXX_STRING& schemaPattern,
-+00967                          const ODBCXX_STRING& tableNamePattern,
-+00968                          const std::vector<ODBCXX_STRING>& types);
- 00969 
--00994     ResultSet* getTablePrivileges(const ODBCXX_STRING& catalog,
--00995                                   const ODBCXX_STRING& schemaPattern,
--00996                                   const ODBCXX_STRING& tableNamePattern);
-+00994     ResultSet* getTablePrivileges(const ODBCXX_STRING& catalog,
-+00995                                   const ODBCXX_STRING& schemaPattern,
-+00996                                   const ODBCXX_STRING& tableNamePattern);
- 00997     
- 00998 
--01021     ResultSet* getColumnPrivileges(const ODBCXX_STRING& catalog,
--01022                                    const ODBCXX_STRING& schema,
--01023                                    const ODBCXX_STRING& table,
--01024                                    const ODBCXX_STRING& columnNamePattern);
-+01021     ResultSet* getColumnPrivileges(const ODBCXX_STRING& catalog,
-+01022                                    const ODBCXX_STRING& schema,
-+01023                                    const ODBCXX_STRING& table,
-+01024                                    const ODBCXX_STRING& columnNamePattern);
- 01025 
--01041     ResultSet* getPrimaryKeys(const ODBCXX_STRING& catalog,
--01042                               const ODBCXX_STRING& schema,
--01043                               const ODBCXX_STRING& table);
-+01041     ResultSet* getPrimaryKeys(const ODBCXX_STRING& catalog,
-+01042                               const ODBCXX_STRING& schema,
-+01043                               const ODBCXX_STRING& table);
- 01044 
- 01045 
--01091     ResultSet* getIndexInfo(const ODBCXX_STRING& catalog,
--01092                             const ODBCXX_STRING& schema,
--01093                             const ODBCXX_STRING& table,
--01094                             bool unique, bool approximate);
-+01091     ResultSet* getIndexInfo(const ODBCXX_STRING& catalog,
-+01092                             const ODBCXX_STRING& schema,
-+01093                             const ODBCXX_STRING& table,
-+01094                             bool unique, bool approximate);
- 01095 
--01140     ResultSet* getCrossReference(const ODBCXX_STRING& primaryCatalog,
--01141                                  const ODBCXX_STRING& primarySchema,
--01142                                  const ODBCXX_STRING& primaryTable,
--01143                                  const ODBCXX_STRING& foreignCatalog,
--01144                                  const ODBCXX_STRING& foreignSchema,
--01145                                  const ODBCXX_STRING& foreignTable);
-+01140     ResultSet* getCrossReference(const ODBCXX_STRING& primaryCatalog,
-+01141                                  const ODBCXX_STRING& primarySchema,
-+01142                                  const ODBCXX_STRING& primaryTable,
-+01143                                  const ODBCXX_STRING& foreignCatalog,
-+01144                                  const ODBCXX_STRING& foreignSchema,
-+01145                                  const ODBCXX_STRING& foreignTable);
- 01146     
--01155     ResultSet* getImportedKeys(const ODBCXX_STRING& catalog,
--01156                                const ODBCXX_STRING& schema,
--01157                                const ODBCXX_STRING& table) {
--01158       return this->getCrossReference("","","",catalog,schema,table);
-+01155     ResultSet* getImportedKeys(const ODBCXX_STRING& catalog,
-+01156                                const ODBCXX_STRING& schema,
-+01157                                const ODBCXX_STRING& table) {
-+01158       return this->getCrossReference("","","",catalog,schema,table);
- 01159     }
- 01160 
--01167     ResultSet* getExportedKeys(const ODBCXX_STRING& catalog,
--01168                                const ODBCXX_STRING& schema,
--01169                                const ODBCXX_STRING& table) {
--01170       return this->getCrossReference(catalog,schema,table,"","","");
-+01167     ResultSet* getExportedKeys(const ODBCXX_STRING& catalog,
-+01168                                const ODBCXX_STRING& schema,
-+01169                                const ODBCXX_STRING& table) {
-+01170       return this->getCrossReference(catalog,schema,table,"","","");
- 01171     }
- 01172 
--01195     ResultSet* getProcedures(const ODBCXX_STRING& catalog,
--01196                              const ODBCXX_STRING& schemaPattern,
--01197                              const ODBCXX_STRING& procedureNamePattern);
-+01195     ResultSet* getProcedures(const ODBCXX_STRING& catalog,
-+01196                              const ODBCXX_STRING& schemaPattern,
-+01197                              const ODBCXX_STRING& procedureNamePattern);
- 01198 
--01238     ResultSet* getProcedureColumns(const ODBCXX_STRING& catalog,
--01239                                    const ODBCXX_STRING& schemaPattern,
--01240                                    const ODBCXX_STRING& procedureNamePattern,
--01241                                    const ODBCXX_STRING& columnNamePattern);
-+01238     ResultSet* getProcedureColumns(const ODBCXX_STRING& catalog,
-+01239                                    const ODBCXX_STRING& schemaPattern,
-+01240                                    const ODBCXX_STRING& procedureNamePattern,
-+01241                                    const ODBCXX_STRING& columnNamePattern);
- 01242 
- 01243     
--01279     ResultSet* getBestRowIdentifier(const ODBCXX_STRING& catalog,
--01280                                     const ODBCXX_STRING& schema,
--01281                                     const ODBCXX_STRING& table,
--01282                                     int scope,
--01283                                     bool nullable);
-+01279     ResultSet* getBestRowIdentifier(const ODBCXX_STRING& catalog,
-+01280                                     const ODBCXX_STRING& schema,
-+01281                                     const ODBCXX_STRING& table,
-+01282                                     int scope,
-+01283                                     bool nullable);
- 01284 
--01307     ResultSet* getVersionColumns(const ODBCXX_STRING& catalog,
--01308                                  const ODBCXX_STRING& schema,
--01309                                  const ODBCXX_STRING& table);
-+01307     ResultSet* getVersionColumns(const ODBCXX_STRING& catalog,
-+01308                                  const ODBCXX_STRING& schema,
-+01309                                  const ODBCXX_STRING& table);
- 01310                                        
- 01311 
- 01312 
--01318     ResultSet* getTableTypes();
-+01318     ResultSet* getTableTypes();
- 01319 
--01325     ResultSet* getSchemas();
-+01325     ResultSet* getSchemas();
- 01326 
--01332     ResultSet* getCatalogs();
-+01332     ResultSet* getCatalogs();
- 01333   };
- 01334 
- 01335   
--01336 }; // namespace odbc
-+01336 }; // namespace odbc
- 01337 
- 01338 
--01339 #endif // __ODBCXX_DATABASEMETADATA_H
--
    -+01339 #endif // __ODBCXX_DATABASEMETADATA_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/doxygen.css libodbc++-0.2.3-20050404/doc/progref/doxygen.css ---- libodbc++-0.2.3/doc/progref/doxygen.css 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/doxygen.css 2005-04-04 18:21:28.000000000 +0200 -@@ -1,52 +1,219 @@ --H1 { text-align: center; } -+H1 { -+ text-align: center; -+ font-family: Geneva, Arial, Helvetica, sans-serif; -+} -+H2 { -+ font-family: Geneva, Arial, Helvetica, sans-serif; -+} - CAPTION { font-weight: bold } --A.qindex {} --A.qindexRef {} -+DIV.qindex { -+ width: 100%; -+ background-color: #eeeeff; -+ border: 1px solid #B0B0B0; -+ text-align: center; -+ margin: 2px; -+ padding: 2px; -+ line-height: 120%; -+} -+A.qindex { -+ text-decoration: none; -+ font-weight: bold; -+ color: #1A419D; -+ padding: 2px; -+} -+A.qindex:visited { -+ text-decoration: none; -+ font-weight: bold; -+ color: #1A419D -+ padding: 2px; -+} -+A.qindex:hover { -+ text-decoration: none; -+ background-color: #ddddff; -+ padding: 2px; -+} -+A.qindexHL { -+ text-decoration: none; -+ font-weight: bold; -+ background-color: #6666cc; -+ color: #ffffff; -+ padding: 2px 6px; -+ border: 1px double #9295C2; -+} -+A.qindexHL:hover { -+ text-decoration: none; -+ background-color: #6666cc; -+ color: #ffffff; -+ padding: 2px 6px; -+} -+A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff } - A.el { text-decoration: none; font-weight: bold } - A.elRef { font-weight: bold } --A.code { text-decoration: none; font-weight: normal; color: #4444ee } --A.codeRef { font-weight: normal; color: #4444ee } -+A.code { text-decoration: none; font-weight: normal; color: #1A419D} -+A.codeRef { font-weight: normal; color: #1A419D} - A:hover { text-decoration: none; background-color: #f2f2ff } - DL.el { margin-left: -1cm } --DIV.fragment { width: 100%; border: none; background-color: #eeeeee } -+PRE.fragment { -+ border: 1px solid #CCCCCC; -+ background-color: #f5f5f5; -+ margin-top: 4px; -+ margin-bottom: 4px; -+ margin-left: 2px; -+ margin-right: 8px; -+ padding-left: 6px; -+ padding-right: 6px; -+ padding-top: 4px; -+ padding-bottom: 4px; -+} -+DIV.fragment { -+ border: 1px solid #CCCCCC; -+ background-color: #f5f5f5; -+ padding: 6px; -+} - DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } --TD.md { background-color: #f2f2ff; font-weight: bold; } --TD.mdname1 { background-color: #f2f2ff; font-weight: bold; color: #602020; } --TD.mdname { background-color: #f2f2ff; font-weight: bold; color: #602020; width: 600px; } --DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } --DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } --BODY { background: white } --TD.indexkey { -- background-color: #eeeeff; -- font-weight: bold; -- padding-right : 10px; -- padding-top : 2px; -- padding-left : 10px; -- padding-bottom : 2px; -- margin-left : 0px; -- margin-right : 0px; -- margin-top : 2px; -- margin-bottom : 2px --} --TD.indexvalue { -- background-color: #eeeeff; -- font-style: italic; -- padding-right : 10px; -- padding-top : 2px; -- padding-left : 10px; -- padding-bottom : 2px; -- margin-left : 0px; -- margin-right : 0px; -- margin-top : 2px; -- margin-bottom : 2px --} --FONT.keyword { color: #008000 } --FONT.keywordtype { color: #604020 } --FONT.keywordflow { color: #e08000 } --FONT.comment { color: #800000 } --FONT.preprocessor { color: #806020 } --FONT.stringliteral { color: #002080 } --FONT.charliteral { color: #008080 } -+TD.md { background-color: #F4F4FB; font-weight: bold; } -+TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; } -+TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; } -+DIV.groupHeader { -+ margin-left: 16px; -+ margin-top: 12px; -+ margin-bottom: 6px; -+ font-weight: bold; -+ font-family: Geneva, Arial, Helvetica, sans-serif; -+} -+DIV.groupText { margin-left: 16px; font-style: italic; font-size: 14px } -+BODY { -+ background: white; -+ color: black; -+ margin-right: 20px; -+ margin-left: 20px; -+} -+TD.indexkey { -+ background-color: #eeeeff; -+ font-weight: bold; -+ padding-right : 10px; -+ padding-top : 2px; -+ padding-left : 10px; -+ padding-bottom : 2px; -+ margin-left : 0px; -+ margin-right : 0px; -+ margin-top : 2px; -+ margin-bottom : 2px; -+ border: 1px solid #CCCCCC; -+} -+TD.indexvalue { -+ background-color: #eeeeff; -+ font-style: italic; -+ padding-right : 10px; -+ padding-top : 2px; -+ padding-left : 10px; -+ padding-bottom : 2px; -+ margin-left : 0px; -+ margin-right : 0px; -+ margin-top : 2px; -+ margin-bottom : 2px; -+ border: 1px solid #CCCCCC; -+} -+TR.memlist { -+ background-color: #f0f0f0; -+} -+P.formulaDsp { text-align: center; } -+IMG.formulaDsp { } -+IMG.formulaInl { vertical-align: middle; } -+SPAN.keyword { color: #008000 } -+SPAN.keywordtype { color: #604020 } -+SPAN.keywordflow { color: #e08000 } -+SPAN.comment { color: #800000 } -+SPAN.preprocessor { color: #806020 } -+SPAN.stringliteral { color: #002080 } -+SPAN.charliteral { color: #008080 } -+.mdTable { -+ border: 1px solid #868686; -+ background-color: #F4F4FB; -+} -+.mdRow { -+ padding: 8px 10px; -+} -+.mdescLeft { -+ padding: 0px 8px 4px 8px; -+ font-size: 14px; -+ font-style: italic; -+ background-color: #FAFAFA; -+ border-top: 1px none #E0E0E0; -+ border-right: 1px none #E0E0E0; -+ border-bottom: 1px none #E0E0E0; -+ border-left: 1px none #E0E0E0; -+ margin: 0px; -+} -+.mdescRight { -+ padding: 0px 8px 4px 8px; -+ font-size: 14px; -+ font-style: italic; -+ background-color: #FAFAFA; -+ border-top: 1px none #E0E0E0; -+ border-right: 1px none #E0E0E0; -+ border-bottom: 1px none #E0E0E0; -+ border-left: 1px none #E0E0E0; -+ margin: 0px; -+} -+.memItemLeft { -+ padding: 1px 0px 0px 8px; -+ margin: 4px; -+ border-top-width: 1px; -+ border-right-width: 1px; -+ border-bottom-width: 1px; -+ border-left-width: 1px; -+ border-top-style: solid; -+ border-top-color: #E0E0E0; -+ border-right-color: #E0E0E0; -+ border-bottom-color: #E0E0E0; -+ border-left-color: #E0E0E0; -+ border-right-style: none; -+ border-bottom-style: none; -+ border-left-style: none; -+ background-color: #FAFAFA; -+ font-family: Geneva, Arial, Helvetica, sans-serif; -+ font-size: 12px; -+} -+.memItemRight { -+ padding: 1px 8px 0px 8px; -+ margin: 4px; -+ border-top-width: 1px; -+ border-right-width: 1px; -+ border-bottom-width: 1px; -+ border-left-width: 1px; -+ border-top-style: solid; -+ border-top-color: #E0E0E0; -+ border-right-color: #E0E0E0; -+ border-bottom-color: #E0E0E0; -+ border-left-color: #E0E0E0; -+ border-right-style: none; -+ border-bottom-style: none; -+ border-left-style: none; -+ background-color: #FAFAFA; -+ font-family: Geneva, Arial, Helvetica, sans-serif; -+ font-size: 13px; -+} -+.search { color: #003399; -+ font-weight: bold; -+} -+FORM.search { -+ margin-bottom: 0px; -+ margin-top: 0px; -+} -+INPUT.search { font-size: 75%; -+ color: #000080; -+ font-weight: normal; -+ background-color: #eeeeff; -+} -+TD.tiny { font-size: 75%; -+} -+a { -+ color: #252E78; -+} -+a:visited { -+ color: #3D2185; -+} - A { - text-decoration: none; - } -diff -Naur libodbc++-0.2.3/doc/progref/doxygen.gif libodbc++-0.2.3-20050404/doc/progref/doxygen.gif ---- libodbc++-0.2.3/doc/progref/doxygen.gif 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/doxygen.gif 1970-01-01 01:00:00.000000000 +0100 -@@ -1,11 +0,0 @@ --GIF89an5çÿÿ⟠¶%%ÿÿàÿÿÜßßÆÿÌÌß²²þüÓ¿¿©ÿÿãøæ“ÿÿÛßßÀõÜvßßÄøæ’ÞܹîÃ,üô½üô¼ýøÉßßÅóÖdûð¯Õ»Wùë¡öâ†ÙÉ÷ᆿ¿¤ÿÿßôÖd=6ýøÈúï¯ ùë ýùÉÝÙ°üõ¼²’!ÜÕ¤ßßÇ?<,¸¥X÷â…õÜu ÿþÛ¿¿ª÷á…ùê¡Ð«&òÐRÿüÓÚÎ@?5ÜÕ¥÷â†úð¯>;(@@9@@7ÛÒ™»°xûï¯ÖÀgúë¡ÝÚ°öá†þüÔ\Q&º¬nßßÃïÆ4ðÊB¹©dÿþÜ õÝv[Q&ÝÚ¯ùê ?=/µœ=ÖÁgÜÒ™úë Õ¼WÙÉ€?>2>:%þøÈÚÎŒ ÷æ“×Æu=7ûï®ýùȾ½ž»´ƒ×ÅuÜј  ¿¿¥@@8ßܹüõ½ôÖeúê¡ØÉðËBßÞÀöÜu¿¿¨ØÆuÖÀf÷æ’ñÊBÒ²:¾¾žC@/×Æt¸¦X¼´ƒÚÍô×d»°yþùÉ^ZBúê ``Uq¼´‚ˆº¬m½·ŽïÅ4ØÅuÿÿÝûð®DD:ÿÿáÞßÀ ó×dÑ­-½¸ßß¿™™>9"_\GïÆ5öÜvÿÿÞaaT``Tûô¼>8"?;( ÜÖ¤_^L»³‚^X< ÞÙ°ãÙŸÒ±:»´‚ÍÆ™ Måⶸ©dßßÁÚÍŒúð®þøÉú﮿¾¥b\?ñÐR^X=¾º—`_P(&¹¬nqc.ÛÍØÅtþýÔ˜c`^L·~öá…öâ… B>+¾»—ÜÑ™=4½·˜†>™‰JîÅ4'%áЄ``R>9!>8!`_ODD;îÆ5 --öÝvÛÒ˜µœ>ÜÒ˜…mЭ.“|(îÆ4<4ÝÙ¯ããÇ¿¾¤¿½žDC800)ïÅ5HG<ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ!ùÿ,n5þÿ H° Áƒ*\È°¡Ã‡#JœH±¢Å‹3V¬Ç±c= CZ¬§É8Eª\É°^0¤dI³¦@—0 È´É“%Θ3{ --ÍøSgСH)Ý™´éÄ¥GJ]uªÕ– *ÁÄõª×›ž>| å©ëפ;>ÀöAÊ´ƽÙñß\‚wáÞµ«—®^Ž9&(`¡á˜(.ð±Þà† ¬˜Ñ8 *HШ^£Á™ñZÞÜq°áÂC >}:³ãËQ“~踀Ÿo+V°¢Þ·ƒãžüc€Û~ŒùQàxïÁË5®€÷ï»uWçÍqFóãÚþPÆ®;{õÐ ë}ǽ›=ãìã+ÎÌžózÆØç7–À æòÕçXy†¹§^€¶Ä[|0À6ÈÖn1ÁàLD(!õ,ÈàZl1aJ=30È¡]k‰õ€r€ø`;)>È‘‹|Ôc --ˆÖãbˆ :èVKyÀ€ x„—xÀÀ’ ÈE „’PÈ@€‘ É$2x0F=r¼´ä;õx ƒ•øD …—ÈóM&BÊd&PeB!$yÔ“É’Pz°ML6i–\i  (èPšÄŠFPI0ê(G:D°èõ¢(¥Š¦±i=idʨ7“*£©*þž2JÏ£nH‚–zJiĈŠ)£ðÔA™Î¡ƒ*s @ª¥TYQ˜pB !à ъpB=І1mG1XÁ‹"°SÏ'@«H°0ãºÙ­ hHѼØŠ&õÄ ´–Ao`k‚ aóG£aE ×" ­‡Þd --(L0 --$täÎP@ÁõP ñ$ ñ( *ˆLÁ*õ`±ƒÉ(ÐA$sD‚$§L1Í«`ÁQ'>S@K(ÅÈl2Å*d\³É#WJÎ*„LÇ,S@‡Æ*TlW'`ÐCA°Ð [ ÑAÔƒÁ#l1È9»¼2È# Áþ,,´·Þg°möÙåX‚%yc`ÈÙjˆ=B,A´xׄ­7Û†,²ˆj˜=M/#ô0Îo´¡Kgœ±…×v‰ÁH %Ô D*Sø „W”pEõ SC 4óK6ÑQv “ÊíEpQ‚và.„M‘ð\Ô°{Z>äP‚%!¾¬Þ½EÔpˆ+Á$’ úBÔ“Ãë2Åb<ï-EÁ Ã8À/ÿ»C=–ÀüA^ðÿ·0 ðä1XÁŽ€Á ø–—HÜ!„" ïØÀ@ÞAƒd@ ê¡Áÿq€ lÐ`g˜ž'l€þx:Àgtà‡4HF=ªp„#Ò G8‚¦è‡*ôá‰/X7ºQ†¼àxB=¤0Æ5‘kø *žÐJ<1ˆ3äÈœØü0ˆe¨GŽø BHA --„xÁ:ð‚<:¤…p ¦(ŒbŠ ‚ êahA‘œ¢ª "`Ò-h ¦-¤£-@¥'a@…Iþ…#•tàÂ{ Â#°IÖƒ{P¤ByI*,’¬»‰R\ÎAR „À! --!¨B.ÀÍ l"Uˆ”Ði*! --QЦ4Ó‚zÀ¡!È@‘½„Àíþäˆ2ÀM"£#ÙìB¸)ÍŽðÓ›AÂPLTEÿÿÿ¿¾¤÷äŒÿþØôÚoÚˆùë¡ÞÛ´¹«qßßÄ[Q&ÿÿá×Ãm®’+Õ»WñÍIîÄ0Ñ­-=7g^7`_P@?2ýøÉüô¼ÜÔŸûð¯ÿÌÌß²²©""> !!!"""###$$$%%%&&&'''((()))***+++,,,---...///000111222333444555666777888999:::;;;<<<===>>>???@@@AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSSTTTUUUVVVWWWXXXYYYZZZ[[[\\\]]]^^^___```aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrssstttuuuvvvwwwxxxyyyzzz{{{|||}}}~~~€€€‚‚‚ƒƒƒ„„„………†††‡‡‡ˆˆˆ‰‰‰ŠŠŠ‹‹‹ŒŒŒŽŽŽ‘‘‘’’’“““”””•••–––———˜˜˜™™™ššš›››œœœžžžŸŸŸ   ¡¡¡¢¢¢£££¤¤¤¥¥¥¦¦¦§§§¨¨¨©©©ªªª«««¬¬¬­­­®®®¯¯¯°°°±±±²²²³³³´´´µµµ¶¶¶···¸¸¸¹¹¹ººº»»»¼¼¼½½½¾¾¾¿¿¿ÀÀÀÁÁÁÂÂÂÃÃÃÄÄÄÅÅÅÆÆÆÇÇÇÈÈÈÉÉÉÊÊÊËËËÌÌÌÍÍÍÎÎÎÏÏÏÐÐÐÑÑÑÒÒÒÓÓÓÔÔÔÕÕÕÖÖÖ×××ØØØÙÙÙÚÚÚÛÛÛÜÜÜÝÝÝÞÞÞßßßàààáááâââãããäääåååæææçççèèèéééêêêëëëìììíííîîîïïïðððñññòòòóóóôôôõõõööö÷÷÷øøøùùùúúúûûûüüüýýýþþþÿÿÿ¯3ï"tRNS@æØfbKGDˆH pHYsn½n½„šhtIMEÓ -+ :bp¡IDATxÚíVkÚ0Ä iÖΈ‰KðÑÿÿ3»³kdžwB:*µb%ð̾Æ1Ɇݮ©í^jdœsæÕ"®i÷y‹üÃ"Ã_†×‰¤’EˆÊ„©—2t*o™EÓ}@ƒ˜'lƒŠdŠ¬‹Yh1iê¨w«Ó”ÌLåߦ»†bŽ‚Ù°ìB N”Ó$õVuŽª.†ª†I¥vI«¡N‘ïEÒiYᮕTåÃpÃJjšN+gl‡§Åø,z”n "šç(m ÚV¥;IžŽÆð‘˜Fž“;ÊûmÔL$Á¼i ùöp:ñáÌ´…¶\\“<õw(†ˆ¥DMÒ€ ¸[Äb—Ê ²Ä·h/C%1é~±u‘[DÀŽhЄ…Dœo¡ÞÈ"ÈÒ$‰ q¨N¹°­Òu¢°\.F\梶r'`³DÄ;Zs€=$lÒ€;ฮl«œÏ -+DBy‡Bm°×ë–¡)p#²®Z¤Y«]k‰EÄ'?|û“Íò/mZáö¬´U§fàR”¶ò0‡6ÇVÅíùlyµÒ¢±Õ\ˆØ°¶muUž¨õJsc¯PG†ÕE[yŸøfe»¢’l¤>¡ý~?ö#\ÞÚšQy0y;ŽÚˆª.#IR”\fúÈÛýf£Ee&=Ú‘1N"G5½„äºÆ­D„&‘~:hü0õ>Fß+=ô12ÌËäYÄsèûO8@$gP-Càà}â2ƒíG±›Xo Ébi:1½ÝO>zxTÊ>J½.¸…?c4sËTB çù¬¯§4N§ÓœEN›ÍŸ6¹‹}m9g2e鋪'_Óv]Ø,—1}óßî[µä‹™™û_ãã?ÝÛÞö¶·ý—ö.ûaÁÌD6IIEND®B`‚ -\ No newline at end of file -diff -Naur libodbc++-0.2.3/doc/progref/drivermanager_8h-source.html libodbc++-0.2.3-20050404/doc/progref/drivermanager_8h-source.html ---- libodbc++-0.2.3/doc/progref/drivermanager_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/drivermanager_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,122 +1,121 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/drivermanager.h Source File -+libodbc++: odbc++/drivermanager.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/drivermanager.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/drivermanager.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_DRIVERMANAGER_H
--00023 #define __ODBCXX_DRIVERMANAGER_H
--00024 
--00025 #include <odbc++/setup.h>
-+00022 #ifndef __ODBCXX_DRIVERMANAGER_H
-+00023 #define __ODBCXX_DRIVERMANAGER_H
-+00024 
-+00025 #include <odbc++/setup.h>
- 00026 
--00027 #include <odbc++/types.h>
-+00027 #include <odbc++/types.h>
- 00028 
--00030 namespace odbc {
-+00030 namespace odbc {
- 00031 
--00032   class Connection;
-+00032   class Connection;
- 00033   
--00036   class ODBCXX_EXPORT Driver {
--00037   private:
-+00036   class ODBCXX_EXPORT Driver {
-+00037   private:
- 00038     ODBCXX_STRING description_;
- 00039     std::vector<ODBCXX_STRING> attributes_;
- 00040 
--00041     Driver(const Driver&); //forbid
--00042     Driver& operator=(const Driver&); //forbid
-+00041     Driver(const Driver&); //forbid
-+00042     Driver& operator=(const Driver&); //forbid
- 00043 
--00044   public:
--00046     Driver(const ODBCXX_STRING& description,
--00047            const std::vector<ODBCXX_STRING>& attributes)
-+00044   public:
-+00046     Driver(const ODBCXX_STRING& description,
-+00047            const std::vector<ODBCXX_STRING>& attributes)
- 00048       :description_(description), attributes_(attributes) {}
- 00049 
--00051     virtual ~Driver() {}
-+00051     virtual ~Driver() {}
- 00052     
--00054     const ODBCXX_STRING& getDescription() const {
--00055       return description_;
-+00054     const ODBCXX_STRING& getDescription() const {
-+00055       return description_;
- 00056     }
- 00057 
--00059     const std::vector<ODBCXX_STRING>& getAttributes() const {
--00060       return attributes_;
-+00059     const std::vector<ODBCXX_STRING>& getAttributes() const {
-+00060       return attributes_;
- 00061     }
- 00062   };
- 00063   
--00065   typedef CleanVector<Driver*> DriverList;
-+00065   typedef CleanVector<Driver*> DriverList;
- 00066   
- 00067 
--00069   class ODBCXX_EXPORT DataSource {
--00070   private:
-+00069   class ODBCXX_EXPORT DataSource {
-+00070   private:
- 00071     ODBCXX_STRING name_;
- 00072     ODBCXX_STRING description_;
- 00073 
--00074   public:
--00076     DataSource(const ODBCXX_STRING& name, const ODBCXX_STRING& description)
-+00074   public:
-+00076     DataSource(const ODBCXX_STRING& name, const ODBCXX_STRING& description)
- 00077       :name_(name), description_(description) {}
- 00078     
--00080     virtual ~DataSource() {}
-+00080     virtual ~DataSource() {}
- 00081 
--00083     const ODBCXX_STRING& getName() const {
--00084       return name_;
-+00083     const ODBCXX_STRING& getName() const {
-+00084       return name_;
- 00085     }
- 00086     
--00088     const ODBCXX_STRING& getDescription() const {
--00089       return description_;
-+00088     const ODBCXX_STRING& getDescription() const {
-+00089       return description_;
- 00090     }
- 00091   };
- 00092   
--00094   typedef CleanVector<DataSource*> DataSourceList;
-+00094   typedef CleanVector<DataSource*> DataSourceList;
- 00095 
- 00096 
--00099   class ODBCXX_EXPORT DriverManager {
--00100   private:
--00101     static SQLHENV henv_;
--00102     static ErrorHandler* eh_;
--00103     static int loginTimeout_;
-+00099   class ODBCXX_EXPORT DriverManager {
-+00100   private:
-+00101     static SQLHENV henv_;
-+00102     static ErrorHandler* eh_;
-+00103     static int loginTimeout_;
- 00104     
--00105     static void _checkInit();
--00106     static Connection* _createConnection();
-+00105     static void _checkInit();
-+00106     static Connection* _createConnection();
- 00107 
--00108     // forbid
-+00108     // forbid
- 00109     DriverManager();
- 00110 
--00111   public:
-+00111   public:
- 00112     
--00114     static Connection* getConnection(const ODBCXX_STRING& dsn,
--00115                                      const ODBCXX_STRING& user,
--00116                                      const ODBCXX_STRING& password);
-+00114     static Connection* getConnection(const ODBCXX_STRING& dsn,
-+00115                                      const ODBCXX_STRING& user,
-+00116                                      const ODBCXX_STRING& password);
- 00117     
--00121     static Connection* getConnection(const ODBCXX_STRING& connectString);
-+00121     static Connection* getConnection(const ODBCXX_STRING& connectString);
- 00122     
--00126     static int getLoginTimeout();
-+00126     static int getLoginTimeout();
- 00127 
--00132     static void setLoginTimeout(int seconds);
-+00132     static void setLoginTimeout(int seconds);
- 00133 
--00136     static DataSourceList* getDataSources();
-+00136     static DataSourceList* getDataSources();
- 00137 
--00140     static DriverList* getDrivers();
-+00140     static DriverList* getDrivers();
- 00141 
--00145     static void shutdown();
-+00145     static void shutdown();
- 00146   };
- 00147 
- 00148 
-@@ -124,8 +123,8 @@
- 00150 };
- 00151 
- 00152 
--00153 #endif // __ODBCXX_DRIVERMANAGER_H
--
    -+00153 #endif // __ODBCXX_DRIVERMANAGER_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/errorhandler_8h-source.html libodbc++-0.2.3-20050404/doc/progref/errorhandler_8h-source.html ---- libodbc++-0.2.3/doc/progref/errorhandler_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/errorhandler_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,136 +1,135 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/errorhandler.h Source File -+libodbc++: odbc++/errorhandler.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/errorhandler.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/errorhandler.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_ERRORHANDLER_H
--00023 #define __ODBCXX_ERRORHANDLER_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/threads.h>
-+00022 #ifndef __ODBCXX_ERRORHANDLER_H
-+00023 #define __ODBCXX_ERRORHANDLER_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/threads.h>
- 00028 
--00029 namespace odbc {
-+00029 namespace odbc {
- 00030 
--00032   class ODBCXX_EXPORT ErrorHandler {
--00033     friend class DriverManager;
--00034     friend class DataStreamBuf;
--00035     friend class DataStream;
--00036   private:
--00037     // private data
--00038     struct PD;
-+00032   class ODBCXX_EXPORT ErrorHandler {
-+00033     friend class DriverManager;
-+00034     friend class DataStreamBuf;
-+00035     friend class DataStream;
-+00036   private:
-+00037     // private data
-+00038     struct PD;
- 00039     PD* pd_;
- 00040 
- 00041     WarningList* warnings_;
--00042     bool collectWarnings_;
-+00042     bool collectWarnings_;
- 00043     
--00044     //the maxumum number of warnings to contain at a time
--00045     enum {
-+00044     //the maxumum number of warnings to contain at a time
-+00045     enum {
- 00046       MAX_WARNINGS=128
- 00047     };
- 00048 
--00049   protected:
--00050     void _postWarning(SQLWarning* w);
-+00049   protected:
-+00050     void _postWarning(SQLWarning* w);
- 00051 
- 00052 
--00053 #if ODBCVER < 0x0300
--00054     void _checkErrorODBC2(SQLHENV henv, 
-+00053 #if ODBCVER < 0x0300
-+00054     void _checkErrorODBC2(SQLHENV henv, 
- 00055                           SQLHDBC hdbc, 
- 00056                           SQLHSTMT hstmt, 
- 00057                           SQLRETURN r, 
--00058                           const ODBCXX_STRING& what);
--00059 #else
--00060     
--00061     void _checkErrorODBC3(SQLINTEGER handleType,
-+00058                           const ODBCXX_STRING& what);
-+00059 #else
-+00060     
-+00061     void _checkErrorODBC3(SQLINTEGER handleType,
- 00062                           SQLHANDLE h,
--00063                           SQLRETURN r, const ODBCXX_STRING& what);
--00064 #endif //ODBCVER < 0x0300
--00065     
--00066     void _checkStmtError(SQLHSTMT hstmt,
--00067                          SQLRETURN r, const char* what="") {
-+00063                           SQLRETURN r, const ODBCXX_STRING& what);
-+00064 #endif //ODBCVER < 0x0300
-+00065     
-+00066     void _checkStmtError(SQLHSTMT hstmt,
-+00067                          SQLRETURN r, const char* what="") {
- 00068 
--00069       if(r==SQL_SUCCESS_WITH_INFO || r==SQL_ERROR) {
--00070 #if ODBCVER < 0x0300
--00071 
-+00069       if(r==SQL_SUCCESS_WITH_INFO || r==SQL_ERROR) {
-+00070 #if ODBCVER < 0x0300
-+00071 
- 00072         this->_checkErrorODBC2(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
- 00073                                r,ODBCXX_STRING_C(what));
--00074 #else
--00075         
-+00074 #else
-+00075         
- 00076         this->_checkErrorODBC3(SQL_HANDLE_STMT,hstmt,r,ODBCXX_STRING_C(what));
- 00077         
--00078 #endif
--00079       }
-+00078 #endif
-+00079       }
- 00080     }
- 00081 
--00082     void _checkConError(SQLHDBC hdbc, SQLRETURN r, const char* what="") {
--00083       if(r==SQL_SUCCESS_WITH_INFO || r==SQL_ERROR) {
--00084 #if ODBCVER < 0x0300
--00085         
-+00082     void _checkConError(SQLHDBC hdbc, SQLRETURN r, const char* what="") {
-+00083       if(r==SQL_SUCCESS_WITH_INFO || r==SQL_ERROR) {
-+00084 #if ODBCVER < 0x0300
-+00085         
- 00086         this->_checkErrorODBC2(SQL_NULL_HENV, hdbc, SQL_NULL_HSTMT, r, 
- 00087                                ODBCXX_STRING_C(what));
- 00088         
--00089 #else
--00090         
-+00089 #else
-+00090         
- 00091         this->_checkErrorODBC3(SQL_HANDLE_DBC, hdbc, r, ODBCXX_STRING_C(what));
- 00092 
--00093 #endif
--00094       }
-+00093 #endif
-+00094       }
- 00095     }
- 00096 
--00097     void _checkEnvError(SQLHENV henv, SQLRETURN r, const char* what="") {
--00098       if(r==SQL_SUCCESS_WITH_INFO || r==SQL_ERROR) {
--00099 #if ODBCVER < 0x0300
--00100         
-+00097     void _checkEnvError(SQLHENV henv, SQLRETURN r, const char* what="") {
-+00098       if(r==SQL_SUCCESS_WITH_INFO || r==SQL_ERROR) {
-+00099 #if ODBCVER < 0x0300
-+00100         
- 00101         this->_checkErrorODBC2(henv,SQL_NULL_HDBC,SQL_NULL_HSTMT,r,
- 00102                                ODBCXX_STRING_C(what));
- 00103         
--00104 #else
--00105         
-+00104 #else
-+00105         
- 00106         this->_checkErrorODBC3(SQL_HANDLE_ENV,henv,r,ODBCXX_STRING_C(what));
- 00107         
--00108 #endif
--00109       }
-+00108 #endif
-+00109       }
- 00110     }
- 00111 
--00113     ErrorHandler(bool collectWarnings =true);
-+00113     ErrorHandler(bool collectWarnings =true);
- 00114 
--00115   public:
--00117     void clearWarnings();
-+00115   public:
-+00117     void clearWarnings();
- 00118 
- 00123     WarningList* getWarnings();
- 00124 
--00126     virtual ~ErrorHandler();
-+00126     virtual ~ErrorHandler();
- 00127   };
- 00128 
- 00129   
--00130 }; // namespace odbc
-+00130 }; // namespace odbc
- 00131 
--00132 #endif
--
    -+00132 #endif -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/files.html libodbc++-0.2.3-20050404/doc/progref/files.html ---- libodbc++-0.2.3/doc/progref/files.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/files.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,26 +1,25 @@ -- -+ - --File Index -+libodbc++: File Index - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    libodbc++ File List

    Here is a list of all documented files with brief descriptions: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    libodbc++ File List

    Here is a list of all documented files with brief descriptions:
    /trees/alex/src/libodbc++/include/odbc++/callablestatement.h [code]
    /trees/alex/src/libodbc++/include/odbc++/config-win32.h [code]
    /trees/alex/src/libodbc++/include/odbc++/config.h [code]
    /trees/alex/src/libodbc++/include/odbc++/connection.h [code]
    /trees/alex/src/libodbc++/include/odbc++/databasemetadata.h [code]
    /trees/alex/src/libodbc++/include/odbc++/drivermanager.h [code]
    /trees/alex/src/libodbc++/include/odbc++/errorhandler.h [code]
    /trees/alex/src/libodbc++/include/odbc++/preparedstatement.h [code]
    /trees/alex/src/libodbc++/include/odbc++/resultset.h [code]
    /trees/alex/src/libodbc++/include/odbc++/resultsetmetadata.h [code]
    /trees/alex/src/libodbc++/include/odbc++/setup.h [code]
    /trees/alex/src/libodbc++/include/odbc++/statement.h [code]
    /trees/alex/src/libodbc++/include/odbc++/threads.h [code]
    /trees/alex/src/libodbc++/include/odbc++/types.h [code]
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    odbc++/callablestatement.h [code]
    odbc++/config-win32.h [code]
    odbc++/config.h [code]
    odbc++/connection.h [code]
    odbc++/databasemetadata.h [code]
    odbc++/drivermanager.h [code]
    odbc++/errorhandler.h [code]
    odbc++/preparedstatement.h [code]
    odbc++/resultset.h [code]
    odbc++/resultsetmetadata.h [code]
    odbc++/setup.h [code]
    odbc++/statement.h [code]
    odbc++/threads.h [code]
    odbc++/types.h [code]
    -
    -
    -diff -Naur libodbc++-0.2.3/doc/progref/functions_enum.html libodbc++-0.2.3-20050404/doc/progref/functions_enum.html ---- libodbc++-0.2.3/doc/progref/functions_enum.html 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/functions_enum.html 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,18 @@ -+ -+ -+libodbc++: Class Members - Enumerations -+ -+ -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+
    All | Functions | Enumerations | Enumeration values
    -+ -+

    -+

    -+
    -+ -diff -Naur libodbc++-0.2.3/doc/progref/functions_eval.html libodbc++-0.2.3-20050404/doc/progref/functions_eval.html ---- libodbc++-0.2.3/doc/progref/functions_eval.html 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/functions_eval.html 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,72 @@ -+ -+ -+libodbc++: Class Members - Enumeration values -+ -+ -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+
    All | Functions | Enumerations | Enumeration values
    -+
    b | c | d | f | i | l | n | r | s | t | v
    -+ -+

    -+ -+

    -+

    - b -

    -+

    - c -

    -+

    - d -

    -+

    - f -

    -+

    - i -

    -+

    - l -

    -+

    - n -

    -+

    - r -

    -+

    - s -

    -+

    - t -

    -+

    - v -

    -+
    -+ -diff -Naur libodbc++-0.2.3/doc/progref/functions_func.html libodbc++-0.2.3-20050404/doc/progref/functions_func.html ---- libodbc++-0.2.3/doc/progref/functions_func.html 1970-01-01 01:00:00.000000000 +0100 -+++ libodbc++-0.2.3-20050404/doc/progref/functions_func.html 2005-04-04 18:21:28.000000000 +0200 -@@ -0,0 +1,389 @@ -+ -+ -+libodbc++: Class Members - Functions -+ -+ -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+
    All | Functions | Enumerations | Enumeration values
    -+
    a | b | c | d | e | f | g | i | l | m | n | o | p | r | s | t | u | w | ~
    -+ -+

    -+ -+

    -+

    - a -

    -+

    - b -

    -+

    - c -

    -+

    - d -

    -+

    - e -

    -+

    - f -

    -+

    - g -

    -+

    - i -

    -+

    - l -

    -+

    - m -

    -+

    - n -

    -+

    - o -

    -+

    - p -

    -+

    - r -

    -+

    - s -

    -+

    - t -

    -+

    - u -

    -+

    - w -

    -+

    - ~ -

    -+
    -+ -diff -Naur libodbc++-0.2.3/doc/progref/functions.html libodbc++-0.2.3-20050404/doc/progref/functions.html ---- libodbc++-0.2.3/doc/progref/functions.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/functions.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,72 +1,66 @@ -- -+ - --Compound Member Index -+libodbc++: Class Members - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    libodbc++ Compound Members

    --a | b | c | d | e | f | g | i | l | m | n | o | p | r | s | t | u | v | w | ~
    -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+
    All | Functions | Enumerations | Enumeration values
    -+
    a | b | c | d | e | f | g | i | l | m | n | o | p | r | s | t | u | v | w | ~
    - -

    --Here is a list of all documented class members with links to the classes they belong to:

    - a -

    --
      -+ -+

      -+Here is a list of all documented class members with links to the class documentation for each member:

      - a -

      --

      - b -

       --
        -+

        - b -

        --

        - c -

         --
          -+

          - c -

          --

          - d -

           --
            -+

            - d -

            --

            - e -

             --
              -+

              - e -

              --

              - f -

               --
                -+

                - f -

                --

                - g -

                 -- -+

                - g -

                --

                - i -

                 --
                  -+

                  - i -

                  --

                  - l -

                   --
                    -+

                    - l -

                    --

                    - m -

                     -- -+

                    - m -

                    --

                    - n -

                     --
                      -+

                      - n -

                      --

                      - o -

                       -- -+

                      - o -

                      --

                      - p -

                       --
                        -+

                        - p -

                        --

                        - r -

                         --
                          -+

                          - r -

                          --

                          - s -

                           --
                            -+

                            - s -

                            --

                            - t -

                             --
                              -+

                              - t -

                              --

                              - u -

                               -- -+

                              - u -

                              --

                              - v -

                               --
                                -+

                                - v -

                                --

                                - w -

                                 -- -+

                                - w -

                                --

                                - ~ -

                                 --
                                  -+

                                  - ~ -

                                    -
                                  • ~Bytes() --: odbc::Bytes
                                  • ~CallableStatement() -+: odbc::Bytes
                                  • ~CallableStatement() - : odbc::CallableStatement
                                  • ~Connection() - : odbc::Connection
                                  • ~DataSource() - : odbc::DataSource
                                  • ~Date() -diff -Naur libodbc++-0.2.3/doc/progref/hierarchy.html libodbc++-0.2.3-20050404/doc/progref/hierarchy.html ---- libodbc++-0.2.3/doc/progref/hierarchy.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/hierarchy.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,12 +1,11 @@ -- -+ - --Hierarchical Index -+libodbc++: Hierarchical Index - - -- --
                                    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
                                    --

                                    libodbc++ Class Hierarchy

                                    This inheritance list is sorted roughly, but not completely, alphabetically:
                                      -+ -+
                                      Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
                                      -+

                                      libodbc++ Class Hierarchy

                                      This inheritance list is sorted roughly, but not completely, alphabetically:
                                        -
                                      • odbc::Bytes -
                                      • odbc::DatabaseMetaData -
                                      • odbc::DataSource -diff -Naur libodbc++-0.2.3/doc/progref/index.html libodbc++-0.2.3-20050404/doc/progref/index.html ---- libodbc++-0.2.3/doc/progref/index.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/index.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,14 +1,13 @@ -- -+ - --Main Page -+libodbc++: Main Page - - -- --
                                        --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
                                        --

                                        libodbc++ Documentation

                                        -+ -+
                                        Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
                                        -+

                                        libodbc++ Documentation

                                        -

                                        --

                                        0.2.3

                                        -+

                                        0.2.3-20050404

                                        - -diff -Naur libodbc++-0.2.3/doc/progref/Makefile.in libodbc++-0.2.3-20050404/doc/progref/Makefile.in ---- libodbc++-0.2.3/doc/progref/Makefile.in 2003-06-17 12:20:50.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/Makefile.in 2005-04-04 18:21:27.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,92 +32,146 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - progref_dir = @docdir@/@PACKAGE@-@VERSION@/progref -@@ -147,11 +201,12 @@ - - EXTRA_DIST = Doxyfile footer doxygen.css.in - subdir = doc/progref -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = --DIST_COMMON = Makefile.am Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: -@@ -173,13 +228,22 @@ - tags: TAGS - TAGS: - -+ctags: CTAGS -+CTAGS: -+ - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = ../.. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -200,14 +264,13 @@ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="${top_distdir}" distdir="$(distdir)" \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - check-am: all-am - check: check-am - all-am: Makefile - - installdirs: -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -219,7 +282,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -227,7 +290,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -237,7 +300,7 @@ - clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am -@@ -259,7 +322,7 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local - -@@ -267,6 +330,14 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-info-am uninstall-local - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -@@ -276,8 +347,8 @@ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ -- mostlyclean-generic mostlyclean-libtool uninstall uninstall-am \ -- uninstall-info-am uninstall-local -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-info-am uninstall-local - - - all: $(stamp) -diff -Naur libodbc++-0.2.3/doc/progref/namespacemembers.html libodbc++-0.2.3-20050404/doc/progref/namespacemembers.html ---- libodbc++-0.2.3/doc/progref/namespacemembers.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/namespacemembers.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,17 +1,14 @@ -- -+ - --Namespace Member Index -+libodbc++: Namespace Members - - -- --
                                        --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
                                        --

                                        libodbc++ Namespace Members

                                        --d
                                        -+ -+
                                        Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
                                        -+
                                        All | Typedefs
                                        - -

                                        --Here is a list of all documented namespace members with links to the namespaces they belong to:

                                        - d -

                                        -- -

                                        Typedefs

                                        - -+
                                        A list of Drivers.
                                      • typedef CleanVector< DataSource * > DataSourceList -+
                                        A list of datasources.
                                      -

                                      Detailed Description

                                      --The namespace where all libodbc++ classes reside.

                                      Typedef Documentation

                                      --

                                      -- -+The namespace where all libodbc++ classes reside.

                                      Typedef Documentation

                                      -+

                                      -+

                                      - -- - -@@ -57,18 +57,19 @@ - - -
                                      -+ - - -- -+ -
                                      typedef CleanVector<DataSource*> odbc::DataSourceList -+ typedef CleanVector<DataSource*> odbc::DataSourceList
                                      -
                                      - -

                                      --A list of datasources. -+A list of datasources. -

                                      - Behaves like an std::vector

                                      --

                                      -- -+

                                      -+

                                      - -- - -@@ -81,7 +82,7 @@ - - -diff -Naur libodbc++-0.2.3/doc/progref/namespaces.html libodbc++-0.2.3-20050404/doc/progref/namespaces.html ---- libodbc++-0.2.3/doc/progref/namespaces.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/namespaces.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,13 +1,12 @@ -- -+ - --Namespace Index -+libodbc++: Namespace Index - - -- --
                                      --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
                                      --

                                      libodbc++ Namespace List

                                      Here is a list of all documented namespaces with brief descriptions:
                                      -+ - - -- -+ -
                                      typedef CleanVector<Driver*> odbc::DriverList -+ typedef CleanVector<Driver*> odbc::DriverList
                                      -
                                      - -

                                      --A list of Drivers. -+A list of Drivers. -

                                      - Actually an STL vector

                                      -- -+ -+
                                      Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
                                      -+

                                      libodbc++ Namespace List

                                      Here is a list of all documented namespaces with brief descriptions:
                                      odbcThe namespace where all libodbc++ classes reside
                                      -+ -
                                      odbcThe namespace where all libodbc++ classes reside
                                      -

                                      -
                                      -diff -Naur libodbc++-0.2.3/doc/progref/preparedstatement_8h-source.html libodbc++-0.2.3-20050404/doc/progref/preparedstatement_8h-source.html ---- libodbc++-0.2.3/doc/progref/preparedstatement_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/preparedstatement_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,130 +1,129 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/preparedstatement.h Source File -+libodbc++: odbc++/preparedstatement.h Source File - - -- --
                                      --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
                                      --

                                      /trees/alex/src/libodbc++/include/odbc++/preparedstatement.h

                                      00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
                                      Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
                                      
-+
                                      odbc++/preparedstatement.h
                                      00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
- 00022 
--00023 #ifndef __ODBCXX_PREPAREDSTATEMENT_H
--00024 #define __ODBCXX_PREPAREDSTATEMENT_H
--00025 
--00026 #include <odbc++/setup.h>
--00027 #include <odbc++/types.h>
--00028 #include <odbc++/statement.h>
-+00023 #ifndef __ODBCXX_PREPAREDSTATEMENT_H
-+00024 #define __ODBCXX_PREPAREDSTATEMENT_H
-+00025 
-+00026 #include <odbc++/setup.h>
-+00027 #include <odbc++/types.h>
-+00028 #include <odbc++/statement.h>
- 00029 
--00030 #if defined(ODBCXX_HAVE_ISO_CXXLIB)
--00031 # include <iosfwd>
--00032 #else
--00033 # include <iostream>
--00034 #endif
--00035 
--00036 namespace odbc {
-+00030 #if defined(ODBCXX_HAVE_ISO_CXXLIB)
-+00031 # include <iosfwd>
-+00032 #else
-+00033 # include <iostream>
-+00034 #endif
-+00035 
-+00036 namespace odbc {
- 00037 
--00038   class Rowset;
-+00038   class Rowset;
- 00039 
--00061   class ODBCXX_EXPORT PreparedStatement : public Statement {
--00062     friend class Connection;
-+00061   class ODBCXX_EXPORT PreparedStatement : public Statement {
-+00062     friend class Connection;
- 00063 
--00064   private:
--00065     void _prepare();
--00066     void _setupParams();
-+00064   private:
-+00065     void _prepare();
-+00066     void _setupParams();
- 00067 
--00068   protected:
-+00068   protected:
- 00069     ODBCXX_STRING sql_;
--00070     //here we store the parameters
-+00070     //here we store the parameters
- 00071     Rowset* rowset_;
- 00072     size_t numParams_;
- 00073     std::vector<int> directions_;
--00074     int defaultDirection_;
--00075     bool paramsBound_;
-+00074     int defaultDirection_;
-+00075     bool paramsBound_;
- 00076     
--00077     PreparedStatement(Connection* con,
-+00077     PreparedStatement(Connection* con,
- 00078                       SQLHSTMT hstmt,
--00079                       const ODBCXX_STRING& sql,
--00080                       int resultSetType,
--00081                       int resultSetConcurrency,
--00082                       int defaultDirection =SQL_PARAM_INPUT);
-+00079                       const ODBCXX_STRING& sql,
-+00080                       int resultSetType,
-+00081                       int resultSetConcurrency,
-+00082                       int defaultDirection =SQL_PARAM_INPUT);
- 00083 
--00084     void _bindParams();
--00085     void _unbindParams();
-+00084     void _bindParams();
-+00085     void _unbindParams();
- 00086 
--00087     void _checkParam(int idx,
--00088                      int* allowed, int numAllowed,
--00089                      int defPrec, int defScale);
-+00087     void _checkParam(int idx,
-+00088                      int* allowed, int numAllowed,
-+00089                      int defPrec, int defScale);
- 00090 
--00091   public:
--00093     virtual ~PreparedStatement();
-+00091   public:
-+00093     virtual ~PreparedStatement();
- 00094     
--00101     void clearParameters();
-+00101     void clearParameters();
- 00102     
--00107     bool execute();
-+00107     bool execute();
- 00108 
--00111     ResultSet* executeQuery();
-+00111     ResultSet* executeQuery();
- 00112 
--00114     int executeUpdate();
-+00114     int executeUpdate();
- 00115     
--00120     void setDouble(int idx, double val);
-+00120     void setDouble(int idx, double val);
- 00121 
--00126     void setBoolean(int idx, bool val);
-+00126     void setBoolean(int idx, bool val);
- 00127 
--00132     void setByte(int idx, signed char val);
-+00132     void setByte(int idx, signed char val);
- 00133 
- 00134 
--00139     void setBytes(int idx, const ODBCXX_BYTES& val);
-+00139     void setBytes(int idx, const ODBCXX_BYTES& val);
- 00140 
--00145     void setDate(int idx, const Date& val);
-+00145     void setDate(int idx, const Date& val);
- 00146 
--00151     void setFloat(int idx, float val);
-+00151     void setFloat(int idx, float val);
- 00152 
- 00153 
--00158     void setInt(int idx, int val);
-+00158     void setInt(int idx, int val);
- 00159 
--00164     void setLong(int idx, Long val);
-+00164     void setLong(int idx, Long val);
- 00165 
--00170     void setShort(int idx, short val);
-+00170     void setShort(int idx, short val);
- 00171 
--00176     void setString(int idx, const ODBCXX_STRING& val);
-+00176     void setString(int idx, const ODBCXX_STRING& val);
- 00177 
--00182     void setTime(int idx, const Time& val);
-+00182     void setTime(int idx, const Time& val);
- 00183 
--00188     void setTimestamp(int idx, const Timestamp& val);
-+00188     void setTimestamp(int idx, const Timestamp& val);
- 00189 
--00195     void setAsciiStream(int idx, ODBCXX_STREAM* s, int len);
-+00195     void setAsciiStream(int idx, ODBCXX_STREAM* s, int len);
- 00196 
--00202     void setBinaryStream(int idx, ODBCXX_STREAM* s, int len);
-+00202     void setBinaryStream(int idx, ODBCXX_STREAM* s, int len);
- 00203 
- 00204     
--00210     void setNull(int idx, int sqlType);
-+00210     void setNull(int idx, int sqlType);
- 00211   };
- 00212 
- 00213 
--00214 }; // namespace odbc
-+00214 }; // namespace odbc
- 00215 
--00216 #endif // __ODBCXX_PREPAREDSTATEMENT_H
--
                                      -+00216 #endif // __ODBCXX_PREPAREDSTATEMENT_H -+
                                      - -diff -Naur libodbc++-0.2.3/doc/progref/resultset_8h-source.html libodbc++-0.2.3-20050404/doc/progref/resultset_8h-source.html ---- libodbc++-0.2.3/doc/progref/resultset_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/resultset_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,335 +1,334 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/resultset.h Source File -+libodbc++: odbc++/resultset.h Source File - - -- --
                                      --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
                                      --

                                      /trees/alex/src/libodbc++/include/odbc++/resultset.h

                                      00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
                                      Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
                                      
-+
                                      odbc++/resultset.h
                                      00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_RESULTSET_H
--00023 #define __ODBCXX_RESULTSET_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/errorhandler.h>
--00028 #include <odbc++/statement.h>
-+00022 #ifndef __ODBCXX_RESULTSET_H
-+00023 #define __ODBCXX_RESULTSET_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/errorhandler.h>
-+00028 #include <odbc++/statement.h>
- 00029 
- 00030 
--00031 namespace odbc {
-+00031 namespace odbc {
- 00032 
--00033   class ResultSetMetaData;
--00034   class Statement;
--00035   class Rowset;
-+00033   class ResultSetMetaData;
-+00034   class Statement;
-+00035   class Rowset;
- 00036 
--00038   class ODBCXX_EXPORT ResultSet : public ErrorHandler {
--00039     friend class Statement;
--00040     friend class ResultSetMetaData;
-+00038   class ODBCXX_EXPORT ResultSet : public ErrorHandler {
-+00039     friend class Statement;
-+00040     friend class ResultSetMetaData;
- 00041     
--00042   private:
--00043     Statement* statement_;
-+00042   private:
-+00043     Statement* statement_;
- 00044     SQLHSTMT hstmt_;
--00045     bool ownStatement_;
-+00045     bool ownStatement_;
- 00046 
- 00047 
--00048     int currentFetchSize_;
--00049     int newFetchSize_;
-+00048     int currentFetchSize_;
-+00049     int newFetchSize_;
- 00050 
- 00051     Rowset* rowset_;
- 00052     SQLUSMALLINT* rowStatus_;
- 00053     SQLUINTEGER rowsInRowset_;
- 00054 
--00055     //tells us if the columns are bound right now
--00056     bool colsBound_;
--00057     bool streamedColsBound_;
-+00055     //tells us if the columns are bound right now
-+00056     bool colsBound_;
-+00057     bool streamedColsBound_;
- 00058 
--00059     //the position in the rowset last time we did a bind
--00060     unsigned int bindPos_;
-+00059     //the position in the rowset last time we did a bind
-+00060     unsigned int bindPos_;
- 00061 
--00062     //meta data - it's always there since we need info from it
--00063     ResultSetMetaData* metaData_;
-+00062     //meta data - it's always there since we need info from it
-+00063     ResultSetMetaData* metaData_;
- 00064 
--00065     int location_;
-+00065     int location_;
- 00066     
--00067     bool lastWasNull_;
-+00067     bool lastWasNull_;
- 00068 
--00069     int rowBeforeInsert_;
--00070     int locBeforeInsert_;
-+00069     int rowBeforeInsert_;
-+00070     int locBeforeInsert_;
- 00071 
--00072     ResultSet(Statement* stmt,SQLHSTMT hstmt, bool ownStmt);
-+00072     ResultSet(Statement* stmt,SQLHSTMT hstmt, bool ownStmt);
- 00073     
--00074     //driver info
--00075     const DriverInfo* _getDriverInfo() const {
--00076       return statement_->_getDriverInfo();
-+00074     //driver info
-+00075     const DriverInfo* _getDriverInfo() const {
-+00076       return statement_->_getDriverInfo();
- 00077     }
- 00078 
--00079     //private utils
--00080     void _applyFetchSize();
--00081     //this makes sure there is a rowset 
--00082     void _resetRowset();
-+00079     //private utils
-+00080     void _applyFetchSize();
-+00081     //this makes sure there is a rowset 
-+00082     void _resetRowset();
- 00083 
--00084     //this should be called before any call to SQLExtendedFetch
--00085     void _prepareForFetch();
--00086     //this performs a possibly scrolled fetch with fetchType to rownum
--00087     void _doFetch(int fetchType, int rowNum);
-+00084     //this should be called before any call to SQLExtendedFetch
-+00085     void _prepareForFetch();
-+00086     //this performs a possibly scrolled fetch with fetchType to rownum
-+00087     void _doFetch(int fetchType, int rowNum);
- 00088 
--00089     //this should be called after the position in the rowset changes
--00090     SQLRETURN _applyPosition(int mode =SQL_POSITION);
-+00089     //this should be called after the position in the rowset changes
-+00090     SQLRETURN _applyPosition(int mode =SQL_POSITION);
- 00091 
--00092     //these bind/unbind all non-streamed columns
--00093     void _bindCols();
--00094     void _unbindCols();
-+00092     //these bind/unbind all non-streamed columns
-+00093     void _bindCols();
-+00094     void _unbindCols();
- 00095 
--00096     //these bind/unbind all streamed columns
--00097     void _bindStreamedCols();
--00098     void _unbindStreamedCols();
-+00096     //these bind/unbind all streamed columns
-+00097     void _bindStreamedCols();
-+00098     void _unbindStreamedCols();
- 00099     
--00100     //this sends all needed data from streamed columns
--00101     //to be called from insertRow and updateRow
--00102     void _handleStreams(SQLRETURN r);
-+00100     //this sends all needed data from streamed columns
-+00101     //to be called from insertRow and updateRow
-+00102     void _handleStreams(SQLRETURN r);
- 00103     
- 00104 
--00105   public:
--00107     virtual ~ResultSet();
-+00105   public:
-+00107     virtual ~ResultSet();
- 00108     
--00109     //remember to update DatabaseMetaData when changing those values
-+00109     //remember to update DatabaseMetaData when changing those values
- 00110 
--00113     enum {
-+00113     enum {
- 00115       CONCUR_READ_ONLY,
- 00117       CONCUR_UPDATABLE
- 00118     };
- 00119 
- 00120 
--00123     enum {
-+00123     enum {
- 00125       TYPE_FORWARD_ONLY,
- 00129       TYPE_SCROLL_INSENSITIVE,
- 00131       TYPE_SCROLL_SENSITIVE
- 00132     };
- 00133 
--00140     bool absolute(int row);
-+00140     bool absolute(int row);
- 00141 
--00147     bool relative(int rows);
-+00147     bool relative(int rows);
- 00148 
--00150     void afterLast();
-+00150     void afterLast();
- 00151 
--00153     void beforeFirst();
-+00153     void beforeFirst();
- 00154 
--00156     bool isAfterLast();
-+00156     bool isAfterLast();
- 00157 
--00159     bool isBeforeFirst();
-+00159     bool isBeforeFirst();
- 00160 
--00162     bool isFirst();
-+00162     bool isFirst();
- 00163 
--00166     bool isLast();
-+00166     bool isLast();
- 00167 
--00172     int getRow();
-+00172     int getRow();
- 00173 
--00177     bool next();
-+00177     bool next();
- 00178 
--00182     bool previous();
-+00182     bool previous();
- 00183 
--00187     bool first();
-+00187     bool first();
- 00188 
--00192     bool last();
-+00192     bool last();
- 00193 
--00199     void moveToInsertRow();
-+00199     void moveToInsertRow();
- 00200     
--00204     void moveToCurrentRow();
-+00204     void moveToCurrentRow();
- 00205 
--00207     void refreshRow();
-+00207     void refreshRow();
- 00208 
--00210     void deleteRow();
-+00210     void deleteRow();
- 00211 
--00216     void insertRow();
-+00216     void insertRow();
- 00217 
--00219     void updateRow();
-+00219     void updateRow();
- 00220 
--00222     void cancelRowUpdates();
-+00222     void cancelRowUpdates();
- 00223 
--00227     ResultSetMetaData* getMetaData() {
--00228       return metaData_;
-+00227     ResultSetMetaData* getMetaData() {
-+00228       return metaData_;
- 00229     }
- 00230 
--00232     int findColumn(const ODBCXX_STRING& colName);
-+00232     int findColumn(const ODBCXX_STRING& colName);
- 00233 
--00235     bool rowDeleted();
-+00235     bool rowDeleted();
- 00236 
--00238     bool rowInserted();
-+00238     bool rowInserted();
- 00239 
--00241     bool rowUpdated();
-+00241     bool rowUpdated();
- 00242 
--00244     int getType();
-+00244     int getType();
- 00245 
--00247     int getConcurrency();
-+00247     int getConcurrency();
- 00248     
- 00249     
--00251     int getFetchSize() {
--00252       return newFetchSize_;
-+00251     int getFetchSize() {
-+00252       return newFetchSize_;
- 00253     }
- 00254 
--00256     void setFetchSize(int fetchSize);
-+00256     void setFetchSize(int fetchSize);
- 00257 
- 00259     ODBCXX_STRING getCursorName();
- 00260 
--00262     Statement* getStatement() {
--00263       return statement_;
-+00262     Statement* getStatement() {
-+00263       return statement_;
- 00264     }
- 00265 
--00269     double getDouble(int idx);
-+00269     double getDouble(int idx);
- 00270 
--00274     bool getBoolean(int idx);
-+00274     bool getBoolean(int idx);
- 00275 
--00279     signed char getByte(int idx);
-+00279     signed char getByte(int idx);
- 00280 
--00285     ODBCXX_BYTES getBytes(int idx);
-+00285     ODBCXX_BYTES getBytes(int idx);
- 00286 
--00290     Date getDate(int idx);
-+00290     Date getDate(int idx);
- 00291 
--00295     float getFloat(int idx);
-+00295     float getFloat(int idx);
- 00296 
--00300     int getInt(int idx);
-+00300     int getInt(int idx);
- 00301 
--00305     Long getLong(int idx);
-+00305     Long getLong(int idx);
- 00306 
--00310     short getShort(int idx);
-+00310     short getShort(int idx);
- 00311 
--00315     ODBCXX_STRING getString(int idx);
-+00315     ODBCXX_STRING getString(int idx);
- 00316 
--00320     Time getTime(int idx);
-+00320     Time getTime(int idx);
- 00321 
--00325     Timestamp getTimestamp(int idx);
-+00325     Timestamp getTimestamp(int idx);
- 00326 
--00330     double getDouble(const ODBCXX_STRING& colName);
-+00330     double getDouble(const ODBCXX_STRING& colName);
- 00331     
--00335     bool getBoolean(const ODBCXX_STRING& colName);
-+00335     bool getBoolean(const ODBCXX_STRING& colName);
- 00336 
--00340     signed char getByte(const ODBCXX_STRING& colName);
-+00340     signed char getByte(const ODBCXX_STRING& colName);
- 00341 
- 00342 
--00346     ODBCXX_BYTES getBytes(const ODBCXX_STRING& colName);
-+00346     ODBCXX_BYTES getBytes(const ODBCXX_STRING& colName);
- 00347 
--00351     Date getDate(const ODBCXX_STRING& colName);
-+00351     Date getDate(const ODBCXX_STRING& colName);
- 00352 
--00356     float getFloat(const ODBCXX_STRING& colName);
-+00356     float getFloat(const ODBCXX_STRING& colName);
- 00357 
--00361     int getInt(const ODBCXX_STRING& colName);
-+00361     int getInt(const ODBCXX_STRING& colName);
- 00362 
--00366     Long getLong(const ODBCXX_STRING& colName);
-+00366     Long getLong(const ODBCXX_STRING& colName);
- 00367 
--00371     short getShort(const ODBCXX_STRING& colName);
-+00371     short getShort(const ODBCXX_STRING& colName);
- 00372 
--00376     ODBCXX_STRING getString(const ODBCXX_STRING& colName);
-+00376     ODBCXX_STRING getString(const ODBCXX_STRING& colName);
- 00377 
--00381     Time getTime(const ODBCXX_STRING& colName);
-+00381     Time getTime(const ODBCXX_STRING& colName);
- 00382 
--00386     Timestamp getTimestamp(const ODBCXX_STRING& colName);
-+00386     Timestamp getTimestamp(const ODBCXX_STRING& colName);
- 00387 
- 00388 
--00396     ODBCXX_STREAM* getAsciiStream(int idx);
-+00396     ODBCXX_STREAM* getAsciiStream(int idx);
- 00397 
--00405     ODBCXX_STREAM* getAsciiStream(const ODBCXX_STRING& colName);
-+00405     ODBCXX_STREAM* getAsciiStream(const ODBCXX_STRING& colName);
- 00406 
--00414     ODBCXX_STREAM* getBinaryStream(int idx);
-+00414     ODBCXX_STREAM* getBinaryStream(int idx);
- 00415 
--00423     ODBCXX_STREAM* getBinaryStream(const ODBCXX_STRING& colName);
-+00423     ODBCXX_STREAM* getBinaryStream(const ODBCXX_STRING& colName);
- 00424     
--00428     bool wasNull() {
--00429       return lastWasNull_;
-+00428     bool wasNull() {
-+00429       return lastWasNull_;
- 00430     }
- 00431 
--00436     void updateDouble(int idx, double val);
-+00436     void updateDouble(int idx, double val);
- 00437 
--00442     void updateBoolean(int idx, bool val);
-+00442     void updateBoolean(int idx, bool val);
- 00443 
--00448     void updateByte(int idx, signed char val);
-+00448     void updateByte(int idx, signed char val);
- 00449 
- 00450 
--00455     void updateBytes(int idx, const ODBCXX_BYTES& val);
-+00455     void updateBytes(int idx, const ODBCXX_BYTES& val);
- 00456 
--00461     void updateDate(int idx, const Date& val);
-+00461     void updateDate(int idx, const Date& val);
- 00462 
--00467     void updateFloat(int idx, float val);
-+00467     void updateFloat(int idx, float val);
- 00468 
--00473     void updateInt(int idx, int val);
-+00473     void updateInt(int idx, int val);
- 00474 
--00479     void updateLong(int idx, Long val);
-+00479     void updateLong(int idx, Long val);
- 00480 
--00485     void updateShort(int idx, short val);
-+00485     void updateShort(int idx, short val);
- 00486 
--00491     void updateString(int idx, const ODBCXX_STRING& val);
-+00491     void updateString(int idx, const ODBCXX_STRING& val);
- 00492 
--00497     void updateTime(int idx, const Time& val);
-+00497     void updateTime(int idx, const Time& val);
- 00498 
--00503     void updateTimestamp(int idx, const Timestamp& val);
-+00503     void updateTimestamp(int idx, const Timestamp& val);
- 00504 
--00508     void updateNull(int idx);
-+00508     void updateNull(int idx);
- 00509 
- 00510 
--00515     void updateDouble(const ODBCXX_STRING& colName, double val);
-+00515     void updateDouble(const ODBCXX_STRING& colName, double val);
- 00516 
--00521     void updateBoolean(const ODBCXX_STRING& colName, bool val);
-+00521     void updateBoolean(const ODBCXX_STRING& colName, bool val);
- 00522 
--00527     void updateByte(const ODBCXX_STRING& colName, signed char val);
-+00527     void updateByte(const ODBCXX_STRING& colName, signed char val);
- 00528 
--00533     void updateBytes(const ODBCXX_STRING& colName, 
--00534                      const ODBCXX_BYTES& val);
-+00533     void updateBytes(const ODBCXX_STRING& colName, 
-+00534                      const ODBCXX_BYTES& val);
- 00535 
- 00536 
--00541     void updateDate(const ODBCXX_STRING& colName, const Date& val);
-+00541     void updateDate(const ODBCXX_STRING& colName, const Date& val);
- 00542 
--00547     void updateFloat(const ODBCXX_STRING& colName, float val);
-+00547     void updateFloat(const ODBCXX_STRING& colName, float val);
- 00548 
--00553     void updateInt(const ODBCXX_STRING& colName, int val);
-+00553     void updateInt(const ODBCXX_STRING& colName, int val);
- 00554 
--00559     void updateLong(const ODBCXX_STRING& colName, Long val);
-+00559     void updateLong(const ODBCXX_STRING& colName, Long val);
- 00560 
--00565     void updateShort(const ODBCXX_STRING& colName, short val);
-+00565     void updateShort(const ODBCXX_STRING& colName, short val);
- 00566 
--00571     void updateString(const ODBCXX_STRING& colName, const ODBCXX_STRING& val);
-+00571     void updateString(const ODBCXX_STRING& colName, const ODBCXX_STRING& val);
- 00572 
--00577     void updateTime(const ODBCXX_STRING& colName, const Time& val);
-+00577     void updateTime(const ODBCXX_STRING& colName, const Time& val);
- 00578 
--00583     void updateTimestamp(const ODBCXX_STRING& colName, const Timestamp& val);
-+00583     void updateTimestamp(const ODBCXX_STRING& colName, const Timestamp& val);
- 00584 
--00590     void updateAsciiStream(int idx, ODBCXX_STREAM* s, int len);
-+00590     void updateAsciiStream(int idx, ODBCXX_STREAM* s, int len);
- 00591 
--00597     void updateAsciiStream(const ODBCXX_STRING& colName, ODBCXX_STREAM* s, int len);
-+00597     void updateAsciiStream(const ODBCXX_STRING& colName, ODBCXX_STREAM* s, int len);
- 00598 
- 00599 
--00605     void updateBinaryStream(int idx, ODBCXX_STREAM* s, int len);
-+00605     void updateBinaryStream(int idx, ODBCXX_STREAM* s, int len);
- 00606 
--00612     void updateBinaryStream(const ODBCXX_STRING& colName, ODBCXX_STREAM* s, int len);
-+00612     void updateBinaryStream(const ODBCXX_STRING& colName, ODBCXX_STREAM* s, int len);
- 00613 
--00617     void updateNull(const ODBCXX_STRING& colName);
-+00617     void updateNull(const ODBCXX_STRING& colName);
- 00618   };
- 00619 
- 00620   
- 00621 
--00622 }; // namespace odbc
-+00622 }; // namespace odbc
- 00623 
- 00624 
--00625 #endif // __ODBCXX_RESULTSET_H
--
                                      -+00625 #endif // __ODBCXX_RESULTSET_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/resultsetmetadata_8h-source.html libodbc++-0.2.3-20050404/doc/progref/resultsetmetadata_8h-source.html ---- libodbc++-0.2.3/doc/progref/resultsetmetadata_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/resultsetmetadata_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,133 +1,132 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/resultsetmetadata.h Source File -+libodbc++: odbc++/resultsetmetadata.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/resultsetmetadata.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/resultsetmetadata.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_RESULTSETMETADATA_H
--00023 #define __ODBCXX_RESULTSETMETADATA_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/resultset.h>
-+00022 #ifndef __ODBCXX_RESULTSETMETADATA_H
-+00023 #define __ODBCXX_RESULTSETMETADATA_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/resultset.h>
- 00028 
--00029 namespace odbc {
-+00029 namespace odbc {
- 00030 
--00031   class ResultSet;
--00032   class DriverInfo;
-+00031   class ResultSet;
-+00032   class DriverInfo;
- 00033 
--00035   class ODBCXX_EXPORT ResultSetMetaData {
--00036     friend class ResultSet;
--00037     friend class Statement;
--00038   private:
--00039     ResultSet* resultSet_;
-+00035   class ODBCXX_EXPORT ResultSetMetaData {
-+00036     friend class ResultSet;
-+00037     friend class Statement;
-+00038   private:
-+00039     ResultSet* resultSet_;
- 00040 
--00041     int numCols_;
-+00041     int numCols_;
- 00042     std::vector<ODBCXX_STRING> colNames_;
- 00043     std::vector<int> colTypes_;
- 00044     std::vector<int> colPrecisions_;
- 00045     std::vector<int> colScales_;
--00046 #if ODBCVER >= 0x0300
--00047     std::vector<int> colLengths_;
--00048 #endif
--00049 
--00050     //internal stuff
--00051     bool needsGetData_;
-+00046 #if ODBCVER >= 0x0300
-+00047     std::vector<int> colLengths_;
-+00048 #endif
-+00049 
-+00050     //internal stuff
-+00051     bool needsGetData_;
- 00052 
--00053     //yes, both constructor and destructor are meant to be private
--00054     ResultSetMetaData(ResultSet* rs);
-+00053     //yes, both constructor and destructor are meant to be private
-+00054     ResultSetMetaData(ResultSet* rs);
- 00055     ~ResultSetMetaData() {}
- 00056 
--00057     //driver info
--00058     const DriverInfo* _getDriverInfo() const {
--00059       return resultSet_->_getDriverInfo();
-+00057     //driver info
-+00058     const DriverInfo* _getDriverInfo() const {
-+00059       return resultSet_->_getDriverInfo();
- 00060     }
- 00061 
--00062     //these fetch info about a column
--00063     int _getNumericAttribute(unsigned int col, SQLUSMALLINT attr);
--00064     ODBCXX_STRING _getStringAttribute(unsigned int col, SQLUSMALLINT attr, unsigned int maxlen =255);
-+00062     //these fetch info about a column
-+00063     int _getNumericAttribute(unsigned int col, SQLUSMALLINT attr);
-+00064     ODBCXX_STRING _getStringAttribute(unsigned int col, SQLUSMALLINT attr, unsigned int maxlen =255);
- 00065 
--00066     //this loads the above values
--00067     void _fetchColumnInfo();
-+00066     //this loads the above values
-+00067     void _fetchColumnInfo();
- 00068 
--00069   public:
--00071     enum {
-+00069   public:
-+00071     enum {
- 00072       columnNoNulls             = SQL_NO_NULLS,
- 00073       columnNullable            = SQL_NULLABLE,
- 00074       columnNullableUnknown     = SQL_NULLABLE_UNKNOWN
- 00075     };
- 00076 
--00078     int getColumnCount() const;
-+00078     int getColumnCount() const;
- 00079 
--00083     const ODBCXX_STRING& getColumnName(int column) const;
-+00083     const ODBCXX_STRING& getColumnName(int column) const;
- 00084 
--00089     int getColumnType(int column) const;
-+00089     int getColumnType(int column) const;
- 00090 
--00094     int getPrecision(int column) const;
-+00094     int getPrecision(int column) const;
- 00095 
--00099     int getScale(int column) const;
-+00099     int getScale(int column) const;
- 00100 
--00104     int getColumnDisplaySize(int column);
-+00104     int getColumnDisplaySize(int column);
- 00105 
--00109     ODBCXX_STRING getCatalogName(int column);
-+00109     ODBCXX_STRING getCatalogName(int column);
- 00110 
--00114     ODBCXX_STRING getColumnLabel(int column);
-+00114     ODBCXX_STRING getColumnLabel(int column);
- 00115 
--00119     ODBCXX_STRING getColumnTypeName(int column);
-+00119     ODBCXX_STRING getColumnTypeName(int column);
- 00120 
--00124     ODBCXX_STRING getSchemaName(int column);
-+00124     ODBCXX_STRING getSchemaName(int column);
- 00125 
--00129     ODBCXX_STRING getTableName(int column);
-+00129     ODBCXX_STRING getTableName(int column);
- 00130 
--00134     bool isAutoIncrement(int column);
-+00134     bool isAutoIncrement(int column);
- 00135 
--00139     bool isCaseSensitive(int column);
-+00139     bool isCaseSensitive(int column);
- 00140     
--00144     bool isCurrency(int column);
-+00144     bool isCurrency(int column);
- 00145 
--00149     bool isDefinitelyWritable(int column);
-+00149     bool isDefinitelyWritable(int column);
- 00150 
--00154     int isNullable(int column);
-+00154     int isNullable(int column);
- 00155 
--00159     bool isReadOnly(int column);
-+00159     bool isReadOnly(int column);
- 00160 
--00164     bool isSearchable(int column);
-+00164     bool isSearchable(int column);
- 00165 
--00169     bool isSigned(int column);
-+00169     bool isSigned(int column);
- 00170 
--00174     bool isWritable(int column);
-+00174     bool isWritable(int column);
- 00175   };
- 00176 
- 00177   
- 00178 
--00179 }; // namespace odbc
-+00179 }; // namespace odbc
- 00180 
- 00181 
--00182 #endif // __ODBCXX_RESULTSETMETADATA_H
--
    -+00182 #endif // __ODBCXX_RESULTSETMETADATA_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/setup_8h-source.html libodbc++-0.2.3-20050404/doc/progref/setup_8h-source.html ---- libodbc++-0.2.3/doc/progref/setup_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/setup_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,148 +1,147 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/setup.h Source File -+libodbc++: odbc++/setup.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/setup.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/setup.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_SETUP_H
--00023 #define __ODBCXX_SETUP_H
--00024 
--00025 #if defined(__WIN32__) && !defined(WIN32)
--00026 # define WIN32 1
--00027 #endif
--00028 
--00029 #if !defined(WIN32)
--00030 # include <odbc++/config.h>
--00031 #else
--00032 # include <odbc++/config-win32.h>
--00033 #endif
--00034 
-+00022 #ifndef __ODBCXX_SETUP_H
-+00023 #define __ODBCXX_SETUP_H
-+00024 
-+00025 #if defined(__WIN32__) && !defined(WIN32)
-+00026 # define WIN32 1
-+00027 #endif
-+00028 
-+00029 #if !defined(WIN32)
-+00030 # include <odbc++/config.h>
-+00031 #else
-+00032 # include <odbc++/config-win32.h>
-+00033 #endif
-+00034 
- 00035 
--00036 #if defined(IN_ODBCXX) && defined(ODBCXX_ENABLE_THREADS)
--00037 # if !defined(_REENTRANT)
--00038 #  define _REENTRANT 1
--00039 # endif
--00040 # if !defined(_THREAD_SAFE)
--00041 #  define _THREAD_SAFE 1
--00042 # endif
--00043 #endif
--00044 
--00045 // check whether we use strstream or stringstream
--00046 #if defined(IN_ODBCXX)
--00047 # if defined(ODBCXX_HAVE_SSTREAM)
--00048 #  define ODBCXX_SSTREAM std::stringstream
--00049 # else
--00050 #  define ODBCXX_SSTREAM std::strstream
--00051 # endif
--00052 #endif
--00053 
--00054 // check if ODBCVER is forced to something
--00055 #if defined(ODBCXX_ODBCVER)
--00056 # define ODBCVER ODBCXX_ODBCVER
--00057 #endif
--00058 
--00059 // this can confuse our Types::CHAR
--00060 #ifdef CHAR
--00061 #undef CHAR
--00062 #endif
--00063 
--00064 // NDEBUG and cassert
--00065 #if defined(IN_ODBCXX) 
--00066 # if !defined(ODBCXX_DEBUG)
--00067 #  define NDEBUG
--00068 # endif
--00069 # include <cassert>
--00070 #endif
--00071 
--00072 // this should do the trick
--00073 #if defined(__GNUC__) && __GNUC__>=3
--00074 # define ODBCXX_HAVE_ISO_CXXLIB
--00075 #endif
--00076 
-+00036 #if defined(IN_ODBCXX) && defined(ODBCXX_ENABLE_THREADS)
-+00037 # if !defined(_REENTRANT)
-+00038 #  define _REENTRANT 1
-+00039 # endif
-+00040 # if !defined(_THREAD_SAFE)
-+00041 #  define _THREAD_SAFE 1
-+00042 # endif
-+00043 #endif
-+00044 
-+00045 // check whether we use strstream or stringstream
-+00046 #if defined(IN_ODBCXX)
-+00047 # if defined(ODBCXX_HAVE_SSTREAM)
-+00048 #  define ODBCXX_SSTREAM std::stringstream
-+00049 # else
-+00050 #  define ODBCXX_SSTREAM std::strstream
-+00051 # endif
-+00052 #endif
-+00053 
-+00054 // check if ODBCVER is forced to something
-+00055 #if defined(ODBCXX_ODBCVER)
-+00056 # define ODBCVER ODBCXX_ODBCVER
-+00057 #endif
-+00058 
-+00059 // this can confuse our Types::CHAR
-+00060 #ifdef CHAR
-+00061 #undef CHAR
-+00062 #endif
-+00063 
-+00064 // NDEBUG and cassert
-+00065 #if defined(IN_ODBCXX) 
-+00066 # if !defined(ODBCXX_DEBUG)
-+00067 #  define NDEBUG
-+00068 # endif
-+00069 # include <cassert>
-+00070 #endif
-+00071 
-+00072 // this should do the trick
-+00073 #if defined(__GNUC__) && __GNUC__>=3
-+00074 # define ODBCXX_HAVE_ISO_CXXLIB
-+00075 #endif
-+00076 
- 00077 
--00078 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
--00079 # if defined(ODBCXX_DLL)
--00080 #  if defined(IN_ODBCXX)
--00081 #   define ODBCXX_EXPORT __declspec(dllexport)
--00082 #  else
--00083 #   define ODBCXX_EXPORT __declspec(dllimport)
--00084 #  endif
--00085 # endif
--00086 #endif
--00087 
--00088 #if !defined(ODBCXX_EXPORT)
--00089 # define ODBCXX_EXPORT
--00090 #endif
--00091 
--00092 #if defined(_MSC_VER) || defined(__MINGW32__)
--00093 # define ODBCXX_DUMMY_RETURN(x) return (x)
--00094 #else
--00095 # define ODBCXX_DUMMY_RETURN(x) ((void)0)
--00096 #endif
--00097 
-+00078 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
-+00079 # if defined(ODBCXX_DLL)
-+00080 #  if defined(IN_ODBCXX)
-+00081 #   define ODBCXX_EXPORT __declspec(dllexport)
-+00082 #  else
-+00083 #   define ODBCXX_EXPORT __declspec(dllimport)
-+00084 #  endif
-+00085 # endif
-+00086 #endif
-+00087 
-+00088 #if !defined(ODBCXX_EXPORT)
-+00089 # define ODBCXX_EXPORT
-+00090 #endif
-+00091 
-+00092 #if defined(_MSC_VER) || defined(__MINGW32__)
-+00093 # define ODBCXX_DUMMY_RETURN(x) return (x)
-+00094 #else
-+00095 # define ODBCXX_DUMMY_RETURN(x) ((void)0)
-+00096 #endif
-+00097 
- 00098 
--00099 // environment abstractions
-+00099 // environment abstractions
- 00100 
--00101 #if defined(ODBCXX_QT)
--00102 
--00103 # define ODBCXX_STRING QString
--00104 # define ODBCXX_STRING_C(s) QString::fromLocal8Bit(s)
--00105 # define ODBCXX_STRING_CL(s,l) QString::fromLocal8Bit(s,l)
--00106 # define ODBCXX_STRING_LEN(s) s.length()
--00107 # define ODBCXX_STRING_DATA(s) s.local8Bit().data()
--00108 # define ODBCXX_STRING_CSTR(s) s.local8Bit().data()
--00109 
--00110 # define ODBCXX_STREAM QIODevice
--00111 
--00112 # define ODBCXX_BYTES QByteArray
--00113 # define ODBCXX_BYTES_SIZE(b) b.size()
--00114 # define ODBCXX_BYTES_DATA(b) b.data()
--00115 # define ODBCXX_BYTES_C(buf,len) QByteArray().duplicate(buf,len)
--00116 
--00117 #else
--00118 
--00119 # define ODBCXX_STRING std::string
--00120 # define ODBCXX_STRING_C(s) std::string(s)
--00121 # define ODBCXX_STRING_CL(s,l) std::string(s,l)
--00122 # define ODBCXX_STRING_LEN(s) s.length()
--00123 # define ODBCXX_STRING_DATA(s) s.data()
--00124 # define ODBCXX_STRING_CSTR(s) s.c_str()
--00125 
--00126 # define ODBCXX_STREAM std::istream
--00127 
--00128 # define ODBCXX_BYTES odbc::Bytes
--00129 # define ODBCXX_BYTES_SIZE(b) b.getSize()
--00130 # define ODBCXX_BYTES_DATA(b) b.getData()
--00131 # define ODBCXX_BYTES_C(buf,len) odbc::Bytes((signed char*)buf,(size_t)len)
--00132 
--00133 #endif // ODBCXX_QT
--00134 
-+00101 #if defined(ODBCXX_QT)
-+00102 
-+00103 # define ODBCXX_STRING QString
-+00104 # define ODBCXX_STRING_C(s) QString::fromLocal8Bit(s)
-+00105 # define ODBCXX_STRING_CL(s,l) QString::fromLocal8Bit(s,l)
-+00106 # define ODBCXX_STRING_LEN(s) s.length()
-+00107 # define ODBCXX_STRING_DATA(s) s.local8Bit().data()
-+00108 # define ODBCXX_STRING_CSTR(s) s.local8Bit().data()
-+00109 
-+00110 # define ODBCXX_STREAM QIODevice
-+00111 
-+00112 # define ODBCXX_BYTES QByteArray
-+00113 # define ODBCXX_BYTES_SIZE(b) b.size()
-+00114 # define ODBCXX_BYTES_DATA(b) b.data()
-+00115 # define ODBCXX_BYTES_C(buf,len) QByteArray().duplicate(buf,len)
-+00116 
-+00117 #else
-+00118 
-+00119 # define ODBCXX_STRING std::string
-+00120 # define ODBCXX_STRING_C(s) std::string(s)
-+00121 # define ODBCXX_STRING_CL(s,l) std::string(s,l)
-+00122 # define ODBCXX_STRING_LEN(s) s.length()
-+00123 # define ODBCXX_STRING_DATA(s) s.data()
-+00124 # define ODBCXX_STRING_CSTR(s) s.c_str()
-+00125 
-+00126 # define ODBCXX_STREAM std::istream
-+00127 
-+00128 # define ODBCXX_BYTES odbc::Bytes
-+00129 # define ODBCXX_BYTES_SIZE(b) b.getSize()
-+00130 # define ODBCXX_BYTES_DATA(b) b.getData()
-+00131 # define ODBCXX_BYTES_C(buf,len) odbc::Bytes((signed char*)buf,(size_t)len)
-+00132 
-+00133 #endif // ODBCXX_QT
-+00134 
- 00135 
--00136 #endif // __ODBCXX_SETUP_H
--
    -+00136 #endif // __ODBCXX_SETUP_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/statement_8h-source.html libodbc++-0.2.3-20050404/doc/progref/statement_8h-source.html ---- libodbc++-0.2.3/doc/progref/statement_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/statement_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,68 +1,67 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/statement.h Source File -+libodbc++: odbc++/statement.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/statement.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/statement.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_STATEMENT_H
--00023 #define __ODBCXX_STATEMENT_H
--00024 
--00025 #include <odbc++/setup.h>
--00026 #include <odbc++/types.h>
--00027 #include <odbc++/errorhandler.h>
--00028 #include <odbc++/connection.h>
-+00022 #ifndef __ODBCXX_STATEMENT_H
-+00023 #define __ODBCXX_STATEMENT_H
-+00024 
-+00025 #include <odbc++/setup.h>
-+00026 #include <odbc++/types.h>
-+00027 #include <odbc++/errorhandler.h>
-+00028 #include <odbc++/connection.h>
- 00029 
--00030 namespace odbc {
-+00030 namespace odbc {
- 00031 
--00032   class ResultSet;
--00033   class DriverInfo;
-+00032   class ResultSet;
-+00033   class DriverInfo;
- 00034 
--00036   class ODBCXX_EXPORT Statement : public ErrorHandler {
--00037     friend class Connection;
--00038     friend class ResultSet;
--00039     friend class DatabaseMetaData;
-+00036   class ODBCXX_EXPORT Statement : public ErrorHandler {
-+00037     friend class Connection;
-+00038     friend class ResultSet;
-+00039     friend class DatabaseMetaData;
- 00040 
--00041   protected:
--00042     Connection* connection_;
-+00041   protected:
-+00042     Connection* connection_;
- 00043     SQLHSTMT hstmt_;
--00044     int lastExecute_;
-+00044     int lastExecute_;
- 00045 
--00046     const DriverInfo* _getDriverInfo() const {
--00047       return connection_->_getDriverInfo();
-+00046     const DriverInfo* _getDriverInfo() const {
-+00047       return connection_->_getDriverInfo();
- 00048     }
- 00049 
--00050   private:
--00051     ResultSet* currentResultSet_;
-+00050   private:
-+00051     ResultSet* currentResultSet_;
- 00052 
--00053     int fetchSize_;
--00054     int resultSetType_;
--00055     int resultSetConcurrency_;
-+00053     int fetchSize_;
-+00054     int resultSetType_;
-+00055     int resultSetConcurrency_;
- 00056     
--00057     //used internally
--00058     enum StatementState {
-+00057     //used internally
-+00058     enum StatementState {
- 00059       STATE_CLOSED,
- 00060       STATE_OPEN
- 00061     };
-@@ -71,153 +70,153 @@
- 00064 
- 00065     std::vector<ODBCXX_STRING> batches_;
- 00066 
--00067     void _registerResultSet(ResultSet* rs);
--00068     void _unregisterResultSet(ResultSet* rs);
-+00067     void _registerResultSet(ResultSet* rs);
-+00068     void _unregisterResultSet(ResultSet* rs);
- 00069 
--00070     void _applyResultSetType();
-+00070     void _applyResultSetType();
- 00071 
--00072     ResultSet* _getTypeInfo();
--00073     ResultSet* _getTables(const ODBCXX_STRING& catalog,
--00074                           const ODBCXX_STRING& schema,
--00075                           const ODBCXX_STRING& tableName,
--00076                           const ODBCXX_STRING& types);
-+00072     ResultSet* _getTypeInfo();
-+00073     ResultSet* _getTables(const ODBCXX_STRING& catalog,
-+00074                           const ODBCXX_STRING& schema,
-+00075                           const ODBCXX_STRING& tableName,
-+00076                           const ODBCXX_STRING& types);
- 00077 
--00078     ResultSet* _getTablePrivileges(const ODBCXX_STRING& catalog,
--00079                                    const ODBCXX_STRING& schema,
--00080                                    const ODBCXX_STRING& tableName);
-+00078     ResultSet* _getTablePrivileges(const ODBCXX_STRING& catalog,
-+00079                                    const ODBCXX_STRING& schema,
-+00080                                    const ODBCXX_STRING& tableName);
- 00081 
--00082     ResultSet* _getColumnPrivileges(const ODBCXX_STRING& catalog,
--00083                                     const ODBCXX_STRING& schema,
--00084                                     const ODBCXX_STRING& tableName,
--00085                                     const ODBCXX_STRING& columnName);
-+00082     ResultSet* _getColumnPrivileges(const ODBCXX_STRING& catalog,
-+00083                                     const ODBCXX_STRING& schema,
-+00084                                     const ODBCXX_STRING& tableName,
-+00085                                     const ODBCXX_STRING& columnName);
- 00086 
--00087     ResultSet* _getPrimaryKeys(const ODBCXX_STRING& catalog,
--00088                                const ODBCXX_STRING& schema,
--00089                                const ODBCXX_STRING& tableName);
-+00087     ResultSet* _getPrimaryKeys(const ODBCXX_STRING& catalog,
-+00088                                const ODBCXX_STRING& schema,
-+00089                                const ODBCXX_STRING& tableName);
- 00090 
--00091     ResultSet* _getColumns(const ODBCXX_STRING& catalog,
--00092                            const ODBCXX_STRING& schema,
--00093                            const ODBCXX_STRING& tableName,
--00094                            const ODBCXX_STRING& columnName);
-+00091     ResultSet* _getColumns(const ODBCXX_STRING& catalog,
-+00092                            const ODBCXX_STRING& schema,
-+00093                            const ODBCXX_STRING& tableName,
-+00094                            const ODBCXX_STRING& columnName);
- 00095 
--00096     ResultSet* _getIndexInfo(const ODBCXX_STRING& catalog,
--00097                              const ODBCXX_STRING& schema,
--00098                              const ODBCXX_STRING& tableName,
--00099                              bool unique, bool approximate);
-+00096     ResultSet* _getIndexInfo(const ODBCXX_STRING& catalog,
-+00097                              const ODBCXX_STRING& schema,
-+00098                              const ODBCXX_STRING& tableName,
-+00099                              bool unique, bool approximate);
- 00100     
--00101     ResultSet* _getCrossReference(const ODBCXX_STRING& pc,
--00102                                   const ODBCXX_STRING& ps,
--00103                                   const ODBCXX_STRING& pt,
--00104                                   const ODBCXX_STRING& fc,
--00105                                   const ODBCXX_STRING& fs,
--00106                                   const ODBCXX_STRING& ft);
-+00101     ResultSet* _getCrossReference(const ODBCXX_STRING& pc,
-+00102                                   const ODBCXX_STRING& ps,
-+00103                                   const ODBCXX_STRING& pt,
-+00104                                   const ODBCXX_STRING& fc,
-+00105                                   const ODBCXX_STRING& fs,
-+00106                                   const ODBCXX_STRING& ft);
- 00107 
- 00108     
--00109     ResultSet* _getProcedures(const ODBCXX_STRING& catalog,
--00110                               const ODBCXX_STRING& schema,
--00111                               const ODBCXX_STRING& procName);
-+00109     ResultSet* _getProcedures(const ODBCXX_STRING& catalog,
-+00110                               const ODBCXX_STRING& schema,
-+00111                               const ODBCXX_STRING& procName);
- 00112     
--00113     ResultSet* _getProcedureColumns(const ODBCXX_STRING& catalog,
--00114                                     const ODBCXX_STRING& schema,
--00115                                     const ODBCXX_STRING& procName,
--00116                                     const ODBCXX_STRING& colName);
-+00113     ResultSet* _getProcedureColumns(const ODBCXX_STRING& catalog,
-+00114                                     const ODBCXX_STRING& schema,
-+00115                                     const ODBCXX_STRING& procName,
-+00116                                     const ODBCXX_STRING& colName);
- 00117 
--00118     ResultSet* _getSpecialColumns(const ODBCXX_STRING& catalog,
--00119                                   const ODBCXX_STRING& schema,
--00120                                   const ODBCXX_STRING& table,
--00121                                   int what,int scope,int nullable);
-+00118     ResultSet* _getSpecialColumns(const ODBCXX_STRING& catalog,
-+00119                                   const ODBCXX_STRING& schema,
-+00120                                   const ODBCXX_STRING& table,
-+00121                                   int what,int scope,int nullable);
- 00122       
--00123   protected:
--00124     Statement(Connection* con, SQLHSTMT hstmt, 
--00125               int resultSetType, int resultSetConcurrency);
-+00123   protected:
-+00124     Statement(Connection* con, SQLHSTMT hstmt, 
-+00125               int resultSetType, int resultSetConcurrency);
- 00126     
--00127     //utilities
-+00127     //utilities
- 00128     SQLUINTEGER _getNumericOption(SQLINTEGER optnum);
- 00129     ODBCXX_STRING _getStringOption(SQLINTEGER optnum);
- 00130     
--00131     void _setNumericOption(SQLINTEGER optnum, SQLUINTEGER value);
--00132     void _setStringOption(SQLINTEGER optnum, const ODBCXX_STRING& value);
-+00131     void _setNumericOption(SQLINTEGER optnum, SQLUINTEGER value);
-+00132     void _setStringOption(SQLINTEGER optnum, const ODBCXX_STRING& value);
- 00133 
--00134 #if ODBCVER >= 0x0300
--00135     SQLPOINTER _getPointerOption(SQLINTEGER optnum);
--00136     void _setPointerOption(SQLINTEGER optnum, SQLPOINTER value);
--00137 #endif
--00138 
--00139     //this returns true if we have a result set pending
--00140     bool _checkForResults();
-+00134 #if ODBCVER >= 0x0300
-+00135     SQLPOINTER _getPointerOption(SQLINTEGER optnum);
-+00136     void _setPointerOption(SQLINTEGER optnum, SQLPOINTER value);
-+00137 #endif
-+00138 
-+00139     //this returns true if we have a result set pending
-+00140     bool _checkForResults();
- 00141 
--00142     //this _always_ returns a ResultSet. If hideMe is true, this statement
--00143     //becomes 'owned' by the ResultSet
--00144     ResultSet* _getResultSet(bool hideMe =false);
-+00142     //this _always_ returns a ResultSet. If hideMe is true, this statement
-+00143     //becomes 'owned' by the ResultSet
-+00144     ResultSet* _getResultSet(bool hideMe =false);
- 00145 
--00146     //this is called before a Statement (or any of the derived classes)
--00147     //is executed
--00148     void _beforeExecute();
-+00146     //this is called before a Statement (or any of the derived classes)
-+00147     //is executed
-+00148     void _beforeExecute();
- 00149 
--00150     //this is called after a successeful execution
--00151     void _afterExecute();
-+00150     //this is called after a successeful execution
-+00151     void _afterExecute();
- 00152     
- 00153 
--00154   public:
--00158     virtual ~Statement();
-+00154   public:
-+00158     virtual ~Statement();
- 00159 
--00161     Connection* getConnection();
-+00161     Connection* getConnection();
- 00162     
- 00163 
--00165     void cancel();
-+00165     void cancel();
- 00166 
--00174     virtual bool execute(const ODBCXX_STRING& sql);
-+00174     virtual bool execute(const ODBCXX_STRING& sql);
- 00175     
--00180     virtual ResultSet* executeQuery(const ODBCXX_STRING& sql);
-+00180     virtual ResultSet* executeQuery(const ODBCXX_STRING& sql);
- 00181 
--00185     virtual int executeUpdate(const ODBCXX_STRING& sql);
-+00185     virtual int executeUpdate(const ODBCXX_STRING& sql);
- 00186     
--00192     int getUpdateCount();
-+00192     int getUpdateCount();
- 00193     
--00195     ResultSet* getResultSet();
-+00195     ResultSet* getResultSet();
- 00196 
--00201     bool getMoreResults();
-+00201     bool getMoreResults();
- 00202 
--00204     void setCursorName(const ODBCXX_STRING& name);
-+00204     void setCursorName(const ODBCXX_STRING& name);
- 00205     
--00209     int getFetchSize() {
--00210       return fetchSize_;
-+00209     int getFetchSize() {
-+00210       return fetchSize_;
- 00211     }
- 00212 
--00214     void setFetchSize(int size);
-+00214     void setFetchSize(int size);
- 00215 
--00217     int getResultSetConcurrency() {
--00218       return resultSetConcurrency_;
-+00217     int getResultSetConcurrency() {
-+00218       return resultSetConcurrency_;
- 00219     }
- 00220 
--00222     int getResultSetType() {
--00223       return resultSetType_;
-+00222     int getResultSetType() {
-+00223       return resultSetType_;
- 00224     }
- 00225     
--00227     int getQueryTimeout();
--00229     void setQueryTimeout(int seconds);
-+00227     int getQueryTimeout();
-+00229     void setQueryTimeout(int seconds);
- 00230 
--00232     int getMaxRows();
--00234     void setMaxRows(int maxRows);
-+00232     int getMaxRows();
-+00234     void setMaxRows(int maxRows);
- 00235 
--00237     int getMaxFieldSize();
--00239     void setMaxFieldSize(int maxFieldSize);
-+00237     int getMaxFieldSize();
-+00239     void setMaxFieldSize(int maxFieldSize);
- 00240 
--00246     void setEscapeProcessing(bool on);
-+00246     void setEscapeProcessing(bool on);
- 00247 
--00252     bool getEscapeProcessing();
-+00252     bool getEscapeProcessing();
- 00253 
--00257     void close();
-+00257     void close();
- 00258 
- 00259   };
- 00260   
- 00261 
- 00262 
--00263 }; // namespace odbc
-+00263 }; // namespace odbc
- 00264 
- 00265 
--00266 #endif // __ODBCXX_STATEMENT_H
--
    -+00266 #endif // __ODBCXX_STATEMENT_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/structodbc_1_1_types.html libodbc++-0.2.3-20050404/doc/progref/structodbc_1_1_types.html ---- libodbc++-0.2.3/doc/progref/structodbc_1_1_types.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/structodbc_1_1_types.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,56 +1,56 @@ -- -+ - --odbc::Types struct Reference -+libodbc++: odbc::Types Struct Reference - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Types Struct Reference

    SQL type constants. -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Types Struct Reference

    SQL type constants. - More... -

    - #include <types.h> -

    - List of all members.

    Public Types

    - -+
    Type constants. More...
    -

    Detailed Description

    --SQL type constants. -+SQL type constants. -

    -

    Member Enumeration Documentation

    --

    -- -+

    -+

    - -- - -@@ -63,56 +63,55 @@ - - -
    -+ - - -- -+ -
    enum odbc::Types::SQLType -+ enum odbc::Types::SQLType
    -
    - -

    --Type constants. -+Type constants. -

    --

    --Enumeration values:
    -+
    Enumeration values:
    - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    BIGINT  --An SQL BIGINT.
    BINARY  --An SQL BINARY (fixed length).
    BIT  --An SQL BIT.
    CHAR  --An SQL CHAR (fixed length).
    DATE  --An SQL DATE.
    DECIMAL  --An SQL DECIMAL (precision,scale).
    DOUBLE  --An SQL DOUBLE.
    FLOAT  --An SQL FLOAT.
    INTEGER  --An SQL INTEGER.
    LONGVARBINARY  --An SQL LONGVARBINARY (variable length, huge).
    LONGVARCHAR  --An SQL LONGVARCHAR (variable length, huge).
    NUMERIC  --An SQL NUMERIC (precision,scale).
    REAL  --An SQL REAL.
    SMALLINT  --An SQL SMALLINT.
    TIME  --An SQL TIME.
    TIMESTAMP  --An SQL TIMESTAMP.
    TINYINT  --An SQL TINYINT.
    VARBINARY  --An SQL VARBINARY (variable length less than 256).
    VARCHAR  --An SQL VARCHAR (variable length less than 256).
    BIGINT  -+An SQL BIGINT.
    BINARY  -+An SQL BINARY (fixed length).
    BIT  -+An SQL BIT.
    CHAR  -+An SQL CHAR (fixed length).
    DATE  -+An SQL DATE.
    DECIMAL  -+An SQL DECIMAL (precision,scale).
    DOUBLE  -+An SQL DOUBLE.
    FLOAT  -+An SQL FLOAT.
    INTEGER  -+An SQL INTEGER.
    LONGVARBINARY  -+An SQL LONGVARBINARY (variable length, huge).
    LONGVARCHAR  -+An SQL LONGVARCHAR (variable length, huge).
    NUMERIC  -+An SQL NUMERIC (precision,scale).
    REAL  -+An SQL REAL.
    SMALLINT  -+An SQL SMALLINT.
    TIME  -+An SQL TIME.
    TIMESTAMP  -+An SQL TIMESTAMP.
    TINYINT  -+An SQL TINYINT.
    VARBINARY  -+An SQL VARBINARY (variable length less than 256).
    VARCHAR  -+An SQL VARCHAR (variable length less than 256).
    -
    -
    -

    The documentation for this struct was generated from the following file:
      --
    • /trees/alex/src/libodbc++/include/odbc++/types.h
    -+
  • odbc++/types.h -
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/structodbc_1_1_types-members.html libodbc++-0.2.3-20050404/doc/progref/structodbc_1_1_types-members.html ---- libodbc++-0.2.3/doc/progref/structodbc_1_1_types-members.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/structodbc_1_1_types-members.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,32 +1,31 @@ -- -+ - --Member List -+libodbc++: Member List - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    odbc::Types Member List

    This is the complete list of members for odbc::Types, including all inherited members. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    -+

    odbc::Types Member List

    This is the complete list of members for odbc::Types, including all inherited members.

    BIGINT enum valueodbc::Types
    BINARY enum valueodbc::Types
    BIT enum valueodbc::Types
    CHAR enum valueodbc::Types
    DATE enum valueodbc::Types
    DECIMAL enum valueodbc::Types
    DOUBLE enum valueodbc::Types
    FLOAT enum valueodbc::Types
    INTEGER enum valueodbc::Types
    LONGVARBINARY enum valueodbc::Types
    LONGVARCHAR enum valueodbc::Types
    NUMERIC enum valueodbc::Types
    REAL enum valueodbc::Types
    SMALLINT enum valueodbc::Types
    SQLType enum nameodbc::Types
    TIME enum valueodbc::Types
    TIMESTAMP enum valueodbc::Types
    TINYINT enum valueodbc::Types
    VARBINARY enum valueodbc::Types
    VARCHAR enum valueodbc::Types
    -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -
    BIGINT enum valueodbc::Types
    BINARY enum valueodbc::Types
    BIT enum valueodbc::Types
    CHAR enum valueodbc::Types
    DATE enum valueodbc::Types
    DECIMAL enum valueodbc::Types
    DOUBLE enum valueodbc::Types
    FLOAT enum valueodbc::Types
    INTEGER enum valueodbc::Types
    LONGVARBINARY enum valueodbc::Types
    LONGVARCHAR enum valueodbc::Types
    NUMERIC enum valueodbc::Types
    REAL enum valueodbc::Types
    SMALLINT enum valueodbc::Types
    SQLType enum nameodbc::Types
    TIME enum valueodbc::Types
    TIMESTAMP enum valueodbc::Types
    TINYINT enum valueodbc::Types
    VARBINARY enum valueodbc::Types
    VARCHAR enum valueodbc::Types
    -
    - Go back to the freeodbc++ homepage -diff -Naur libodbc++-0.2.3/doc/progref/threads_8h-source.html libodbc++-0.2.3-20050404/doc/progref/threads_8h-source.html ---- libodbc++-0.2.3/doc/progref/threads_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/threads_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,68 +1,67 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/threads.h Source File -+libodbc++: odbc++/threads.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/threads.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/threads.h
    00001 /* 
-+00002    This file is part of libodbc++.
-+00003    
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005    
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010    
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015    
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_THREADS_H
--00023 #define __ODBCXX_THREADS_H
--00024 
--00025 #include <odbc++/setup.h>
-+00022 #ifndef __ODBCXX_THREADS_H
-+00023 #define __ODBCXX_THREADS_H
-+00024 
-+00025 #include <odbc++/setup.h>
- 00026 
--00027 #if defined(ODBCXX_ENABLE_THREADS)
--00028 
--00029 #if !defined(WIN32)
--00030 # include <pthread.h>
--00031 #endif
--00032 
--00033 namespace odbc {
-+00027 #if defined(ODBCXX_ENABLE_THREADS)
-+00028 
-+00029 #if !defined(WIN32)
-+00030 # include <pthread.h>
-+00031 #endif
-+00032 
-+00033 namespace odbc {
- 00034   
--00035   class ODBCXX_EXPORT Mutex {
--00036   private:
--00037 #if !defined(WIN32)
--00038     pthread_mutex_t mutex_;
--00039 #else
--00040     CRITICAL_SECTION mutex_;
--00041 #endif
--00042 
--00043     Mutex(const Mutex&);
--00044     Mutex& operator=(const Mutex&);
-+00035   class ODBCXX_EXPORT Mutex {
-+00036   private:
-+00037 #if !defined(WIN32)
-+00038     pthread_mutex_t mutex_;
-+00039 #else
-+00040     CRITICAL_SECTION mutex_;
-+00041 #endif
-+00042 
-+00043     Mutex(const Mutex&);
-+00044     Mutex& operator=(const Mutex&);
- 00045 
--00046   public:
--00047     explicit Mutex();
-+00046   public:
-+00047     explicit Mutex();
- 00048     ~Mutex();
- 00049 
--00050     void lock();
--00051     void unlock();
-+00050     void lock();
-+00051     void unlock();
- 00052   };
- 00053 
--00054   class ODBCXX_EXPORT Locker {
--00055   private:
-+00054   class ODBCXX_EXPORT Locker {
-+00055   private:
- 00056     Mutex& m_;
--00057   public:
-+00057   public:
- 00058     Locker(Mutex& m)
- 00059       :m_(m) {
- 00060       m_.lock();
-@@ -73,19 +72,19 @@
- 00065     }
- 00066   };
- 00067 
--00068 }; //namespace odbc
-+00068 }; //namespace odbc
- 00069 
--00070 // macro used all over the place
--00071 #define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut)
--00072 
--00073 #else // !ODBCXX_ENABLE_THREADS
--00074 
--00075 #define ODBCXX_LOCKER(mut) ((void)0)
--00076 
--00077 #endif
--00078 
--00079 #endif // __ODBCXX_THREADS_H
--
    -+00070 // macro used all over the place -+00071 #define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut) -+00072 -+00073 #else // !ODBCXX_ENABLE_THREADS -+00074 -+00075 #define ODBCXX_LOCKER(mut) ((void)0) -+00076 -+00077 #endif -+00078 -+00079 #endif // __ODBCXX_THREADS_H -+
    - -diff -Naur libodbc++-0.2.3/doc/progref/types_8h-source.html libodbc++-0.2.3-20050404/doc/progref/types_8h-source.html ---- libodbc++-0.2.3/doc/progref/types_8h-source.html 2003-06-17 12:25:42.000000000 +0200 -+++ libodbc++-0.2.3-20050404/doc/progref/types_8h-source.html 2005-04-04 18:21:28.000000000 +0200 -@@ -1,672 +1,681 @@ -- -+ - --/trees/alex/src/libodbc++/include/odbc++/types.h Source File -+libodbc++: odbc++/types.h Source File - - -- --
    --Main Page   Namespace List   Class Hierarchy   Compound List   File List   Namespace Members   Compound Members  
    --

    /trees/alex/src/libodbc++/include/odbc++/types.h

    00001 /* 
--00002    This file is part of libodbc++.
--00003    
--00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
--00005    
--00006    This library is free software; you can redistribute it and/or
--00007    modify it under the terms of the GNU Library General Public
--00008    License as published by the Free Software Foundation; either
--00009    version 2 of the License, or (at your option) any later version.
--00010    
--00011    This library is distributed in the hope that it will be useful,
--00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
--00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--00014    Library General Public License for more details.
--00015    
--00016    You should have received a copy of the GNU Library General Public License
--00017    along with this library; see the file COPYING.  If not, write to
--00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--00019    Boston, MA 02111-1307, USA.
--00020 */
-+
-+
    Main Page | Namespace List | Class Hierarchy | Class List | File List | Namespace Members | Class Members
    
-+
    odbc++/types.h
    00001 /*
-+00002    This file is part of libodbc++.
-+00003 
-+00004    Copyright (C) 1999-2000 Manush Dodunekov <manush@stendahls.net>
-+00005 
-+00006    This library is free software; you can redistribute it and/or
-+00007    modify it under the terms of the GNU Library General Public
-+00008    License as published by the Free Software Foundation; either
-+00009    version 2 of the License, or (at your option) any later version.
-+00010 
-+00011    This library is distributed in the hope that it will be useful,
-+00012    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+00013    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+00014    Library General Public License for more details.
-+00015 
-+00016    You should have received a copy of the GNU Library General Public License
-+00017    along with this library; see the file COPYING.  If not, write to
-+00018    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+00019    Boston, MA 02111-1307, USA.
-+00020 */
- 00021 
--00022 #ifndef __ODBCXX_TYPES_H
--00023 #define __ODBCXX_TYPES_H
--00024 
--00025 #include <odbc++/setup.h>
-+00022 #ifndef __ODBCXX_TYPES_H
-+00023 #define __ODBCXX_TYPES_H
-+00024 
-+00025 #include <odbc++/setup.h>
- 00026 
--00027 #include <exception>
-+00027 #include <exception>
- 00028 
--00029 #if !defined(ODBCXX_QT)
--00030 # include <string>
--00031 # else
--00032 # include <qstring.h>
--00033 #endif
--00034 
--00035 #include <ctime>
--00036 #if defined(ODBCXX_NO_STD_TIME_T)
--00037 namespace std {
-+00029 #if !defined(ODBCXX_QT)
-+00030 # include <string>
-+00031 # else
-+00032 # include <qstring.h>
-+00033 #endif
-+00034 
-+00035 #include <ctime>
-+00036 #if defined(ODBCXX_NO_STD_TIME_T)
-+00037 namespace std {
- 00038   using ::time_t;
- 00039 };
--00040 #endif
--00041 
--00042 #if defined(ODBCXX_QT)
--00043 class QIODevice;
--00044 #endif
--00045 
--00046 #if defined(ODBCXX_HAVE_ISQL_H) && defined(ODBCXX_HAVE_ISQLEXT_H)
--00047 # include <isql.h>
--00048 # include <isqlext.h>
--00049 #elif defined(ODBCXX_HAVE_SQL_H) && defined(ODBCXX_HAVE_SQLEXT_H)
--00050 # include <sql.h>
--00051 # include <sqlext.h>
--00052 #else
--00053 # error "Whoops. Can not recognize the ODBC subsystem."
--00054 #endif
--00055 
--00056 #if defined(ODBCXX_HAVE_SQLUCODE_H)
--00057 # include <sqlucode.h>
--00058 #endif
--00059 
--00060 // fixups for current iODBC, which kindly doesn't provide SQL_TRUE and
--00061 // SQL_FALSE macros
-+00040 #endif
-+00041 
-+00042 #if defined(ODBCXX_QT)
-+00043 class QIODevice;
-+00044 #endif
-+00045 
-+00046 #if defined(ODBCXX_HAVE_ISQL_H) && defined(ODBCXX_HAVE_ISQLEXT_H)
-+00047 # include <isql.h>
-+00048 # include <isqlext.h>
-+00049 #elif defined(ODBCXX_HAVE_SQL_H) && defined(ODBCXX_HAVE_SQLEXT_H)
-+00050 # include <sql.h>
-+00051 # include <sqlext.h>
-+00052 #else
-+00053 # error "Whoops. Can not recognize the ODBC subsystem."
-+00054 #endif
-+00055 
-+00056 #if defined(ODBCXX_HAVE_SQLUCODE_H)
-+00057 # include <sqlucode.h>
-+00058 #endif
-+00059 
-+00060 // fixups for current iODBC, which kindly doesn't provide SQL_TRUE and
-+00061 // SQL_FALSE macros
- 00062 
--00063 #if !defined(SQL_TRUE)
--00064 # define SQL_TRUE 1
--00065 #endif
--00066 
--00067 #if !defined(SQL_FALSE)
--00068 # define SQL_FALSE 0
--00069 #endif
--00070 
--00071 // MS ODBC SDK misses this in some releases
--00072 #if ODBCVER >= 0x0300 && !defined(SQL_NOT_DEFERRABLE)
--00073 # define SQL_NOT_DEFERRABLE 7
--00074 #endif
--00075 
-+00063 #if !defined(SQL_TRUE)
-+00064 # define SQL_TRUE 1
-+00065 #endif
-+00066 
-+00067 #if !defined(SQL_FALSE)
-+00068 # define SQL_FALSE 0
-+00069 #endif
-+00070 
-+00071 // MS ODBC SDK misses this in some releases
-+00072 #if ODBCVER >= 0x0300 && !defined(SQL_NOT_DEFERRABLE)
-+00073 # define SQL_NOT_DEFERRABLE 7
-+00074 #endif
-+00075 
- 00076 
--00077 // Setup our ODBC3_C (odbc3 conditional) macro
--00078 #if ODBCVER >= 0x0300
--00079 
--00080 # define ODBC3_C(odbc3_value,old_value) odbc3_value
--00081 
--00082 #else
--00083 
--00084 # define ODBC3_C(odbc3_value,old_value) old_value
--00085 
--00086 #endif
--00087 
-+00077 // Setup our ODBC3_C (odbc3 conditional) macro
-+00078 #if ODBCVER >= 0x0300
-+00079 
-+00080 # define ODBC3_C(odbc3_value,old_value) odbc3_value
-+00081 
-+00082 #else
-+00083 
-+00084 # define ODBC3_C(odbc3_value,old_value) old_value
-+00085 
-+00086 #endif
-+00087 
- 00088 
--00089 // ODBC3_DC (odbc3 dynamic conditional)
--00090 // Every context using this macro should provide
--00091 // a this->_getDriverInfo() method returning
--00092 // a const DriverInfo*
-+00089 // ODBC3_DC (odbc3 dynamic conditional)
-+00090 // Every context using this macro should provide
-+00091 // a this->_getDriverInfo() method returning
-+00092 // a const DriverInfo*
- 00093 
--00094 #if ODBCVER >= 0x0300
--00095 
--00096 # define ODBC3_DC(odbc3_value,old_value) \
--00097 (this->_getDriverInfo()->getMajorVersion()>=3?odbc3_value:old_value)
--00098 
--00099 #else
--00100 
--00101 # define ODBC3_DC(odbc3_value,old_value) old_value
--00102 
--00103 #endif
--00104 
--00105 #if defined(ODBCXX_HAVE_INTTYPES_H)
--00106 # include <inttypes.h>
--00107 #endif
--00108 
--00109 #include <vector>
-+00094 #if ODBCVER >= 0x0300
-+00095 
-+00096 # define ODBC3_DC(odbc3_value,old_value) \
-+00097 (this->_getDriverInfo()->getMajorVersion()>=3?odbc3_value:old_value)
-+00098 
-+00099 #else
-+00100 
-+00101 # define ODBC3_DC(odbc3_value,old_value) old_value
-+00102 
-+00103 #endif
-+00104 
-+00105 #if defined(ODBCXX_HAVE_INTTYPES_H)
-+00106 # include <inttypes.h>
-+00107 #endif
-+00108 
-+00109 #include <vector>
- 00110 
- 00111 
--00112 namespace odbc {
-+00112 namespace odbc {
- 00113 
--00114   // We want Long to be at least 64 bits
-+00114   // We want Long to be at least 64 bits
- 00115 
--00116 #if defined(WIN32)
--00117   
--00118   typedef __int64 Long;
-+00116 #if defined(WIN32)
-+00117 
-+00118   typedef __int64 Long;
- 00119 
--00120 #elif defined(ODBCXX_HAVE_INTTYPES_H)
--00121 
--00122   typedef int64_t Long;
-+00120 #elif defined(ODBCXX_HAVE_INTTYPES_H)
-+00121 
-+00122   typedef int64_t Long;
- 00123 
--00124 #else
--00125 
--00126 # if ODBCXX_SIZEOF_INT == 8
--00127 
--00128   typedef int Long;
-+00124 #else
-+00125 
-+00126 # if ODBCXX_SIZEOF_INT == 8
-+00127 
-+00128   typedef int Long;
- 00129 
--00130 # elif ODBCXX_SIZEOF_LONG == 8
--00131   
--00132   typedef long Long;
-+00130 # elif ODBCXX_SIZEOF_LONG == 8
-+00131 
-+00132   typedef long Long;
- 00133 
--00134 # elif ODBCXX_SIZEOF_LONG_LONG == 8
--00135 
--00136   typedef long long Long;
-+00134 # elif ODBCXX_SIZEOF_LONG_LONG == 8
-+00135 
-+00136   typedef long long Long;
- 00137 
--00138 # else
--00139   
--00140 #  error "Can't find an appropriate at-least-64-bit integer"
--00141 
--00142 # endif
--00143 
--00144 #endif
--00145 
-+00138 # else
-+00139 
-+00140 #  error "Can't find an appropriate at-least-64-bit integer"
-+00141 
-+00142 # endif
-+00143 
-+00144 #endif
-+00145 
- 00146 
--00147   //constants:
--00148   //how much we try to fetch with each SQLGetData call
--00149   const int GETDATA_CHUNK_SIZE=4*1024;
--00150   //how much we write with each SQLPutData call
--00151   const int PUTDATA_CHUNK_SIZE=GETDATA_CHUNK_SIZE;
-+00147   //constants:
-+00148   //how much we try to fetch with each SQLGetData call
-+00149   const int GETDATA_CHUNK_SIZE=4*1024;
-+00150   //how much we write with each SQLPutData call
-+00151   const int PUTDATA_CHUNK_SIZE=GETDATA_CHUNK_SIZE;
- 00152 
--00153   //how much we read/write in string<->stream conversion
--00154   //better names for those?
--00155   const int STRING_TO_STREAM_CHUNK_SIZE=1024;
--00156   const int STREAM_TO_STRING_CHUNK_SIZE=STRING_TO_STREAM_CHUNK_SIZE;
-+00153   //how much we read/write in string<->stream conversion
-+00154   //better names for those?
-+00155   const int STRING_TO_STREAM_CHUNK_SIZE=1024;
-+00156   const int STREAM_TO_STRING_CHUNK_SIZE=STRING_TO_STREAM_CHUNK_SIZE;
- 00157 
- 00158 
- 00159 
- 00160 
- 00161 
--00164   struct Types {
--00167     enum SQLType {
--00169       BIGINT            = SQL_BIGINT, 
--00171       BINARY            = SQL_BINARY,
--00173       BIT               = SQL_BIT,
--00175       CHAR              = SQL_CHAR,
--00177       DATE              = ODBC3_C(SQL_TYPE_DATE,SQL_DATE),
--00179       DECIMAL           = SQL_DECIMAL,
--00181       DOUBLE            = SQL_DOUBLE,
--00183       FLOAT             = SQL_FLOAT,
--00185       INTEGER           = SQL_INTEGER,
--00187       LONGVARBINARY     = SQL_LONGVARBINARY,
--00189       LONGVARCHAR       = SQL_LONGVARCHAR,
--00191       NUMERIC           = SQL_NUMERIC,
--00193       REAL              = SQL_REAL,
--00195       SMALLINT          = SQL_SMALLINT,
--00197       TIME              = ODBC3_C(SQL_TYPE_TIME,SQL_TIME),
--00199       TIMESTAMP         = ODBC3_C(SQL_TYPE_TIMESTAMP,SQL_TIMESTAMP),
--00201       TINYINT           = SQL_TINYINT,
--00203       VARBINARY         = SQL_VARBINARY,
--00205       VARCHAR           = SQL_VARCHAR
--00206 #if defined(ODBCXX_HAVE_SQLUCODE_H)
--00207       ,
-+00164   struct Types {
-+00167     enum SQLType {
-+00169       BIGINT            = SQL_BIGINT,
-+00171       BINARY            = SQL_BINARY,
-+00173       BIT               = SQL_BIT,
-+00175       CHAR              = SQL_CHAR,
-+00177       DATE              = ODBC3_C(SQL_TYPE_DATE,SQL_DATE),
-+00179       DECIMAL           = SQL_DECIMAL,
-+00181       DOUBLE            = SQL_DOUBLE,
-+00183       FLOAT             = SQL_FLOAT,
-+00185       INTEGER           = SQL_INTEGER,
-+00187       LONGVARBINARY     = SQL_LONGVARBINARY,
-+00189       LONGVARCHAR       = SQL_LONGVARCHAR,
-+00191       NUMERIC           = SQL_NUMERIC,
-+00193       REAL              = SQL_REAL,
-+00195       SMALLINT          = SQL_SMALLINT,
-+00197       TIME              = ODBC3_C(SQL_TYPE_TIME,SQL_TIME),
-+00199       TIMESTAMP         = ODBC3_C(SQL_TYPE_TIMESTAMP,SQL_TIMESTAMP),
-+00201       TINYINT           = SQL_TINYINT,
-+00203       VARBINARY         = SQL_VARBINARY,
-+00205       VARCHAR           = SQL_VARCHAR
-+00206 #if defined(ODBCXX_HAVE_SQLUCODE_H)
-+00207       ,
- 00209       WVARCHAR          = SQL_WCHAR,
- 00211       WCHAR          = SQL_WVARCHAR,
- 00213       WLONGVARCHAR   = SQL_WLONGVARCHAR
--00214 #endif
--00215     };
-+00214 #endif
-+00215     };
- 00216   };
- 00217 
- 00218 
--00219 #if !defined(ODBCXX_QT)
--00220 
--00226   class ODBCXX_EXPORT Bytes {
--00227   private:
--00228     struct Rep {
--00229       signed char* buf_;
-+00219 #if !defined(ODBCXX_QT)
-+00220 
-+00226   class ODBCXX_EXPORT Bytes {
-+00227   private:
-+00228     struct Rep {
-+00229       signed char* buf_;
- 00230       size_t len_;
--00231       int refCount_;
--00232       Rep(const signed char* b, size_t l)
-+00231       int refCount_;
-+00232       Rep(const signed char* b, size_t l)
- 00233         :len_(l), refCount_(0) {
--00234         if(len_>0) {
--00235           buf_=new signed char[len_];
--00236           memcpy((void*)buf_,(void*)b,len_);
--00237         } else {
-+00234         if(len_>0) {
-+00235           buf_=new signed char[len_];
-+00236           memcpy((void*)buf_,(void*)b,len_);
-+00237         } else {
- 00238           buf_=NULL;
- 00239         }
- 00240       }
- 00241       ~Rep() {
--00242         delete [] buf_;
-+00242         delete [] buf_;
- 00243       }
- 00244     };
- 00245 
- 00246     Rep* rep_;
--00247   public:
-+00247   public:
- 00249     Bytes()
- 00250       :rep_(new Rep(NULL,0)) {
- 00251       rep_->refCount_++;
- 00252     }
- 00253 
--00255     Bytes(const signed char* data, size_t dataLen)
-+00255     Bytes(const signed char* data, size_t dataLen)
- 00256       :rep_(new Rep(data,dataLen)) {
- 00257       rep_->refCount_++;
- 00258     }
- 00259 
--00261     Bytes(const Bytes& b)
-+00261     Bytes(const Bytes& b)
- 00262       :rep_(b.rep_) {
- 00263       rep_->refCount_++;
- 00264     }
- 00265 
--00267     Bytes& operator=(const Bytes& b) {
--00268       if(--rep_->refCount_==0) {
--00269         delete rep_;
-+00267     Bytes& operator=(const Bytes& b) {
-+00268       if(--rep_->refCount_==0) {
-+00269         delete rep_;
- 00270       }
--00271       rep_=b.rep_;
-+00271       rep_=b.rep_;
- 00272       rep_->refCount_++;
--00273       return *this;
-+00273       return *this;
- 00274     }
--00275     
--00277     ~Bytes() { 
--00278       if(--rep_->refCount_==0) {
--00279         delete rep_;
--00280       }
--00281     }
--00282 
--00284     const signed char* getData() const { 
--00285       return rep_->buf_;
--00286     }
--00287 
--00289     size_t getSize() const {
--00290       return rep_->len_;
--00291     }
--00292   };
--00293 #endif
--00294 
--00296   class ODBCXX_EXPORT Date {
--00297   protected:
--00298     int year_;
--00299     int month_;
--00300     int day_;
--00301 
--00302     virtual void _invalid(const char* what, int value);
--00303 
--00304     int _validateYear(int y) {
--00305       return y;
--00306     }
--00307     
--00308     int _validateMonth(int m) {
--00309       if(m<1 || m>12) {
--00310         this->_invalid("month",m);
--00311       }
--00312       return m;
--00313     }
--00314     
--00315     int _validateDay(int d) {
--00316       if(d<1 || d>31) {
--00317         this->_invalid("day",d);
--00318       }
--00319       return d;
--00320     }
--00321 
--00322   public:
--00325     Date(int year, int month, int day) {
--00326       this->setYear(year);
--00327       this->setMonth(month);
--00328       this->setDay(day);
--00329     }
--00330 
--00335     explicit Date();
--00336 
--00341     Date(std::time_t t) {
--00342       this->setTime(t);
--00343     }
--00344 
--00349     Date(const ODBCXX_STRING& str) {
--00350       this->parse(str);
--00351     }
--00352 
--00354     Date(const Date& d)
--00355       :year_(d.year_),
--00356        month_(d.month_),
--00357        day_(d.day_) {}
--00358 
--00360     Date& operator=(const Date& d) {
--00361       year_=d.year_;
--00362       month_=d.month_;
--00363       day_=d.day_;
--00364       return *this;
--00365     }
--00366 
--00368     virtual ~Date() {}
-+00275 
-+00277     bool operator==(const Bytes& b) {
-+00278                         if (getSize()!=b.getSize())
-+00279                                 return false;
-+00280                         for(size_t i=0;i<getSize();i++) {
-+00281                                 if(*(getData()+i)!=*(b.getData()+i))
-+00282                                         return false;
-+00283                         }
-+00284       return true;
-+00285     }
-+00286 
-+00288     ~Bytes() {
-+00289       if(--rep_->refCount_==0) {
-+00290         delete rep_;
-+00291       }
-+00292     }
-+00293 
-+00295     const signed char* getData() const {
-+00296       return rep_->buf_;
-+00297     }
-+00298 
-+00300     size_t getSize() const {
-+00301       return rep_->len_;
-+00302     }
-+00303   };
-+00304 #endif
-+00305 
-+00307   class ODBCXX_EXPORT Date {
-+00308   protected:
-+00309     int year_;
-+00310     int month_;
-+00311     int day_;
-+00312 
-+00313     virtual void _invalid(const char* what, int value);
-+00314 
-+00315     int _validateYear(int y) {
-+00316       return y;
-+00317     }
-+00318 
-+00319     int _validateMonth(int m) {
-+00320       if(m<1 || m>12) {
-+00321         this->_invalid("month",m);
-+00322       }
-+00323       return m;
-+00324     }
-+00325 
-+00326     int _validateDay(int d) {
-+00327       if(d<1 || d>31) {
-+00328         this->_invalid("day",d);
-+00329       }
-+00330       return d;
-+00331     }
-+00332 
-+00333   public:
-+00336     Date(int year, int month, int day) {
-+00337       this->setYear(year);
-+00338       this->setMonth(month);
-+00339       this->setDay(day);
-+00340     }
-+00341 
-+00346     explicit Date();
-+00347 
-+00352     Date(std::time_t t) {
-+00353       this->setTime(t);
-+00354     }
-+00355 
-+00360     Date(const ODBCXX_STRING& str) {
-+00361       this->parse(str);
-+00362     }
-+00363 
-+00365     Date(const Date& d)
-+00366       :year_(d.year_),
-+00367        month_(d.month_),
-+00368        day_(d.day_) {}
- 00369 
--00371     virtual void setTime(std::time_t t);
--00372 
--00374     std::time_t getTime() const;
--00375 
--00377     void parse(const ODBCXX_STRING& str);
--00378 
--00380     int getYear() const {
--00381       return year_;
--00382     }
-+00371     Date& operator=(const Date& d) {
-+00372       year_=d.year_;
-+00373       month_=d.month_;
-+00374       day_=d.day_;
-+00375       return *this;
-+00376     }
-+00377 
-+00379     virtual ~Date() {}
-+00380 
-+00382     virtual void setTime(std::time_t t);
- 00383 
--00385     int getMonth() const {
--00386       return month_;
--00387     }
--00388 
--00390     int getDay() const {
--00391       return day_;
--00392     }
--00393 
--00395     void setYear(int year) {
--00396       year_=this->_validateYear(year);
--00397     }
--00398 
--00400     void setMonth(int month) {
--00401       month_=this->_validateMonth(month);
--00402     }
--00403 
--00405     void setDay(int day) {
--00406       day_=this->_validateDay(day);
--00407     }
--00408 
--00410     virtual ODBCXX_STRING toString() const;
--00411   };
--00412 
--00414   class ODBCXX_EXPORT Time {
--00415   protected:
--00416     int hour_;
--00417     int minute_;
--00418     int second_;
-+00385     std::time_t getTime() const;
-+00386 
-+00388     void parse(const ODBCXX_STRING& str);
-+00389 
-+00391     int getYear() const {
-+00392       return year_;
-+00393     }
-+00394 
-+00396     int getMonth() const {
-+00397       return month_;
-+00398     }
-+00399 
-+00401     int getDay() const {
-+00402       return day_;
-+00403     }
-+00404 
-+00406     void setYear(int year) {
-+00407       year_=this->_validateYear(year);
-+00408     }
-+00409 
-+00411     void setMonth(int month) {
-+00412       month_=this->_validateMonth(month);
-+00413     }
-+00414 
-+00416     void setDay(int day) {
-+00417       day_=this->_validateDay(day);
-+00418     }
- 00419 
--00420     virtual void _invalid(const char* what, int value);
--00421 
--00422     int _validateHour(int h) {
--00423       if(h<0 || h>23) {
--00424         this->_invalid("hour",h);
--00425       }
--00426       return h;
--00427     }
--00428 
--00429     int _validateMinute(int m) {
--00430       if(m<0 || m>59) {
--00431         this->_invalid("minute",m);
--00432       }
--00433       return m;
--00434     }
--00435 
--00436     int _validateSecond(int s) {
--00437       if(s<0 || s>61) {
--00438         this->_invalid("second",s);
--00439       }
--00440       return s;
--00441     }
--00442 
--00443   public:
--00445     Time(int hour, int minute, int second) {
--00446       this->setHour(hour);
--00447       this->setMinute(minute);
--00448       this->setSecond(second);
--00449     }
--00450 
--00455     explicit Time();
--00456 
--00461     Time(std::time_t t) {
--00462       this->setTime(t);
--00463     }
--00464 
--00469     Time(const ODBCXX_STRING& str) {
--00470       this->parse(str);
--00471     }
--00472 
--00474     Time(const Time& t)
--00475       :hour_(t.hour_),
--00476        minute_(t.minute_),
--00477        second_(t.second_) {}
--00478 
--00480     Time& operator=(const Time& t) {
--00481       hour_=t.hour_;
--00482       minute_=t.minute_;
--00483       second_=t.second_;
--00484       return *this;
--00485     }
--00486 
--00488     virtual ~Time() {}
-+00421     virtual ODBCXX_STRING toString() const;
-+00422   };
-+00423 
-+00425   class ODBCXX_EXPORT Time {
-+00426   protected:
-+00427     int hour_;
-+00428     int minute_;
-+00429     int second_;
-+00430 
-+00431     virtual void _invalid(const char* what, int value);
-+00432 
-+00433     int _validateHour(int h) {
-+00434       if(h<0 || h>23) {
-+00435         this->_invalid("hour",h);
-+00436       }
-+00437       return h;
-+00438     }
-+00439 
-+00440     int _validateMinute(int m) {
-+00441       if(m<0 || m>59) {
-+00442         this->_invalid("minute",m);
-+00443       }
-+00444       return m;
-+00445     }
-+00446 
-+00447     int _validateSecond(int s) {
-+00448       if(s<0 || s>61) {
-+00449         this->_invalid("second",s);
-+00450       }
-+00451       return s;
-+00452     }
-+00453 
-+00454   public:
-+00456     Time(int hour, int minute, int second) {
-+00457       this->setHour(hour);
-+00458       this->setMinute(minute);
-+00459       this->setSecond(second);
-+00460     }
-+00461 
-+00466     explicit Time();
-+00467 
-+00472     Time(std::time_t t) {
-+00473       this->setTime(t);
-+00474     }
-+00475 
-+00480     Time(const ODBCXX_STRING& str) {
-+00481       this->parse(str);
-+00482     }
-+00483 
-+00485     Time(const Time& t)
-+00486       :hour_(t.hour_),
-+00487        minute_(t.minute_),
-+00488        second_(t.second_) {}
- 00489 
--00491     virtual void setTime(std::time_t t);
--00492 
--00494     std::time_t getTime() const;
--00495 
--00497     void parse(const ODBCXX_STRING& str);
--00498 
--00500     int getHour() const {
--00501       return hour_;
--00502     }
-+00491     Time& operator=(const Time& t) {
-+00492       hour_=t.hour_;
-+00493       minute_=t.minute_;
-+00494       second_=t.second_;
-+00495       return *this;
-+00496     }
-+00497 
-+00499     virtual ~Time() {}
-+00500 
-+00502     virtual void setTime(std::time_t t);
- 00503 
--00505     int getMinute() const {
--00506       return minute_;
--00507     }
--00508 
--00510     int getSecond() const {
--00511       return second_;
--00512     }
--00513 
--00515     void setHour(int h) {
--00516       hour_=this->_validateHour(h);
--00517     }
--00518 
--00520     void setMinute(int m) {
--00521       minute_=this->_validateMinute(m);
--00522     }
--00523 
--00525     void setSecond(int s) {
--00526       second_=this->_validateSecond(s);
--00527     }
--00528 
--00529     virtual ODBCXX_STRING toString() const;
--00530   };
--00531 
--00532 
--00535   class ODBCXX_EXPORT Timestamp : public Date, public Time {
--00536   private:
--00537     int nanos_;
--00538     
--00539     virtual void _invalid(const char* what, int value);
--00540 
--00541     int _validateNanos(int n) {
--00542       if(n<0) {
--00543         this->_invalid("nanoseconds",n);
--00544       }
--00545       return n;
--00546     }
--00547 
--00548   public:
--00550     Timestamp(int year, int month, int day,
--00551               int hour, int minute, int second,
--00552               int nanos =0)
--00553       :Date(year,month,day), Time(hour,minute,second) {
--00554       this->setNanos(nanos);
--00555     }
--00556 
--00561     explicit Timestamp();
--00562 
--00567     Timestamp(std::time_t t) {
--00568       this->setTime(t);
--00569     }
--00570 
--00575     Timestamp(const ODBCXX_STRING& s) {
--00576       this->parse(s);
--00577     }
--00578 
--00579 
--00581     Timestamp(const Timestamp& t)
--00582       :Date(t),Time(t),nanos_(t.nanos_) {}
--00583 
--00585     Timestamp& operator=(const Timestamp& t) {
--00586       Date::operator=(t);
--00587       Time::operator=(t);
--00588       nanos_=t.nanos_;
--00589       return *this;
--00590     }
--00591 
--00593     virtual ~Timestamp() {}
-+00505     std::time_t getTime() const;
-+00506 
-+00508     void parse(const ODBCXX_STRING& str);
-+00509 
-+00511     int getHour() const {
-+00512       return hour_;
-+00513     }
-+00514 
-+00516     int getMinute() const {
-+00517       return minute_;
-+00518     }
-+00519 
-+00521     int getSecond() const {
-+00522       return second_;
-+00523     }
-+00524 
-+00526     void setHour(int h) {
-+00527       hour_=this->_validateHour(h);
-+00528     }
-+00529 
-+00531     void setMinute(int m) {
-+00532       minute_=this->_validateMinute(m);
-+00533     }
-+00534 
-+00536     void setSecond(int s) {
-+00537       second_=this->_validateSecond(s);
-+00538     }
-+00539 
-+00540     virtual ODBCXX_STRING toString() const;
-+00541   };
-+00542 
-+00543 
-+00546   class ODBCXX_EXPORT Timestamp : public Date, public Time {
-+00547   private:
-+00548     int nanos_;
-+00549 
-+00550     virtual void _invalid(const char* what, int value);
-+00551 
-+00552     int _validateNanos(int n) {
-+00553       if(n<0) {
-+00554         this->_invalid("nanoseconds",n);
-+00555       }
-+00556       return n;
-+00557     }
-+00558 
-+00559   public:
-+00561     Timestamp(int year, int month, int day,
-+00562               int hour, int minute, int second,
-+00563               int nanos =0)
-+00564       :Date(year,month,day), Time(hour,minute,second) {
-+00565       this->setNanos(nanos);
-+00566     }
-+00567 
-+00572     explicit Timestamp();
-+00573 
-+00578     Timestamp(std::time_t t) {
-+00579       this->setTime(t);
-+00580     }
-+00581 
-+00586     Timestamp(const ODBCXX_STRING& s) {
-+00587       this->parse(s);
-+00588     }
-+00589 
-+00590 
-+00592     Timestamp(const Timestamp& t)
-+00593       :Date(t),Time(t),nanos_(t.nanos_) {}
- 00594 
--00596     virtual void setTime(std::time_t t);
--00597     
--00599     virtual std::time_t getTime() {
--00600       return Date::getTime()+Time::getTime();
-+00596     Timestamp& operator=(const Timestamp& t) {
-+00597       Date::operator=(t);
-+00598       Time::operator=(t);
-+00599       nanos_=t.nanos_;
-+00600       return *this;
- 00601     }
- 00602 
--00605     void parse(const ODBCXX_STRING& s);
--00606 
--00608     int getNanos() const {
--00609       return nanos_;
--00610     }
--00611 
--00613     void setNanos(int nanos) {
--00614       nanos_=this->_validateNanos(nanos);
--00615     }
--00616 
--00617     virtual ODBCXX_STRING toString() const;
--00618   };
--00619 
--00620 
--00621   //this is used for several 'lists of stuff' below
--00622   //expects T to be a pointer-to-something, and
--00623   //the contents will get deleted when the vector 
--00624   //itself is deleted
--00625   template <class T> class CleanVector : public std::vector<T> {
--00626   private:
--00627     CleanVector(const CleanVector<T>&); //forbid
--00628     CleanVector<T>& operator=(const CleanVector<T>&); //forbid
--00629 
--00630   public:
--00631     explicit CleanVector() {}
--00632     virtual ~CleanVector() {
--00633       typename std::vector<T>::iterator i=this->begin();
--00634       typename std::vector<T>::iterator end=this->end();
--00635       while(i!=end) {
--00636         delete *i;
--00637         ++i;
--00638       }
--00639       this->clear();
--00640     }
--00641   };
--00642 
--00643 
--00646   class ODBCXX_EXPORT DriverMessage {
--00647     friend class ErrorHandler;
--00648 
--00649   private:
--00650     char state_[SQL_SQLSTATE_SIZE+1];
--00651     char description_[SQL_MAX_MESSAGE_LENGTH];
--00652     SQLINTEGER nativeCode_;
-+00604     virtual ~Timestamp() {}
-+00605 
-+00607     virtual void setTime(std::time_t t);
-+00608 
-+00610     virtual std::time_t getTime() {
-+00611       return Date::getTime()+Time::getTime();
-+00612     }
-+00613 
-+00616     void parse(const ODBCXX_STRING& s);
-+00617 
-+00619     int getNanos() const {
-+00620       return nanos_;
-+00621     }
-+00622 
-+00624     void setNanos(int nanos) {
-+00625       nanos_=this->_validateNanos(nanos);
-+00626     }
-+00627 
-+00628     virtual ODBCXX_STRING toString() const;
-+00629   };
-+00630 
-+00631 
-+00632   //this is used for several 'lists of stuff' below
-+00633   //expects T to be a pointer-to-something, and
-+00634   //the contents will get deleted when the vector
-+00635   //itself is deleted
-+00636   template <class T> class CleanVector : public std::vector<T> {
-+00637   private:
-+00638     CleanVector(const CleanVector<T>&); //forbid
-+00639     CleanVector<T>& operator=(const CleanVector<T>&); //forbid
-+00640 
-+00641   public:
-+00642     explicit CleanVector() {}
-+00643     virtual ~CleanVector() {
-+00644       typename std::vector<T>::iterator i=this->begin();
-+00645       typename std::vector<T>::iterator end=this->end();
-+00646       while(i!=end) {
-+00647         delete *i;
-+00648         ++i;
-+00649       }
-+00650       this->clear();
-+00651     }
-+00652   };
- 00653 
--00654     DriverMessage() {}
--00655 #if ODBCVER < 0x0300
--00656     static DriverMessage* fetchMessage(SQLHENV henv,
--00657                                        SQLHDBC hdbc,
--00658                                        SQLHSTMT hstmt);
--00659 #else
--00660     static DriverMessage* fetchMessage(SQLINTEGER handleType,
--00661                                        SQLHANDLE h,
--00662                                        int idx);
--00663 #endif
--00664 
--00665   public:
--00666     virtual ~DriverMessage() {}
--00667 
--00668     const char* getSQLState() const {
--00669       return state_;
--00670     }
--00671 
--00672     const char* getDescription() const {
--00673       return description_;
--00674     }
--00675 
--00676     int getNativeCode() const {
--00677       return nativeCode_;
--00678     }
--00679   };
--00680 
--00681   
--00684   class SQLException : public std::exception {
--00685   private:
--00686     ODBCXX_STRING reason_;
--00687     ODBCXX_STRING sqlState_;
--00688     int errorCode_;
--00689 #if defined(ODBCXX_QT)
--00690     QCString reason8_;
--00691 #endif
--00692     
--00693   public:
--00695     SQLException(const ODBCXX_STRING& reason ="", 
--00696                  const ODBCXX_STRING& sqlState ="",
--00697                  int vendorCode =0)
--00698       :reason_(reason), 
--00699        sqlState_(sqlState),
--00700        errorCode_(vendorCode) 
--00701 #if defined(ODBCXX_QT)
--00702       ,reason8_(reason.local8Bit())
--00703 #endif
--00704 {}
--00705 
--00707     SQLException(const DriverMessage& dm)
--00708       :reason_(dm.getDescription()),
--00709        sqlState_(dm.getSQLState()),
--00710        errorCode_(dm.getNativeCode()) {}
--00711 
--00713     virtual ~SQLException() throw() {}
--00714 
--00716     int getErrorCode() const {
--00717       return errorCode_;
--00718     }
--00719     
--00724     const ODBCXX_STRING& getSQLState() const {
--00725       return sqlState_;
--00726     }
--00727     
--00729     const ODBCXX_STRING& getMessage() const {
--00730       return reason_;
--00731     }
--00732 
--00733 
--00735     virtual const char* what() const throw() {
--00736       // the conversion from QString involves a temporary, which
--00737       // doesn't survive this scope. So here, we do a conditional
--00738 #if defined(ODBCXX_QT)
--00739       return reason8_.data();
--00740 #else
--00741       return reason_.c_str();
--00742 #endif
--00743     }
--00744   };
--00745 
--00746 
--00751   class SQLWarning : public SQLException {
--00752 
--00753     SQLWarning(const SQLWarning&); //forbid
--00754     SQLWarning& operator=(const SQLWarning&); //forbid
--00755 
--00756   public:
--00758     SQLWarning(const ODBCXX_STRING& reason ="",
--00759                const ODBCXX_STRING& sqlState ="",
--00760                int vendorCode =0)
--00761       :SQLException(reason,sqlState,vendorCode) {}
--00762     
--00764     SQLWarning(const DriverMessage& dm)
--00765       :SQLException(dm) {}
--00766     
--00768     virtual ~SQLWarning() throw() {}
--00769   };
--00770 
--00771   typedef CleanVector<SQLWarning*> WarningList;
--00772   
-+00654 
-+00657   class ODBCXX_EXPORT DriverMessage {
-+00658     friend class ErrorHandler;
-+00659 
-+00660   private:
-+00661     char state_[SQL_SQLSTATE_SIZE+1];
-+00662     char description_[SQL_MAX_MESSAGE_LENGTH];
-+00663     SQLINTEGER nativeCode_;
-+00664 
-+00665     DriverMessage() {}
-+00666 #if ODBCVER < 0x0300
-+00667     static DriverMessage* fetchMessage(SQLHENV henv,
-+00668                                        SQLHDBC hdbc,
-+00669                                        SQLHSTMT hstmt);
-+00670 #else
-+00671     static DriverMessage* fetchMessage(SQLINTEGER handleType,
-+00672                                        SQLHANDLE h,
-+00673                                        int idx);
-+00674 #endif
-+00675 
-+00676   public:
-+00677     virtual ~DriverMessage() {}
-+00678 
-+00679     const char* getSQLState() const {
-+00680       return state_;
-+00681     }
-+00682 
-+00683     const char* getDescription() const {
-+00684       return description_;
-+00685     }
-+00686 
-+00687     int getNativeCode() const {
-+00688       return nativeCode_;
-+00689     }
-+00690   };
-+00691 
-+00692 
-+00695   class SQLException : public std::exception {
-+00696   private:
-+00697     ODBCXX_STRING reason_;
-+00698     ODBCXX_STRING sqlState_;
-+00699     int errorCode_;
-+00700 #if defined(ODBCXX_QT)
-+00701     QCString reason8_;
-+00702 #endif
-+00703 
-+00704   public:
-+00706     SQLException(const ODBCXX_STRING& reason ="",
-+00707                  const ODBCXX_STRING& sqlState ="",
-+00708                  int vendorCode =0)
-+00709       :reason_(reason),
-+00710        sqlState_(sqlState),
-+00711        errorCode_(vendorCode)
-+00712 #if defined(ODBCXX_QT)
-+00713       ,reason8_(reason.local8Bit())
-+00714 #endif
-+00715 {}
-+00716 
-+00718     SQLException(const DriverMessage& dm)
-+00719       :reason_(dm.getDescription()),
-+00720        sqlState_(dm.getSQLState()),
-+00721        errorCode_(dm.getNativeCode()) {}
-+00722 
-+00724     virtual ~SQLException() throw() {}
-+00725 
-+00727     int getErrorCode() const {
-+00728       return errorCode_;
-+00729     }
-+00730 
-+00735     const ODBCXX_STRING& getSQLState() const {
-+00736       return sqlState_;
-+00737     }
-+00738 
-+00740     const ODBCXX_STRING& getMessage() const {
-+00741       return reason_;
-+00742     }
-+00743 
-+00744 
-+00746     virtual const char* what() const throw() {
-+00747       // the conversion from QString involves a temporary, which
-+00748       // doesn't survive this scope. So here, we do a conditional
-+00749 #if defined(ODBCXX_QT)
-+00750       return reason8_.data();
-+00751 #else
-+00752       return reason_.c_str();
-+00753 #endif
-+00754     }
-+00755   };
-+00756 
-+00757 
-+00762   class SQLWarning : public SQLException {
-+00763 
-+00764     SQLWarning(const SQLWarning&); //forbid
-+00765     SQLWarning& operator=(const SQLWarning&); //forbid
-+00766 
-+00767   public:
-+00769     SQLWarning(const ODBCXX_STRING& reason ="",
-+00770                const ODBCXX_STRING& sqlState ="",
-+00771                int vendorCode =0)
-+00772       :SQLException(reason,sqlState,vendorCode) {}
- 00773 
--00774   template <class T> class Deleter {
--00775   private:
--00776     T* ptr_;
--00777     bool isArray_;
--00778 
--00779     Deleter(const Deleter<T>&);
--00780     Deleter<T>& operator=(const Deleter<T>&);
-+00775     SQLWarning(const DriverMessage& dm)
-+00776       :SQLException(dm) {}
-+00777 
-+00779     virtual ~SQLWarning() throw() {}
-+00780   };
- 00781 
--00782   public:
--00783     explicit Deleter(T* ptr, bool isArray =false) 
--00784       :ptr_(ptr), isArray_(isArray) {}
--00785     ~Deleter() {
--00786       if(!isArray_) {
--00787         delete ptr_;
--00788       } else {
--00789         delete[] ptr_;
--00790       }
--00791     }
--00792   };
--00793 
--00794 }; // namespace odbc
--00795 
--00796 
--00797 #endif // __ODBCXX_TYPES_H
--
    -+00782 typedef CleanVector<SQLWarning*> WarningList; -+00783 -+00784 -+00785 template <class T> class Deleter { -+00786 private: -+00787 T* ptr_; -+00788 bool isArray_; -+00789 -+00790 Deleter(const Deleter<T>&); -+00791 Deleter<T>& operator=(const Deleter<T>&); -+00792 -+00793 public: -+00794 explicit Deleter(T* ptr, bool isArray =false) -+00795 :ptr_(ptr), isArray_(isArray) {} -+00796 ~Deleter() { -+00797 if(!isArray_) { -+00798 delete ptr_; -+00799 } else { -+00800 delete[] ptr_; -+00801 } -+00802 } -+00803 }; -+00804 -+00805 }; // namespace odbc -+00806 -+00807 -+00808 #endif // __ODBCXX_TYPES_H -+
    - -diff -Naur libodbc++-0.2.3/include/Makefile.in libodbc++-0.2.3-20050404/include/Makefile.in ---- libodbc++-0.2.3/include/Makefile.in 2003-06-17 12:20:51.000000000 +0200 -+++ libodbc++-0.2.3-20050404/include/Makefile.in 2005-04-04 18:21:21.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,106 +32,162 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - SUBDIRS = odbc++ - subdir = include -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - --RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ -- uninstall-info-recursive all-recursive install-data-recursive \ -- install-exec-recursive installdirs-recursive install-recursive \ -- uninstall-recursive check-recursive installcheck-recursive --DIST_COMMON = Makefile.am Makefile.in -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - -@@ -206,10 +262,17 @@ - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done - - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -225,9 +288,15 @@ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ else \ -+ include_option=--include; \ -+ fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ -+ test -f $$subdir/TAGS && \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -240,20 +309,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -303,7 +393,7 @@ - installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -311,7 +401,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -321,7 +411,7 @@ - clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-recursive -- -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -@@ -344,30 +434,40 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ - uninstall-am: uninstall-info-am - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive distclean \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive distclean distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -Naur libodbc++-0.2.3/include/odbc++/Makefile.in libodbc++-0.2.3-20050404/include/odbc++/Makefile.in ---- libodbc++-0.2.3/include/odbc++/Makefile.in 2003-06-17 12:20:51.000000000 +0200 -+++ libodbc++-0.2.3-20050404/include/odbc++/Makefile.in 2005-04-04 18:21:22.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,93 +32,147 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - top_builddir = ../.. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ - --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -- - pkgincludedir = @includedir@/odbc++ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - pkginclude_HEADERS = \ -@@ -141,13 +195,14 @@ - - CLEANFILES = config.h - subdir = include/odbc++ -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - HEADERS = $(pkginclude_HEADERS) - --DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in -+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: -@@ -188,6 +243,9 @@ - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -213,20 +271,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = ../.. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -247,7 +326,7 @@ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="${top_distdir}" distdir="$(distdir)" \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - check-am: all-am - check: check-am -@@ -255,7 +334,6 @@ - - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -267,7 +345,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -276,7 +354,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -286,7 +364,7 @@ - clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -@@ -309,26 +387,35 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-info-am uninstall-local \ - uninstall-pkgincludeHEADERS - --.PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool distclean distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-pkgincludeHEADERS install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool ctags distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pkgincludeHEADERS install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool tags uninstall uninstall-am \ -- uninstall-info-am uninstall-local uninstall-pkgincludeHEADERS -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-info-am uninstall-local \ -+ uninstall-pkgincludeHEADERS - - - config.h: $(CONFIG_HEADER) config.h.in -diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-20050404/include/odbc++/types.h ---- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200 -+++ libodbc++-0.2.3-20050404/include/odbc++/types.h 2005-02-27 23:39:41.000000000 +0100 -@@ -1,18 +1,18 @@ --/* -+/* - This file is part of libodbc++. -- -+ - Copyright (C) 1999-2000 Manush Dodunekov -- -+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. -- -+ - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. -- -+ - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -@@ -114,7 +114,7 @@ - // We want Long to be at least 64 bits - - #if defined(WIN32) -- -+ - typedef __int64 Long; - - #elif defined(ODBCXX_HAVE_INTTYPES_H) -@@ -128,7 +128,7 @@ - typedef int Long; - - # elif ODBCXX_SIZEOF_LONG == 8 -- -+ - typedef long Long; - - # elif ODBCXX_SIZEOF_LONG_LONG == 8 -@@ -136,7 +136,7 @@ - typedef long long Long; - - # else -- -+ - # error "Can't find an appropriate at-least-64-bit integer" - - # endif -@@ -166,7 +166,7 @@ - */ - enum SQLType { - /** An SQL BIGINT */ -- BIGINT = SQL_BIGINT, -+ BIGINT = SQL_BIGINT, - /** An SQL BINARY (fixed length) */ - BINARY = SQL_BINARY, - /** An SQL BIT */ -@@ -217,8 +217,8 @@ - - - #if !defined(ODBCXX_QT) -- /** A chunk of bytes. -- * -+ /** A chunk of bytes. -+ * - * Used for setting and getting binary values. - * @warning This class uses reference counting. An instance that is - * referred to from different threads is likely to cause trouble. -@@ -272,16 +272,27 @@ - rep_->refCount_++; - return *this; - } -- -+ -+ /** Comparison */ -+ bool operator==(const Bytes& b) { -+ if (getSize()!=b.getSize()) -+ return false; -+ for(size_t i=0;irefCount_==0) { - delete rep_; - } - } - - /** Returns a pointer to the data */ -- const signed char* getData() const { -+ const signed char* getData() const { - return rep_->buf_; - } - -@@ -304,14 +315,14 @@ - int _validateYear(int y) { - return y; - } -- -+ - int _validateMonth(int m) { - if(m<1 || m>12) { - this->_invalid("month",m); - } - return m; - } -- -+ - int _validateDay(int d) { - if(d<1 || d>31) { - this->_invalid("day",d); -@@ -320,7 +331,7 @@ - } - - public: -- /** Constructor. -+ /** Constructor. - */ - Date(int year, int month, int day) { - this->setYear(year); -@@ -328,14 +339,14 @@ - this->setDay(day); - } - -- /** Constructor. -- * -+ /** Constructor. -+ * - * Sets this date to today. - */ - explicit Date(); - - /** Constructor. -- * -+ * - * Sets this date to the specified time_t value. - */ - Date(std::time_t t) { -@@ -343,7 +354,7 @@ - } - - /** Constructor. -- * -+ * - * Sets this date to the specified string in the YYYY-MM-DD format. - */ - Date(const ODBCXX_STRING& str) { -@@ -449,13 +460,13 @@ - } - - /** Constructor. -- * -+ * - * Sets the time to now. - */ - explicit Time(); - - /** Constructor. -- * -+ * - * Sets the time to the specified time_t value. - */ - Time(std::time_t t) { -@@ -463,7 +474,7 @@ - } - - /** Constructor. -- * -+ * - * Sets the time to the specified string in the HH:MM:SS format. - */ - Time(const ODBCXX_STRING& str) { -@@ -530,12 +541,12 @@ - }; - - -- /** An SQL TIMESTAMP -+ /** An SQL TIMESTAMP - */ - class ODBCXX_EXPORT Timestamp : public Date, public Time { - private: - int nanos_; -- -+ - virtual void _invalid(const char* what, int value); - - int _validateNanos(int n) { -@@ -594,7 +605,7 @@ - - /** Sets this timestamp to the specified time_t value */ - virtual void setTime(std::time_t t); -- -+ - /** Gets the time_t value of this timestamp */ - virtual std::time_t getTime() { - return Date::getTime()+Time::getTime(); -@@ -620,7 +631,7 @@ - - //this is used for several 'lists of stuff' below - //expects T to be a pointer-to-something, and -- //the contents will get deleted when the vector -+ //the contents will get deleted when the vector - //itself is deleted - template class CleanVector : public std::vector { - private: -@@ -641,7 +652,7 @@ - }; - - -- /** Used internally - represents the result of an SQLError call -+ /** Used internally - represents the result of an SQLError call - */ - class ODBCXX_EXPORT DriverMessage { - friend class ErrorHandler; -@@ -678,7 +689,7 @@ - } - }; - -- -+ - /** The exception thrown when errors occur inside the library. - */ - class SQLException : public std::exception { -@@ -689,15 +700,15 @@ - #if defined(ODBCXX_QT) - QCString reason8_; - #endif -- -+ - public: - /** Constructor */ -- SQLException(const ODBCXX_STRING& reason ="", -+ SQLException(const ODBCXX_STRING& reason ="", - const ODBCXX_STRING& sqlState ="", - int vendorCode =0) -- :reason_(reason), -+ :reason_(reason), - sqlState_(sqlState), -- errorCode_(vendorCode) -+ errorCode_(vendorCode) - #if defined(ODBCXX_QT) - ,reason8_(reason.local8Bit()) - #endif -@@ -716,15 +727,15 @@ - int getErrorCode() const { - return errorCode_; - } -- -- /** Gets the SQLSTATE of this exception. -- * -+ -+ /** Gets the SQLSTATE of this exception. -+ * - * Consult your local ODBC reference for SQLSTATE values. - */ - const ODBCXX_STRING& getSQLState() const { - return sqlState_; - } -- -+ - /** Gets the description of this message */ - const ODBCXX_STRING& getMessage() const { - return reason_; -@@ -745,7 +756,7 @@ - - - /** Represents an SQL warning. -- * -+ * - * Contains the same info as an SQLException. - */ - class SQLWarning : public SQLException { -@@ -759,17 +770,17 @@ - const ODBCXX_STRING& sqlState ="", - int vendorCode =0) - :SQLException(reason,sqlState,vendorCode) {} -- -+ - /** Copy from a DriverMessage */ - SQLWarning(const DriverMessage& dm) - :SQLException(dm) {} -- -+ - /** Destructor */ - virtual ~SQLWarning() throw() {} - }; - - typedef CleanVector WarningList; -- -+ - - template class Deleter { - private: -@@ -780,7 +791,7 @@ - Deleter& operator=(const Deleter&); - - public: -- explicit Deleter(T* ptr, bool isArray =false) -+ explicit Deleter(T* ptr, bool isArray =false) - :ptr_(ptr), isArray_(isArray) {} - ~Deleter() { - if(!isArray_) { -diff -Naur libodbc++-0.2.3/install-sh libodbc++-0.2.3-20050404/install-sh ---- libodbc++-0.2.3/install-sh 2003-03-28 16:57:09.000000000 +0100 -+++ libodbc++-0.2.3-20050404/install-sh 2005-04-04 18:10:27.000000000 +0200 -@@ -1,19 +1,37 @@ - #!/bin/sh - # - # install - install a program, script, or datafile --# This comes from X11R5 (mit/util/scripts/install.sh). - # --# Copyright 1991 by the Massachusetts Institute of Technology -+# This originates from X11R5 (mit/util/scripts/install.sh), which was -+# later released in X11R6 (xc/config/util/install.sh) with the -+# following copyright and license. - # --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation, and that the name of M.I.T. not be used in advertising or --# publicity pertaining to distribution of the software without specific, --# written prior permission. M.I.T. makes no representations about the --# suitability of this software for any purpose. It is provided "as is" --# without express or implied warranty. -+# Copyright (C) 1994 X Consortium -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to -+# deal in the Software without restriction, including without limitation the -+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+# sell copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+# Except as contained in this notice, the name of the X Consortium shall not -+# be used in advertising or otherwise to promote the sale, use or other deal- -+# ings in this Software without prior written authorization from the X Consor- -+# tium. -+# -+# -+# FSF changes to this file are in the public domain. - # - # Calling this script install-sh is preferred over install.sh, to prevent - # `make' implicit rules from creating a file called install from it -@@ -56,7 +74,7 @@ - - while [ x"$1" != x ]; do - case $1 in -- -c) instcmd="$cpprog" -+ -c) instcmd=$cpprog - shift - continue;; - -@@ -79,7 +97,7 @@ - shift - continue;; - -- -s) stripcmd="$stripprog" -+ -s) stripcmd=$stripprog - shift - continue;; - -@@ -106,7 +124,7 @@ - - if [ x"$src" = x ] - then -- echo "install: no input file specified" -+ echo "$0: no input file specified" >&2 - exit 1 - else - : -@@ -115,8 +133,8 @@ - if [ x"$dir_arg" != x ]; then - dst=$src - src="" -- -- if [ -d $dst ]; then -+ -+ if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else -@@ -125,20 +143,20 @@ - else - - # Waiting for this to be detected by the "$instcmd $src $dsttmp" command --# might cause directories to be created, which would be especially bad -+# might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - -- if [ -f $src -o -d $src ] -+ if [ -f "$src" ] || [ -d "$src" ] - then - : - else -- echo "install: $src does not exist" -+ echo "$0: $src does not exist" >&2 - exit 1 - fi -- -+ - if [ x"$dst" = x ] - then -- echo "install: no destination specified" -+ echo "$0: no destination specified" >&2 - exit 1 - else - : -@@ -147,16 +165,16 @@ - # If destination is a directory, append the input filename; if your system - # does not like double slashes in filenames, you may need to add some logic - -- if [ -d $dst ] -+ if [ -d "$dst" ] - then -- dst="$dst"/`basename $src` -+ dst=$dst/`basename "$src"` - else - : - fi - fi - - ## this sed command emulates the dirname command --dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - # this part is taken from Noah Friedman's mkinstalldirs script -@@ -165,69 +183,73 @@ - if [ ! -d "$dstdir" ]; then - defaultIFS=' - ' --IFS="${IFS-${defaultIFS}}" -+IFS="${IFS-$defaultIFS}" - --oIFS="${IFS}" -+oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' --set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` --IFS="${oIFS}" -+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -+IFS=$oIFS - - pathcomp='' - - while [ $# -ne 0 ] ; do -- pathcomp="${pathcomp}${1}" -+ pathcomp=$pathcomp$1 - shift - -- if [ ! -d "${pathcomp}" ] ; -+ if [ ! -d "$pathcomp" ] ; - then -- $mkdirprog "${pathcomp}" -+ $mkdirprog "$pathcomp" - else - : - fi - -- pathcomp="${pathcomp}/" -+ pathcomp=$pathcomp/ - done - fi - - if [ x"$dir_arg" != x ] - then -- $doit $instcmd $dst && -+ $doit $instcmd "$dst" && - -- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && -- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && -- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && -- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi -+ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && -+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && -+ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && -+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi - else - - # If we're going to rename the final executable, determine the name now. - -- if [ x"$transformarg" = x ] -+ if [ x"$transformarg" = x ] - then -- dstfile=`basename $dst` -+ dstfile=`basename "$dst"` - else -- dstfile=`basename $dst $transformbasename | -+ dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - - # don't allow the sed command to completely eliminate the filename - -- if [ x"$dstfile" = x ] -+ if [ x"$dstfile" = x ] - then -- dstfile=`basename $dst` -+ dstfile=`basename "$dst"` - else - : - fi - --# Make a temp file name in the proper directory. -+# Make a couple of temp file names in the proper directory. - -- dsttmp=$dstdir/#inst.$$# -+ dsttmp=$dstdir/_inst.$$_ -+ rmtmp=$dstdir/_rm.$$_ - --# Move or copy the file name to the temp name -+# Trap to clean up temp files at exit. -+ -+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 -+ trap '(exit $?); exit' 1 2 13 15 - -- $doit $instcmd $src $dsttmp && -+# Move or copy the file name to the temp name - -- trap "rm -f ${dsttmp}" 0 && -+ $doit $instcmd "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits - -@@ -235,17 +257,38 @@ - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $instcmd $src $dsttmp" command. - -- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && -- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && -- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && -- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && -+ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && -+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && -+ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && -+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && -+ -+# Now remove or move aside any old file at destination location. We try this -+# two ways since rm can't unlink itself on some systems and the destination -+# file might be busy for other reasons. In this case, the final cleanup -+# might fail but the new file should still install successfully. -+ -+{ -+ if [ -f "$dstdir/$dstfile" ] -+ then -+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || -+ $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || -+ { -+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 -+ (exit 1); exit -+ } -+ else -+ : -+ fi -+} && - - # Now rename the file to the real destination. - -- $doit $rmcmd -f $dstdir/$dstfile && -- $doit $mvcmd $dsttmp $dstdir/$dstfile -+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - - fi && - -+# The final little trick to "correctly" pass the exit status to the exit trap. - --exit 0 -+{ -+ (exit 0); exit -+} -diff -Naur libodbc++-0.2.3/isql++/Makefile.in libodbc++-0.2.3-20050404/isql++/Makefile.in ---- libodbc++-0.2.3/isql++/Makefile.in 2003-06-17 12:20:51.000000000 +0200 -+++ libodbc++-0.2.3-20050404/isql++/Makefile.in 2005-04-04 18:21:25.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,97 +32,151 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - - INCLUDES = @INCLUDES@ -I$(top_srcdir)/src -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ -+@THREADS_FALSE@thelibs = ../src/libodbc++.la - - @THREADS_TRUE@thelibs = @THREAD_LIBS@ ../src/libodbc++-mt.la --@THREADS_FALSE@thelibs = ../src/libodbc++.la - - @BUILD_ISQLXX_TRUE@bin_PROGRAMS = isql++ - @BUILD_ISQLXX_FALSE@EXTRA_PROGRAMS = isql++ -@@ -136,6 +190,7 @@ - - EXTRA_DIST = README - subdir = isql++ -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -@@ -151,11 +206,7 @@ - @THREADS_FALSE@isql___DEPENDENCIES = ../src/libodbc++.la - isql___LDFLAGS = - --DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/isql++.Po -@@ -167,8 +218,6 @@ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXFLAGS = @CXXFLAGS@ --CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -177,7 +226,7 @@ - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(isql___SOURCES) --DIST_COMMON = README Makefile.am Makefile.in -+DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am - SOURCES = $(isql___SOURCES) - - all: all-am -@@ -200,7 +249,7 @@ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ - else :; fi; \ - done - -@@ -230,27 +279,38 @@ - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isql++.Po@am__quote@ - --distclean-depend: -- -rm -rf ./$(DEPDIR) -- - .cpp.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< --CXXDEPMODE = @CXXDEPMODE@ -+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -265,6 +325,9 @@ - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -290,20 +353,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -329,7 +413,6 @@ - - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -341,7 +424,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -349,7 +432,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -359,9 +442,10 @@ - clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -382,7 +466,8 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -390,19 +475,27 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-binPROGRAMS uninstall-info-am - --.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ -- clean-generic clean-libtool distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-binPROGRAMS install-data install-data-am \ -- install-exec install-exec-am install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool tags uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-info-am -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ -+ clean-generic clean-libtool ctags distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am info info-am install install-am install-binPROGRAMS \ -+ install-data install-data-am install-exec install-exec-am \ -+ install-info install-info-am install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am uninstall-binPROGRAMS \ -+ uninstall-info-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff -Naur libodbc++-0.2.3/ltconfig libodbc++-0.2.3-20050404/ltconfig ---- libodbc++-0.2.3/ltconfig 2003-03-20 16:53:18.000000000 +0100 -+++ libodbc++-0.2.3-20050404/ltconfig 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3078 +0,0 @@ --#! /bin/sh -- --# ltconfig - Create a system-specific libtool. --# Copyright (C) 1996-1999 Free Software Foundation, Inc. --# Originally by Gordon Matzigkeit , 1996 --# --# This file is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# A lot of this script is taken from autoconf-2.10. -- --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} --echo=echo --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell. -- exec "$SHELL" "$0" --no-reexec ${1+"$@"} --fi -- --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat </dev/null`} -- case X$UNAME in -- *-DOS) PATH_SEPARATOR=';' ;; -- *) PATH_SEPARATOR=':' ;; -- esac --fi -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -- --if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then -- break -- fi -- done --fi -- --if test "X`($echo '\t') 2>/dev/null`" != 'X\t' || -- test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -- for dir in $PATH /usr/ucb; do -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then -- echo="$dir/echo" -- break -- fi -- done -- IFS="$save_ifs" -- -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running ltconfig again with it. -- ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}" -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- echo='printf "%s\n"' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then -- # Cool, printf works -- : -- elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' && -- test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then -- CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL" -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL $0 --fallback-echo" -- elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' && -- test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then -- echo="$CONFIG_SHELL $0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then -- break -- fi -- prev="$cmd" -- done -- -- if test "$prev" != 'sed 50q "$0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"} -- else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -- fi -- fi -- fi -- fi --fi -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' --sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# The name of this program. --progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` -- --# Constants: --PROGRAM=ltconfig --PACKAGE=libtool --VERSION=1.3.4 --TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --rm="rm -f" -- --help="Try \`$progname --help' for more information." -- --# Global variables: --default_ofile=libtool --can_build_shared=yes --enable_shared=yes --# All known linkers require a `.a' archive for static linking (except M$VC, --# which needs '.lib'). --enable_static=yes --enable_fast_install=yes --enable_dlopen=unknown --enable_win32_dll=no --ltmain= --silent= --srcdir= --ac_config_guess= --ac_config_sub= --host= --nonopt= --ofile="$default_ofile" --verify_host=yes --with_gcc=no --with_gnu_ld=no --need_locks=yes --ac_ext=c --objext=o --libext=a --exeext= --cache_file= -- --old_AR="$AR" --old_CC="$CC" --old_CFLAGS="$CFLAGS" --old_CPPFLAGS="$CPPFLAGS" --old_LDFLAGS="$LDFLAGS" --old_LD="$LD" --old_LN_S="$LN_S" --old_LIBS="$LIBS" --old_NM="$NM" --old_RANLIB="$RANLIB" --old_DLLTOOL="$DLLTOOL" --old_OBJDUMP="$OBJDUMP" --old_AS="$AS" -- --# Parse the command line options. --args= --prev= --for option --do -- case "$option" in -- -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -- *) optarg= ;; -- esac -- -- # If the previous option needs an argument, assign it. -- if test -n "$prev"; then -- eval "$prev=\$option" -- prev= -- continue -- fi -- -- case "$option" in -- --help) cat <&2 -- echo "$help" 1>&2 -- exit 1 -- ;; -- -- *) -- if test -z "$ltmain"; then -- ltmain="$option" -- elif test -z "$host"; then --# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1 --# if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then --# echo "$progname: warning \`$option' is not a valid host type" 1>&2 --# fi -- host="$option" -- else -- echo "$progname: too many arguments" 1>&2 -- echo "$help" 1>&2 -- exit 1 -- fi ;; -- esac --done -- --if test -z "$ltmain"; then -- echo "$progname: you must specify a LTMAIN file" 1>&2 -- echo "$help" 1>&2 -- exit 1 --fi -- --if test ! -f "$ltmain"; then -- echo "$progname: \`$ltmain' does not exist" 1>&2 -- echo "$help" 1>&2 -- exit 1 --fi -- --# Quote any args containing shell metacharacters. --ltconfig_args= --for arg --do -- case "$arg" in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -- ltconfig_args="$ltconfig_args '$arg'" ;; -- *) ltconfig_args="$ltconfig_args $arg" ;; -- esac --done -- --# A relevant subset of AC_INIT. -- --# File descriptor usage: --# 0 standard input --# 1 file creation --# 2 errors and warnings --# 3 some systems may open it to /dev/tty --# 4 used on the Kubota Titan --# 5 compiler messages saved in config.log --# 6 checking for... messages and results --if test "$silent" = yes; then -- exec 6>/dev/null --else -- exec 6>&1 --fi --exec 5>>./config.log -- --# NLS nuisances. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). --if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi --if test "X${LANG+set}" = Xset; then LANG=C; export LANG; fi -- --if test -n "$cache_file" && test -r "$cache_file"; then -- echo "loading cache $cache_file within ltconfig" -- . $cache_file --fi -- --if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -- ac_n= ac_c=' --' ac_t=' ' -- else -- ac_n=-n ac_c= ac_t= -- fi --else -- ac_n= ac_c='\c' ac_t= --fi -- --if test -z "$srcdir"; then -- # Assume the source directory is the same one as the path to LTMAIN. -- srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'` -- test "$srcdir" = "$ltmain" && srcdir=. --fi -- --trap "$rm conftest*; exit 1" 1 2 15 --if test "$verify_host" = yes; then -- # Check for config.guess and config.sub. -- ac_aux_dir= -- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/config.guess; then -- ac_aux_dir=$ac_dir -- break -- fi -- done -- if test -z "$ac_aux_dir"; then -- echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2 -- echo "$help" 1>&2 -- exit 1 -- fi -- ac_config_guess=$ac_aux_dir/config.guess -- ac_config_sub=$ac_aux_dir/config.sub -- -- # Make sure we can run config.sub. -- if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then : -- else -- echo "$progname: cannot run $ac_config_sub" 1>&2 -- echo "$help" 1>&2 -- exit 1 -- fi -- -- echo $ac_n "checking host system type""... $ac_c" 1>&6 -- -- host_alias=$host -- case "$host_alias" in -- "") -- if host_alias=`$SHELL $ac_config_guess`; then : -- else -- echo "$progname: cannot guess host type; you must specify one" 1>&2 -- echo "$help" 1>&2 -- exit 1 -- fi ;; -- esac -- host=`$SHELL $ac_config_sub $host_alias` -- echo "$ac_t$host" 1>&6 -- -- # Make sure the host verified. -- test -z "$host" && exit 1 -- --elif test -z "$host"; then -- echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2 -- echo "$help" 1>&2 -- exit 1 --else -- host_alias=$host --fi -- --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case "$host_os" in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` --esac -- --host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- --case "$host_os" in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac -- --# Determine commands to create old-style static archives. --old_archive_cmds='$AR cru $oldlib$oldobjs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -- --# Set a sane default for `AR'. --test -z "$AR" && AR=ar -- --# Set a sane default for `OBJDUMP'. --test -z "$OBJDUMP" && OBJDUMP=objdump -- --# If RANLIB is not set, then run the test. --if test "${RANLIB+set}" != "set"; then -- result=no -- -- echo $ac_n "checking for ranlib... $ac_c" 1>&6 -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -- for dir in $PATH; do -- test -z "$dir" && dir=. -- if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then -- RANLIB="ranlib" -- result="ranlib" -- break -- fi -- done -- IFS="$save_ifs" -- -- echo "$ac_t$result" 1>&6 --fi -- --if test -n "$RANLIB"; then -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" --fi -- --# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$AS" && AS=as -- --# Check to see if we are using GCC. --if test "$with_gcc" != yes || test -z "$CC"; then -- # If CC is not set, then try to find GCC or a usable CC. -- if test -z "$CC"; then -- echo $ac_n "checking for gcc... $ac_c" 1>&6 -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -- for dir in $PATH; do -- test -z "$dir" && dir=. -- if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then -- CC="gcc" -- break -- fi -- done -- IFS="$save_ifs" -- -- if test -n "$CC"; then -- echo "$ac_t$CC" 1>&6 -- else -- echo "$ac_t"no 1>&6 -- fi -- fi -- -- # Not "gcc", so try "cc", rejecting "/usr/ucb/cc". -- if test -z "$CC"; then -- echo $ac_n "checking for cc... $ac_c" 1>&6 -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -- cc_rejected=no -- for dir in $PATH; do -- test -z "$dir" && dir=. -- if test -f $dir/cc || test -f $dir/cc$ac_exeext; then -- if test "$dir/cc" = "/usr/ucb/cc"; then -- cc_rejected=yes -- continue -- fi -- CC="cc" -- break -- fi -- done -- IFS="$save_ifs" -- if test $cc_rejected = yes; then -- # We found a bogon in the path, so make sure we never use it. -- set dummy $CC -- shift -- if test $# -gt 0; then -- # We chose a different compiler from the bogus one. -- # However, it has the same name, so the bogon will be chosen -- # first if we set CC to just the name; use the full file name. -- shift -- set dummy "$dir/cc" "$@" -- shift -- CC="$@" -- fi -- fi -- -- if test -n "$CC"; then -- echo "$ac_t$CC" 1>&6 -- else -- echo "$ac_t"no 1>&6 -- fi -- -- if test -z "$CC"; then -- echo "$progname: error: no acceptable cc found in \$PATH" 1>&2 -- exit 1 -- fi -- fi -- -- # Now see if the compiler is really GCC. -- with_gcc=no -- echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 -- echo "$progname:581: checking whether we are using GNU C" >&5 -- -- $rm conftest.c -- cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -- with_gcc=yes -- fi -- $rm conftest.c -- echo "$ac_t$with_gcc" 1>&6 --fi -- --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="$2" -- --echo $ac_n "checking for object suffix... $ac_c" 1>&6 --$rm conftest* --echo 'int i = 1;' > conftest.c --echo "$progname:603: checking for object suffix" >& 5 --if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then -- # Append any warnings to the config.log. -- cat conftest.err 1>&5 -- -- for ac_file in conftest.*; do -- case $ac_file in -- *.c) ;; -- *) objext=`echo $ac_file | sed -e s/conftest.//` ;; -- esac -- done --else -- cat conftest.err 1>&5 -- echo "$progname: failed program was:" >&5 -- cat conftest.c >&5 --fi --$rm conftest* --echo "$ac_t$objext" 1>&6 -- --echo $ac_n "checking for executable suffix... $ac_c" 1>&6 --if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_cv_exeext="no" -- $rm conftest* -- echo 'main () { return 0; }' > conftest.c -- echo "$progname:629: checking for executable suffix" >& 5 -- if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then -- # Append any warnings to the config.log. -- cat conftest.err 1>&5 -- -- for ac_file in conftest.*; do -- case $ac_file in -- *.c | *.err | *.$objext ) ;; -- *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;; -- esac -- done -- else -- cat conftest.err 1>&5 -- echo "$progname: failed program was:" >&5 -- cat conftest.c >&5 -- fi -- $rm conftest* --fi --if test "X$ac_cv_exeext" = Xno; then -- exeext="" --else -- exeext="$ac_cv_exeext" --fi --echo "$ac_t$ac_cv_exeext" 1>&6 -- --echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 --pic_flag= --special_shlib_compile_flags= --wl= --link_static_flag= --no_builtin_flag= -- --if test "$with_gcc" = yes; then -- wl='-Wl,' -- link_static_flag='-static' -- -- case "$host_os" in -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # we not sure about C++ programs. -- link_static_flag="$link_static_flag ${wl}-lC" -- ;; -- cygwin* | mingw* | os2*) -- # We can build DLLs from non-PIC. -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- pic_flag='-m68020 -resident32 -malways-restore-a4' -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- pic_flag=-Kconform_pic -- fi -- ;; -- *) -- pic_flag='-fPIC' -- ;; -- esac --else -- # PORTME Check for PIC flags for the system compiler. -- case "$host_os" in -- aix3* | aix4*) -- # All AIX code is PIC. -- link_static_flag='-bnso -bI:/lib/syscalls.exp' -- ;; -- -- hpux9* | hpux10* | hpux11*) -- # Is there a better link_static_flag that works with the bundled CC? -- wl='-Wl,' -- link_static_flag="${wl}-a ${wl}archive" -- pic_flag='+Z' -- ;; -- -- irix5* | irix6*) -- wl='-Wl,' -- link_static_flag='-non_shared' -- # PIC (with -KPIC) is the default. -- ;; -- -- cygwin* | mingw* | os2*) -- # We can build DLLs from non-PIC. -- ;; -- -- osf3* | osf4* | osf5*) -- # All OSF/1 code is PIC. -- wl='-Wl,' -- link_static_flag='-non_shared' -- ;; -- -- sco3.2v5*) -- pic_flag='-Kpic' -- link_static_flag='-dn' -- special_shlib_compile_flags='-belf' -- ;; -- -- solaris*) -- pic_flag='-KPIC' -- link_static_flag='-Bstatic' -- wl='-Wl,' -- ;; -- -- sunos4*) -- pic_flag='-PIC' -- link_static_flag='-Bstatic' -- wl='-Qoption ld ' -- ;; -- -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- pic_flag='-KPIC' -- link_static_flag='-Bstatic' -- wl='-Wl,' -- ;; -- -- uts4*) -- pic_flag='-pic' -- link_static_flag='-Bstatic' -- ;; -- sysv4*MP*) -- if test -d /usr/nec ;then -- pic_flag='-Kconform_pic' -- link_static_flag='-Bstatic' -- fi -- ;; -- *) -- can_build_shared=no -- ;; -- esac --fi -- --if test -n "$pic_flag"; then -- echo "$ac_t$pic_flag" 1>&6 -- -- # Check to make sure the pic_flag actually works. -- echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6 -- $rm conftest* -- echo "int some_variable = 0;" > conftest.c -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $pic_flag -DPIC" -- echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5 -- if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then -- # Append any warnings to the config.log. -- cat conftest.err 1>&5 -- -- case "$host_os" in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then they -- # create non-PIC objects. So, if there were any warnings, we assume that -- # PIC is not supported. -- if test -s conftest.err; then -- echo "$ac_t"no 1>&6 -- can_build_shared=no -- pic_flag= -- else -- echo "$ac_t"yes 1>&6 -- pic_flag=" $pic_flag" -- fi -- ;; -- *) -- echo "$ac_t"yes 1>&6 -- pic_flag=" $pic_flag" -- ;; -- esac -- else -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- can_build_shared=no -- pic_flag= -- echo "$ac_t"no 1>&6 -- fi -- CFLAGS="$save_CFLAGS" -- $rm conftest* --else -- echo "$ac_t"none 1>&6 --fi -- --# Check to see if options -o and -c are simultaneously supported by compiler --echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6 --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --$rm conftest* --echo "int some_variable = 0;" > conftest.c --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.o" --echo "$progname:829: checking if $compiler supports -c -o file.o" >&5 --if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then -- -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s out/conftest.err; then -- echo "$ac_t"no 1>&6 -- compiler_c_o=no -- else -- echo "$ac_t"yes 1>&6 -- compiler_c_o=yes -- fi --else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&5 -- compiler_c_o=no -- echo "$ac_t"no 1>&6 --fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null -- --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6 -- $rm conftest* -- echo "int some_variable = 0;" > conftest.c -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5 --if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then -- -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- echo "$ac_t"no 1>&6 -- compiler_o_lo=no -- else -- echo "$ac_t"yes 1>&6 -- compiler_o_lo=yes -- fi -- else -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- compiler_o_lo=no -- echo "$ac_t"no 1>&6 -- fi -- CFLAGS="$save_CFLAGS" -- $rm conftest* --else -- compiler_o_lo=no --fi -- --# Check to see if we can do hard links to lock some files if needed --hard_links="nottested" --if test "$compiler_c_o" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6 -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- echo "$ac_t$hard_links" 1>&6 -- $rm conftest* -- if test "$hard_links" = no; then -- echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2 -- need_locks=warn -- fi --else -- need_locks=no --fi -- --if test "$with_gcc" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6 -- $rm conftest* -- echo "int some_variable = 0;" > conftest.c -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" -- echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -- if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then -- -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- echo "$ac_t"no 1>&6 -- compiler_rtti_exceptions=no -- else -- echo "$ac_t"yes 1>&6 -- compiler_rtti_exceptions=yes -- fi -- else -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- compiler_rtti_exceptions=no -- echo "$ac_t"no 1>&6 -- fi -- CFLAGS="$save_CFLAGS" -- $rm conftest* -- -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -- else -- no_builtin_flag=' -fno-builtin' -- fi -- --fi -- --# Check for any special shared library compilation flags. --if test -n "$special_shlib_compile_flags"; then -- echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2 -- if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$special_shlib_compile_flags[ ]" >/dev/null; then : -- else -- echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2 -- can_build_shared=no -- fi --fi -- --echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6 --$rm conftest* --echo 'main(){return(0);}' > conftest.c --save_LDFLAGS="$LDFLAGS" --LDFLAGS="$LDFLAGS $link_static_flag" --echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5 --if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -- echo "$ac_t$link_static_flag" 1>&6 --else -- echo "$ac_t"none 1>&6 -- link_static_flag= --fi --LDFLAGS="$save_LDFLAGS" --$rm conftest* -- --if test -z "$LN_S"; then -- # Check to see if we can use ln -s, or we need hard links. -- echo $ac_n "checking whether ln -s works... $ac_c" 1>&6 -- $rm conftest.dat -- if ln -s X conftest.dat 2>/dev/null; then -- $rm conftest.dat -- LN_S="ln -s" -- else -- LN_S=ln -- fi -- if test "$LN_S" = "ln -s"; then -- echo "$ac_t"yes 1>&6 -- else -- echo "$ac_t"no 1>&6 -- fi --fi -- --# Make sure LD is an absolute path. --if test -z "$LD"; then -- ac_prog=ld -- if test "$with_gcc" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 -- echo "$progname:991: checking for ld used by GCC" >&5 -- ac_prog=`($CC -print-prog-name=ld) 2>&5` -- case "$ac_prog" in -- # Accept absolute paths. -- [\\/]* | [A-Za-z]:[\\/]*) -- re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we are not using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac -- elif test "$with_gnu_ld" = yes; then -- echo $ac_n "checking for GNU ld... $ac_c" 1>&6 -- echo "$progname:1015: checking for GNU ld" >&5 -- else -- echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -- echo "$progname:1018: checking for non-GNU ld" >&5 -- fi -- -- if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -- test "$with_gnu_ld" != no && break -- else -- test "$with_gnu_ld" != yes && break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- fi -- -- if test -n "$LD"; then -- echo "$ac_t$LD" 1>&6 -- else -- echo "$ac_t"no 1>&6 -- fi -- -- if test -z "$LD"; then -- echo "$progname: error: no acceptable ld found in \$PATH" 1>&2 -- exit 1 -- fi --fi -- --# Check to see if it really is or is not GNU ld. --echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6 --# I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -- with_gnu_ld=yes --else -- with_gnu_ld=no --fi --echo "$ac_t$with_gnu_ld" 1>&6 -- --# See if the linker supports building shared libraries. --echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6 -- --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --archive_cmds= --archive_expsym_cmds= --old_archive_from_new_cmds= --export_dynamic_flag_spec= --whole_archive_flag_spec= --thread_safe_flag_spec= --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --always_export_symbols=no --export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' --# include_expsyms should be a list of space-separated symbols to be *always* --# included in the symbol list --include_expsyms= --# exclude_expsyms can be an egrep regular expression of symbols to exclude --# it will be wrapped by ` (' and `)$', so one must not match beginning or --# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', --# as well as any symbol that contains `d'. --exclude_expsyms="_GLOBAL_OFFSET_TABLE_" --# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out --# platforms (ab)use it in PIC code, but their linkers get confused if --# the symbol is explicitly referenced. Since portable code cannot --# rely on this symbol name, it's probably fine to never include it in --# preloaded symbol tables. -- --case "$host_os" in --cygwin* | mingw*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$with_gcc" != yes; then -- with_gnu_ld=no -- fi -- ;; -- --esac -- --ld_shlibs=yes --if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -- -- # See if GNU ld supports shared libraries. -- case "$host_os" in -- aix3* | aix4*) -- # On AIX, the GNU linker is very broken -- ld_shlibs=no -- cat <&2 -- --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -- --EOF -- ;; -- -- amigaos*) -- archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- -- # Samuel A. Falvo II reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can use -- # them. -- ld_shlibs=no -- ;; -- -- beos*) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- -- cygwin* | mingw*) -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec='-L$libdir' -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ -- test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ -- $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~ -- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' -- -- archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ -- _lt_hint=1; -- for symbol in `cat $export_symbols`; do -- echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done~ -- test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ -- test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ -- $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ -- $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ -- $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' -- -- old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' -- ;; -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -- # can we support soname and/or expsyms with a.out? -oliva -- fi -- ;; -- -- solaris* | sysv5*) -- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -- ld_shlibs=no -- cat <&2 -- --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -- --EOF -- elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' -- wlarc= -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- *) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- esac -- -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- case $host_os in -- cygwin* | mingw*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -- ;; -- *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -- ;; -- esac -- fi --else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case "$host_os" in -- aix3*) -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L=yes -- if test "$with_gcc" = yes && test -z "$link_static_flag"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct=unsupported -- fi -- ;; -- -- aix4*) -- hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib' -- hardcode_libdir_separator=':' -- if test "$with_gcc" = yes; then -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- hardcode_direct=yes -- else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -- fi -- shared_flag='-shared' -- else -- shared_flag='${wl}-bM:SRE' -- hardcode_direct=yes -- fi -- allow_undefined_flag=' ${wl}-berok' -- archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' -- archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' -- case "$host_os" in aix4.[01]|aix4.[01].*) -- # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on -- always_export_symbols=yes ;; -- esac -- ;; -- -- amigaos*) -- archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs=no -- ;; -- -- cygwin* | mingw*) -- # When not using gcc, we currently assume that we are using -- # 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 -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''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' -- fix_srcfile_path='`cygpath -w $srcfile`' -- ;; -- -- freebsd1*) -- ld_shlibs=no -- ;; -- -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -- -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- hpux9* | hpux10* | hpux11*) -- case "$host_os" in -- hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -- -- irix5* | irix6*) -- if test "$with_gcc" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -- else -- archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out -- else -- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF -- fi -- hardcode_libdir_flag_spec='${wl}-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- -- os2*) -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' -- ;; -- -- osf3*) -- if test "$with_gcc" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; -- -- osf4* | osf5*) # As osf3* with the addition of the -msym flag -- if test "$with_gcc" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; -- -- sco3.2v5*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ;; -- -- solaris*) -- no_undefined_flag=' -z text' -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_shlibpath_var=no -- case "$host_os" in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- esac -- ;; -- -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -- -- sysv4) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- hardcode_direct=no #Motorola manual says yes, but my tests say they lie -- ;; -- -- sysv4.3*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- hardcode_shlibpath_var=no -- export_dynamic_flag_spec='-Bexport' -- ;; -- -- sysv5*) -- no_undefined_flag=' -z text' -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' -- hardcode_libdir_flag_spec= -- hardcode_shlibpath_var=no -- runpath_var='LD_RUN_PATH' -- ;; -- -- uts4*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -- -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ld_shlibs=yes -- fi -- ;; -- -- sysv4.2uw2*) -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' -- hardcode_direct=yes -- hardcode_minus_L=no -- hardcode_shlibpath_var=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -- -- unixware7*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -- -- *) -- ld_shlibs=no -- ;; -- esac --fi --echo "$ac_t$ld_shlibs" 1>&6 --test "$ld_shlibs" = no && can_build_shared=no -- --if test -z "$NM"; then -- echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 -- case "$NM" in -- [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path. -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" -- for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- NM="$ac_dir/nm -B" -- break -- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- NM="$ac_dir/nm -p" -- break -- else -- NM=${NM="$ac_dir/nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$NM" && NM=nm -- ;; -- esac -- echo "$ac_t$NM" 1>&6 --fi -- --# Check for command to grab the raw symbol name followed by C symbol from nm. --echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6 -- --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -- --# Character class describing NM global symbol codes. --symcode='[BCDEGRST]' -- --# Regexp to match symbols that can be accessed directly from C. --sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -- --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -- --# Transform an extracted symbol line into a proper C declaration --global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -- --# Define system-specific variables. --case "$host_os" in --aix*) -- symcode='[BCDT]' -- ;; --cygwin* | mingw*) -- symcode='[ABCDGISTW]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'" -- ;; --irix*) -- symcode='[BCDEGRST]' -- ;; --solaris*) -- symcode='[BDT]' -- ;; --sysv4) -- symcode='[DFNSTU]' -- ;; --esac -- --# If we're using GNU nm, then use its standard symbol codes. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- symcode='[ABCDGISTW]' --fi -- --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -- -- # Write the raw and C identifiers. -- global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode\)[ ][ ]*\($ac_symprfx\)$sympat$/$symxfrm/p'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- $rm conftest* -- cat > conftest.c <&5 -- if { (eval echo $progname:1636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if { echo "$progname:1639: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then -- -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -- -- # Make sure that we snagged all the symbols we need. -- if egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.c --#ifdef __cplusplus --extern "C" { --#endif -- --EOF -- # Now generate the symbol file. -- eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c' -- -- cat <> conftest.c --#if defined (__STDC__) && __STDC__ --# define lt_ptr_t void * --#else --# define lt_ptr_t char * --# define const --#endif -- --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr_t address; --} --lt_preloaded_symbols[] = --{ --EOF -- sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c -- cat <<\EOF >> conftest.c -- {0, (lt_ptr_t) 0} --}; -- --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$objext conftstm.$objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$objext" -- CFLAGS="$CFLAGS$no_builtin_flag" -- if { (eval echo $progname:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -- pipe_works=yes -- else -- echo "$progname: failed program was:" >&5 -- cat conftest.c >&5 -- fi -- LIBS="$save_LIBS" -- else -- echo "cannot find nm_test_func in $nlist" >&5 -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&5 -- fi -- else -- echo "cannot run $global_symbol_pipe" >&5 -- fi -- else -- echo "$progname: failed program was:" >&5 -- cat conftest.c >&5 -- fi -- $rm conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- global_symbol_pipe= -- fi --done --if test "$pipe_works" = yes; then -- echo "${ac_t}ok" 1>&6 --else -- echo "${ac_t}failed" 1>&6 --fi -- --if test -z "$global_symbol_pipe"; then -- global_symbol_to_cdecl= --fi -- --# Check hardcoding attributes. --echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6 --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var"; then -- -- # We can hardcode non-existant directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$hardcode_shlibpath_var" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported --fi --echo "$ac_t$hardcode_action" 1>&6 -- -- --reload_flag= --reload_cmds='$LD$reload_flag -o $output$reload_objs' --echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6 --# PORTME Some linkers may need a different reload flag. --reload_flag='-r' --echo "$ac_t$reload_flag" 1>&6 --test -n "$reload_flag" && reload_flag=" $reload_flag" -- --# PORTME Fill in your ld.so characteristics --library_names_spec= --libname_spec='lib$name' --soname_spec= --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --file_magic_cmd= --file_magic_test_file= --deplibs_check_method='unknown' --# Need to set the preceding variable on all platforms that support --# interlibrary dependencies. --# 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. --# 'pass_all' -- all dependencies passed with no checks. --# 'test_compile' -- check by making test program. --# 'file_magic [regex]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given egrep regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. --echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 --case "$host_os" in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix $libname.a' -- shlibpath_var=LIBPATH -- -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -- ;; -- --aix4*) -- version_type=linux -- # AIX has no versioning support, so currently we can not hardcode correct -- # soname into executable. Probably we can add versioning support to -- # collect2, so additional links can be useful in future. -- # We preserve .a as extension for shared libraries though AIX4.2 -- # and later linker supports .so -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' -- shlibpath_var=LIBPATH -- deplibs_check_method=pass_all -- ;; -- --amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -- ;; -- --beos*) -- library_names_spec='${libname}.so' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- deplibs_check_method=pass_all -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -- --bsdi4*) -- version_type=linux -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=/shlib/libc.so -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; -- --cygwin* | mingw*) -- version_type=windows -- need_version=no -- need_lib_prefix=no -- if test "$with_gcc" = yes; then -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a' -- else -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' -- fi -- dynamic_linker='Win32 ld.exe' -- deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- file_magic_cmd='${OBJDUMP} -f' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -- --freebsd1*) -- dynamic_linker=no -- ;; -- --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -- version_type=freebsd-$objformat -- case "$version_type" in -- freebsd-elf*) -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /usr/lib/libc.so*` -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- deplibs_check_method=unknown -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -- ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case "$host_os" in -- freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) -- shlibpath_overrides_runpath=yes -- ;; -- *) # from 3.2 on -- shlibpath_overrides_runpath=no -- ;; -- esac -- ;; -- --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- dynamic_linker="$host_os dld.sl" -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -- ;; -- --irix5* | irix6*) -- version_type=irix -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}.so.$major' -- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -- case "$host_os" in -- irix5*) -- libsuff= shlibsuff= -- # this will be overridden with pass_all, but let us keep it just in case -- deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -- ;; -- *) -- case "$LD" in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /lib${libsuff}/libc.so*` -- deplibs_check_method='pass_all' -- ;; -- --# No shared lib support for Linux oldld, aout, or coff. --linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -- dynamic_linker=no -- ;; -- --# This must be Linux ELF. --linux-gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -- -- if test -f /lib/ld.so.1; then -- dynamic_linker='GNU ld.so' -- else -- # Only the GNU ld.so supports shared libraries on MkLinux. -- case "$host_cpu" in -- powerpc*) dynamic_linker=no ;; -- *) dynamic_linker='Linux ld.so' ;; -- esac -- fi -- ;; -- --netbsd*) -- version_type=sunos -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --openbsd*) -- version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --os2*) -- libname_spec='$name' -- need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -- --osf3* | osf4* | osf5*) -- version_type=osf -- need_version=no -- soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- # this will be overridden with pass_all, but let us keep it just in case -- deplibs_check_method='file_magic COFF format alpha shared library' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=/shlib/libc.so -- deplibs_check_method='pass_all' -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -- --sco3.2v5*) -- version_type=osf -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --solaris*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib" -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=/lib/libc.so -- ;; -- --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -- --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- case "$host_vendor" in -- ncr) -- deplibs_check_method='pass_all' -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /usr/lib/libc.so*` -- ;; -- esac -- ;; -- --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --dgux*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' -- soname_spec='$libname.so.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -- --*) -- dynamic_linker=no -- ;; --esac --echo "$ac_t$dynamic_linker" 1>&6 --test "$dynamic_linker" = no && can_build_shared=no -- --# Report the final consequences. --echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6 -- --# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in --# configure.in, otherwise build static only libraries. --case "$host_os" in --cygwin* | mingw* | os2*) -- if test x$can_build_shared = xyes; then -- test x$enable_win32_dll = xno && can_build_shared=no -- echo "checking if package supports dlls... $can_build_shared" 1>&6 -- fi --;; --esac -- --if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then -- case "$deplibs_check_method" in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -- --EOF -- fi ;; -- esac --fi -- --echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6 --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case "$host_os" in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -- --aix4*) -- test "$enable_shared" = yes && enable_static=no -- ;; --esac -- --echo "$ac_t$enable_shared" 1>&6 -- --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes -- --echo "checking whether to build static libraries... $enable_static" 1>&6 -- --if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi -- --echo $ac_n "checking for objdir... $ac_c" 1>&6 --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs --fi --rmdir .libs 2>/dev/null --echo "$ac_t$objdir" 1>&6 -- --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else --if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then -- lt_cv_dlopen=no lt_cv_dlopen_libs= --echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "$progname:2212: checking for dlopen in -ldl" >&5 --ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-ldl $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else -- echo "$ac_t""no" 1>&6 --echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "$progname:2252: checking for dlopen" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dlopen) || defined (__stub___dlopen) --choke me --#else --dlopen(); --#endif -- --; return 0; } --EOF --if { (eval echo $progname:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_dlopen=yes" --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_dlopen=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- lt_cv_dlopen="dlopen" --else -- echo "$ac_t""no" 1>&6 --echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 --echo "$progname:2299: checking for dld_link in -ldld" >&5 --ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-ldld $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" --else -- echo "$ac_t""no" 1>&6 --echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "$progname:2339: checking for shl_load" >&5 --if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shl_load(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_shl_load) || defined (__stub___shl_load) --choke me --#else --shl_load(); --#endif -- --; return 0; } --EOF --if { (eval echo $progname:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_shl_load=yes" --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_shl_load=no" --fi --rm -f conftest* --fi -- --if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- lt_cv_dlopen="shl_load" --else -- echo "$ac_t""no" 1>&6 --echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "$progname:2387: checking for shl_load in -ldld" >&5 --ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-ldld $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" --else -- echo "$ac_t""no" 1>&6 --fi -- -- --fi -- -- --fi -- -- --fi -- -- --fi -- --fi -- -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- fi -- -- case "$lt_cv_dlopen" in -- dlopen) --for ac_hdr in dlfcn.h; do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "$progname:2452: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --int fnord = 0; --EOF --ac_try="$ac_compile >/dev/null 2>conftest.out" --{ (eval echo $progname:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi --done -- -- if test "x$ac_cv_header_dlfcn_h" = xyes; then -- CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -- fi -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -- LIBS="$lt_cv_dlopen_libs $LIBS" -- -- echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 --echo "$progname:2490: checking whether a program can dlopen itself" >&5 --if test "${lt_cv_dlopen_self+set}" = set; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test "$cross_compiling" = yes; then -- lt_cv_dlopen_self=cross -- else -- cat > conftest.c < --#endif -- --#include -- --#ifdef RTLD_GLOBAL --# define LTDL_GLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LTDL_GLOBAL DL_GLOBAL --# else --# define LTDL_GLOBAL 0 --# endif --#endif -- --/* We may have to define LTDL_LAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LTDL_LAZY_OR_NOW --# ifdef RTLD_LAZY --# define LTDL_LAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LTDL_LAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LTDL_LAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LTDL_LAZY_OR_NOW DL_NOW --# else --# define LTDL_LAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --fnord() { int i=42;} --main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); -- if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); -- if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } -- --EOF --if { (eval echo $progname:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null --then -- lt_cv_dlopen_self=yes --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- lt_cv_dlopen_self=no --fi --rm -fr conftest* --fi -- --fi -- --echo "$ac_t""$lt_cv_dlopen_self" 1>&6 -- -- if test "$lt_cv_dlopen_self" = yes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -- echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 --echo "$progname:2563: checking whether a statically linked program can dlopen itself" >&5 --if test "${lt_cv_dlopen_self_static+set}" = set; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test "$cross_compiling" = yes; then -- lt_cv_dlopen_self_static=cross -- else -- cat > conftest.c < --#endif -- --#include -- --#ifdef RTLD_GLOBAL --# define LTDL_GLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LTDL_GLOBAL DL_GLOBAL --# else --# define LTDL_GLOBAL 0 --# endif --#endif -- --/* We may have to define LTDL_LAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LTDL_LAZY_OR_NOW --# ifdef RTLD_LAZY --# define LTDL_LAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LTDL_LAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LTDL_LAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LTDL_LAZY_OR_NOW DL_NOW --# else --# define LTDL_LAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --fnord() { int i=42;} --main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); -- if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); -- if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } -- --EOF --if { (eval echo $progname:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null --then -- lt_cv_dlopen_self_static=yes --else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- lt_cv_dlopen_self_static=no --fi --rm -fr conftest* --fi -- --fi -- --echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 --fi -- ;; -- esac -- -- case "$lt_cv_dlopen_self" in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -- -- case "$lt_cv_dlopen_self_static" in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi -- --# Copy echo and quote the copy, instead of the original, because it is --# used later. --ltecho="$echo" --if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then -- ltecho="$CONFIG_SHELL \$0 --fallback-echo" --fi --LTSHELL="$SHELL" -- --LTCONFIG_VERSION="$VERSION" -- --# Only quote variables if we're using ltmain.sh. --case "$ltmain" in --*.sh) -- # Now quote all the things that may contain metacharacters. -- for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \ -- old_LD old_LDFLAGS old_LIBS \ -- old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \ -- AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \ -- file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -- -- case "$var" in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done -- -- case "$ltecho" in -- *'\$0 --fallback-echo"') -- ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -- ;; -- esac -- -- trap "$rm \"$ofile\"; exit 1" 1 2 15 -- echo "creating $ofile" -- $rm "$ofile" -- cat < "$ofile" --#! $SHELL -- --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. --# --# Copyright (C) 1996-1999 Free Software Foundation, Inc. --# Originally by Gordon Matzigkeit , 1996 --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="sed -e s/^X//" -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -- --### BEGIN LIBTOOL CONFIG --EOF -- cfgfile="$ofile" -- ;; -- --*) -- # Double-quote the variables that need it (for aesthetics). -- for var in old_CC old_CFLAGS old_CPPFLAGS \ -- old_LD old_LDFLAGS old_LIBS \ -- old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do -- eval "$var=\\\"\$var\\\"" -- done -- -- # Just create a config file. -- cfgfile="$ofile.cfg" -- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -- echo "creating $cfgfile" -- $rm "$cfgfile" -- cat < "$cfgfile" --# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --EOF -- ;; --esac -- --cat <> "$cfgfile" --# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`: --# --# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\ --# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\ --# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\ --# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\ --# $0$ltconfig_args --# --# Compiler and other test output produced by $progname, useful for --# debugging $progname, is in ./config.log if it exists. -- --# The version of $progname that generated this script. --LTCONFIG_VERSION=$LTCONFIG_VERSION -- --# Shell to use when invoking shell scripts. --SHELL=$LTSHELL -- --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -- --# Whether or not to build static libraries. --build_old_libs=$enable_static -- --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -- --# The host system. --host_alias=$host_alias --host=$host -- --# An echo program that does not interpret backslashes. --echo=$ltecho -- --# The archiver. --AR=$AR -- --# The default C compiler. --CC=$CC -- --# The linker used to build libraries. --LD=$LD -- --# Whether we need hard or soft links. --LN_S=$LN_S -- --# A BSD-compatible nm program. --NM=$NM -- --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -- --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -- --# Used on cygwin: assembler. --AS="$AS" -- --# The name of the directory that contains temporary libtool files. --objdir=$objdir -- --# How to create reloadable object files. --reload_flag=$reload_flag --reload_cmds=$reload_cmds -- --# How to pass a linker flag through the compiler. --wl=$wl -- --# Object file suffix (normally "o"). --objext="$objext" -- --# Old archive suffix (normally "a"). --libext="$libext" -- --# Executable file suffix (normally ""). --exeext="$exeext" -- --# Additional compiler flags for building library objects. --pic_flag=$pic_flag -- --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$compiler_c_o -- --# Can we write directly to a .lo ? --compiler_o_lo=$compiler_o_lo -- --# Must we lock files when doing compilation ? --need_locks=$need_locks -- --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -- --# Do we need a version for libraries? --need_version=$need_version -- --# Whether dlopen is supported. --dlopen=$enable_dlopen -- --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -- --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -- --# Compiler flag to prevent dynamic linking. --link_static_flag=$link_static_flag -- --# Compiler flag to turn off builtin functions. --no_builtin_flag=$no_builtin_flag -- --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$export_dynamic_flag_spec -- --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$whole_archive_flag_spec -- --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$thread_safe_flag_spec -- --# Library versioning type. --version_type=$version_type -- --# Format of library name prefix. --libname_spec=$libname_spec -- --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$library_names_spec -- --# The coded name of the library, if different from the real name. --soname_spec=$soname_spec -- --# Commands used to build and install an old-style archive. --RANLIB=$RANLIB --old_archive_cmds=$old_archive_cmds --old_postinstall_cmds=$old_postinstall_cmds --old_postuninstall_cmds=$old_postuninstall_cmds -- --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$old_archive_from_new_cmds -- --# Commands used to build and install a shared archive. --archive_cmds=$archive_cmds --archive_expsym_cmds=$archive_expsym_cmds --postinstall_cmds=$postinstall_cmds --postuninstall_cmds=$postuninstall_cmds -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$deplibs_check_method -- --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$file_magic_cmd -- --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$allow_undefined_flag -- --# Flag that forces no undefined symbols. --no_undefined_flag=$no_undefined_flag -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$finish_cmds -- --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$finish_eval -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$global_symbol_pipe -- --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$global_symbol_to_cdecl -- --# This is the shared library runtime path variable. --runpath_var=$runpath_var -- --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -- --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -- --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -- --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$hardcode_libdir_separator -- --# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -- --# Compile-time system search path for libraries --sys_lib_search_path_spec=$sys_lib_search_path_spec -- --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec -- --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -- --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -- --# The commands to list exported symbols. --export_symbols_cmds=$export_symbols_cmds -- --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$exclude_expsyms -- --# Symbols that must always be exported. --include_expsyms=$include_expsyms -- --EOF -- --case "$ltmain" in --*.sh) -- echo '### END LIBTOOL CONFIG' >> "$ofile" -- echo >> "$ofile" -- case "$host_os" in -- aix3*) -- cat <<\EOF >> "$ofile" -- --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --EOF -- ;; -- esac -- -- # Append the ltmain.sh script. -- sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) -- # We use sed instead of cat because bash on DJGPP gets confused if -- # 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? -- -- chmod +x "$ofile" -- ;; -- --*) -- # Compile the libtool program. -- echo "FIXME: would compile $ltmain" -- ;; --esac -- --test -n "$cache_file" || exit 0 -- --# AC_CACHE_SAVE --trap '' 1 2 15 --cat > confcache <<\EOF --# This file is a shell script that caches the results of configure --# tests run on this system so they can be shared between configure --# scripts and configure runs. It is not useful on other systems. --# If it contains results you don't want to keep, you may remove or edit it. --# --# By default, configure uses ./config.cache as the cache file, --# creating it if it does not exist already. You can give configure --# the --cache-file=FILE option to use a different cache file; that is --# what configure does when it calls configure scripts in --# subdirectories, so they share the cache. --# Giving --cache-file=/dev/null disables caching, for debugging configure. --# config.status only pays attention to the cache file if you give it the --# --recheck option to rerun configure. --# --EOF --# The following way of writing the cache mishandles newlines in values, --# but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. --# Ultrix sh set writes to stderr and can't be redirected directly, --# and sets the high bit in the cache file unless we assign to the vars. --(set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote substitution -- # turns \\\\ into \\, and sed turns \\ into \). -- sed -n \ -- -e "s/'/'\\\\''/g" \ -- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -- ;; -- *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -- ;; -- esac >> confcache --if cmp -s $cache_file confcache; then -- : --else -- if test -w $cache_file; then -- echo "updating cache $cache_file" -- cat confcache > $cache_file -- else -- echo "not updating unwritable cache $cache_file" -- fi --fi --rm -f confcache -- --exit 0 -- --# Local Variables: --# mode:shell-script --# sh-indentation:2 --# End: -diff -Naur libodbc++-0.2.3/ltmain.sh libodbc++-0.2.3-20050404/ltmain.sh ---- libodbc++-0.2.3/ltmain.sh 2003-06-17 12:20:46.000000000 +0200 -+++ libodbc++-0.2.3-20050404/ltmain.sh 2005-04-04 18:10:50.000000000 +0200 -@@ -1,7 +1,7 @@ - # ltmain.sh - Provide generalized library-building support services. - # NOTE: Changing this file will not affect anything until you rerun configure. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 - # Free Software Foundation, Inc. - # Originally by Gordon Matzigkeit , 1996 - # -@@ -24,6 +24,37 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+basename="s,^.*/,,g" -+ -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" -+ -+# define SED for historic ltconfig's generated by Libtool 1.3 -+test -z "$SED" && SED=sed -+ -+# The name of this program: -+progname=`echo "$progpath" | $SED $basename` -+modename="$progname" -+ -+# Global variables: -+EXIT_SUCCESS=0 -+EXIT_FAILURE=1 -+ -+PROGRAM=ltmain.sh -+PACKAGE=libtool -+VERSION=1.5.10 -+TIMESTAMP=" (1.1220.2.131 2004/09/19 12:46:56)" -+ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes. -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -36,7 +67,7 @@ - : - else - # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$0" --no-reexec ${1+"$@"} -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} - fi - - if test "X$1" = X--fallback-echo; then -@@ -45,19 +76,9 @@ - cat <&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ $echo "$modename: not configured to build any kind of library" 1>&2 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE - fi - - # Global variables. -@@ -105,8 +136,271 @@ - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - -+if test -z "$max_cmd_len"; then -+ i=0 -+ testring="ABCD" -+ new_result= -+ -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ -+ = "XX$testring") >/dev/null 2>&1 && -+ new_result=`expr "X$testring" : ".*" 2>&1` && -+ max_cmd_len="$new_result" && -+ test "$i" != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ testring="$testring$testring" -+ done -+ testring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ max_cmd_len=`expr $max_cmd_len \/ 2` -+fi -+ -+##################################### -+# Shell function definitions: -+# This seems to be the best place for them -+ -+# func_win32_libid arg -+# return the library type of file 'arg' -+# -+# Need a lot of goo to handle *both* DLLs and import libs -+# Has to be a shell function in order to 'eat' the argument -+# that is supplied when $file_magic_command is called. -+func_win32_libid () { -+ win32_libid_type="unknown" -+ win32_fileres=`file -L $1 2>/dev/null` -+ case $win32_fileres in -+ *ar\ archive\ import\ library*) # definitely import -+ win32_libid_type="x86 archive import" -+ ;; -+ *ar\ archive*) # could be an import, or static -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ -+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -+ win32_nmres=`eval $NM -f posix -A $1 | \ -+ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` -+ if test "X$win32_nmres" = "Ximport" ; then -+ win32_libid_type="x86 archive import" -+ else -+ win32_libid_type="x86 archive static" -+ fi -+ fi -+ ;; -+ *DLL*) -+ win32_libid_type="x86 DLL" -+ ;; -+ *executable*) # but shell scripts are "executable" too... -+ case $win32_fileres in -+ *MS\ Windows\ PE\ Intel*) -+ win32_libid_type="x86 DLL" -+ ;; -+ esac -+ ;; -+ esac -+ $echo $win32_libid_type -+} -+ -+ -+# 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. -+# Only attempt this if the compiler in the base compile -+# command doesn't match the default compiler. -+# arg is usually of the form 'gcc ...' -+func_infer_tag () { -+ if test -n "$available_tags" && test -z "$tagname"; then -+ CC_quoted= -+ for arg in $CC; do -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ done -+ case $@ in -+ # Blanks in the command may have been stripped by the calling shell, -+ # but not from the CC environment variable when configure was run. -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; -+ # Blanks at the start of $base_compile will cause this to fail -+ # if we don't check for them as well. -+ *) -+ for z in $available_tags; do -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ CC_quoted= -+ for arg in $CC; do -+ # Double-quote args containing other shell metacharacters. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ done -+ # user sometimes does CC=-gcc so we need to match that to 'gcc' -+ trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"` -+ # and sometimes libtool has CC=-gcc but user does CC=gcc -+ extendcc=${host}-${CC} -+ case "$@ " in -+ "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\ -+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) -+ tagname=CC -+ break ;; -+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\ -+ "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\ -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) -+ # The compiler in the base compile command matches -+ # the one in the tagged configuration. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ fi -+ done -+ # If $tagname still isn't set, then no tagged configuration -+ # was found and let the user know that the "--tag" command -+ # line option must be used. -+ if test -z "$tagname"; then -+ $echo "$modename: unable to infer tagged configuration" -+ $echo "$modename: specify a tag with \`--tag'" 1>&2 -+ exit $EXIT_FAILURE -+# else -+# $echo "$modename: using $tagname tagged configuration" -+ fi -+ ;; -+ esac -+ fi -+} -+ -+ -+# func_extract_archives gentop oldlib ... -+func_extract_archives () { -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" -+ my_status="" -+ -+ $show "${rm}r $my_gentop" -+ $run ${rm}r "$my_gentop" -+ $show "$mkdir $my_gentop" -+ $run $mkdir "$my_gentop" -+ my_status=$? -+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then -+ exit $my_status -+ fi -+ -+ for my_xlib in $my_oldlibs; do -+ # Extract the objects. -+ case $my_xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ *) my_xabs=`pwd`"/$my_xlib" ;; -+ esac -+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -+ my_xdir="$my_gentop/$my_xlib" -+ -+ $show "${rm}r $my_xdir" -+ $run ${rm}r "$my_xdir" -+ $show "$mkdir $my_xdir" -+ $run $mkdir "$my_xdir" -+ status=$? -+ if test "$status" -ne 0 && test ! -d "$my_xdir"; then -+ exit $status -+ fi -+ case $host in -+ *-darwin*) -+ $show "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ if test -z "$run"; then -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`basename $darwin_archive` -+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ $show "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -+ # Remove the table of contents from the thin files. -+ $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true -+ $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true -+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ $AR -xo "${darwin_base_archive}" -+ rm "${darwin_base_archive}" -+ cd "$darwin_curdir" -+ done # $darwin_arches -+ ## Okay now we have a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP` -+ darwin_file= -+ darwin_files= -+ for darwin_file in $darwin_filelist; do -+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ lipo -create -output "$darwin_file" $darwin_files -+ done # $darwin_filelist -+ rm -rf unfat-$$ -+ cd "$darwin_orig_dir" -+ else -+ cd $darwin_orig_dir -+ (cd $my_xdir && $AR x $my_xabs) || exit $? -+ fi # $darwin_arches -+ fi # $run -+ ;; -+ *) -+ # We will extract separately just the conflicting names and we will -+ # no longer touch any unique names. It is faster to leave these -+ # extract automatically by $AR in one run. -+ $show "(cd $my_xdir && $AR x $my_xabs)" -+ $run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $? -+ if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 -+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 -+ $AR t "$my_xabs" | sort | uniq -cd | while read -r count name -+ do -+ i=1 -+ while test "$i" -le "$count" -+ do -+ # Put our $i before any first dot (extension) -+ # Never overwrite any file -+ name_to="$name" -+ while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to" -+ do -+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` -+ done -+ $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')" -+ $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $? -+ i=`expr $i + 1` -+ done -+ done -+ fi -+ ;; -+ esac -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ done -+ -+ func_extract_archives_result="$my_oldobjs" -+} -+# End of Shell function definitions -+##################################### -+ -+# Darwin sucks -+eval std_shrext=\"$shrext_cmds\" -+ - # Parse our command line options once, thoroughly. --while test $# -gt 0 -+while test "$#" -gt 0 - do - arg="$1" - shift -@@ -122,6 +416,34 @@ - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; -+ tag) -+ tagname="$arg" -+ preserve_args="${preserve_args}=$arg" -+ -+ # Check whether tagname contains only valid characters -+ case $tagname in -+ *[!-_A-Za-z0-9,/]*) -+ $echo "$progname: invalid tag name: $tagname" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac -+ -+ case $tagname in -+ CC) -+ # Don't test for the "default" C tag, as we know, it's there, but -+ # not specially marked. -+ ;; -+ *) -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then -+ taglist="$taglist $tagname" -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" -+ else -+ $echo "$progname: ignoring unknown tag $tagname" 1>&2 -+ fi -+ ;; -+ esac -+ ;; - *) - eval "$prev=\$arg" - ;; -@@ -139,18 +461,27 @@ - ;; - - --version) -- echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" -- exit 0 -+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" -+ $echo -+ $echo "Copyright (C) 2003 Free Software Foundation, Inc." -+ $echo "This is free software; see the source for copying conditions. There is NO" -+ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -+ exit $EXIT_SUCCESS - ;; - - --config) -- sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 -- exit 0 -+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath -+ # Now print the configurations for the tags. -+ for tagname in $taglist; do -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" -+ done -+ exit $EXIT_SUCCESS - ;; - - --debug) -- echo "$progname: enabling shell trace mode" -+ $echo "$progname: enabling shell trace mode" - set -x -+ preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) -@@ -158,18 +489,18 @@ - ;; - - --features) -- echo "host: $host" -+ $echo "host: $host" - if test "$build_libtool_libs" = yes; then -- echo "enable shared libraries" -+ $echo "enable shared libraries" - else -- echo "disable shared libraries" -+ $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- echo "enable static libraries" -+ $echo "enable static libraries" - else -- echo "disable static libraries" -+ $echo "disable static libraries" - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - --finish) mode="finish" ;; -@@ -181,6 +512,15 @@ - - --quiet | --silent) - show=: -+ preserve_args="$preserve_args $arg" -+ ;; -+ -+ --tag) prevopt="--tag" prev=tag ;; -+ --tag=*) -+ set tag "$optarg" ${1+"$@"} -+ shift -+ prev=tag -+ preserve_args="$preserve_args --tag" - ;; - - -dlopen) -@@ -191,7 +531,7 @@ - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - - *) -@@ -204,7 +544,7 @@ - if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # If this variable is set in any of the actions, the command in it -@@ -216,8 +556,10 @@ - - # Infer the operation mode. - if test -z "$mode"; then -+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 -+ $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 - case $nonopt in -- *cc | *++ | gcc* | *-gcc*) -+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do -@@ -258,7 +600,7 @@ - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. -@@ -272,158 +614,124 @@ - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= -- prev= -- lastarg= -- srcfile="$nonopt" -+ srcfile="$nonopt" # always keep a non-empty value in "srcfile" -+ suppress_opt=yes - suppress_output= -+ arg_mode=normal -+ libobj= -+ later= - -- user_target=no - for arg - do -- case $prev in -- "") ;; -- xcompiler) -- # Aesthetically quote the previous argument. -- prev= -- lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- -- case $arg in -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- -- # Add the previous argument to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- continue -+ case "$arg_mode" in -+ arg ) -+ # do not "continue". Instead, add this to base_compile -+ lastarg="$arg" -+ arg_mode=normal - ;; -- esac - -- # Accept any command-line options. -- case $arg in -- -o) -- if test "$user_target" != "no"; then -- $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -- exit 1 -- fi -- user_target=next -- ;; -- -- -static) -- build_old_libs=yes -+ target ) -+ libobj="$arg" -+ arg_mode=normal - continue - ;; - -- -prefer-pic) -- pic_mode=yes -- continue -- ;; -+ normal ) -+ # Accept any command-line options. -+ case $arg in -+ -o) -+ if test -n "$libobj" ; then -+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ arg_mode=target -+ continue -+ ;; - -- -prefer-non-pic) -- pic_mode=no -- continue -- ;; -+ -static | -prefer-pic | -prefer-non-pic) -+ later="$later $arg" -+ continue -+ ;; - -- -Xcompiler) -- prev=xcompiler -- continue -- ;; -+ -no-suppress) -+ suppress_opt=no -+ continue -+ ;; - -- -Wc,*) -- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -- lastarg= -- save_ifs="$IFS"; IFS=',' -- for arg in $args; do -- IFS="$save_ifs" -+ -Xcompiler) -+ arg_mode=arg # the next one goes into the "base_compile" arg list -+ continue # The current "srcfile" will either be retained or -+ ;; # replaced later. I would guess that would be a bug. -+ -+ -Wc,*) -+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -+ lastarg= -+ save_ifs="$IFS"; IFS=',' -+ for arg in $args; do -+ IFS="$save_ifs" - -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- lastarg="$lastarg $arg" -- done -- IFS="$save_ifs" -- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ lastarg="$lastarg $arg" -+ done -+ IFS="$save_ifs" -+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - -- # Add the arguments to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -+ # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" -- fi -- continue -- ;; -- esac -+ continue -+ ;; - -- case $user_target in -- next) -- # The next one is the -o target name -- user_target=yes -- continue -- ;; -- yes) -- # We got the output file -- user_target=set -- libobj="$arg" -- continue -+ * ) -+ # Accept the current argument as the source file. -+ # The previous "srcfile" becomes the current argument. -+ # -+ lastarg="$srcfile" -+ srcfile="$arg" -+ ;; -+ esac # case $arg - ;; -- esac -- -- # Accept the current argument as the source file. -- lastarg="$srcfile" -- srcfile="$arg" -+ esac # case $arg_mode - - # Aesthetically quote the previous argument. -- -- # Backslashify any backslashes, double quotes, and dollar signs. -- # These are the only characters that are still specially -- # interpreted inside of double-quoted scrings. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - -+ case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. -- case $lastarg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - -- # Add the previous argument to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- done -+ base_compile="$base_compile $lastarg" -+ done # for arg - -- case $user_target in -- set) -+ case $arg_mode in -+ arg) -+ $echo "$modename: you must specify an argument for -Xcompile" -+ exit $EXIT_FAILURE - ;; -- no) -- # Get the name of the library object. -- libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` -+ target) -+ $echo "$modename: you must specify a target with \`-o'" 1>&2 -+ exit $EXIT_FAILURE - ;; - *) -- $echo "$modename: you must specify a target with \`-o'" 1>&2 -- exit 1 -+ # Get the name of the library object. -+ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo -- xform='[cCFSfmso]' -+ xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; -@@ -431,10 +739,13 @@ - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; -+ *.ii) xform=ii ;; -+ *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; -+ *.java) xform=java ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -@@ -443,25 +754,55 @@ - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -+ func_infer_tag $base_compile -+ -+ for arg in $later; do -+ case $arg in -+ -static) -+ build_old_libs=yes -+ continue -+ ;; -+ -+ -prefer-pic) -+ pic_mode=yes -+ continue -+ ;; -+ -+ -prefer-non-pic) -+ pic_mode=no -+ continue -+ ;; -+ esac -+ done -+ -+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$obj"; then -+ xdir= -+ else -+ xdir=$xdir/ -+ fi -+ lobj=${xdir}$objdir/$objname -+ - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then -- removelist="$obj $libobj" -+ removelist="$obj $lobj $libobj ${libobj}T" - else -- removelist="$libobj" -+ removelist="$lobj $libobj ${libobj}T" - fi - - $run $rm $removelist -- trap "$run $rm $removelist; exit 1" 1 2 15 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in -@@ -480,8 +821,9 @@ - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" -- trap "$run $rm $removelist; exit 1" 1 2 15 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else -+ output_obj= - need_locks=no - lockfile= - fi -@@ -489,13 +831,13 @@ - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then -- until $run ln "$0" "$lockfile" 2>/dev/null; do -+ until $run ln "$srcfile" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then -- echo "\ -+ $echo "\ - *** ERROR, $lockfile exists and contains: - `cat $lockfile 2>/dev/null` - -@@ -507,68 +849,67 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi -- echo $srcfile > "$lockfile" -+ $echo $srcfile > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - -+ $run $rm "$libobj" "${libobj}T" -+ -+ # Create a libtool object file (analogous to a ".la" file), -+ # but don't create it if we're doing a dry run. -+ test -z "$run" && cat > ${libobj}T </dev/null`" != x"$srcfile"; then -- echo "\ -+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -+ $echo "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -583,13 +924,13 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one -- if test x"$output_obj" != x"$libobj"; then -- $show "$mv $output_obj $libobj" -- if $run $mv $output_obj $libobj; then : -+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then -+ $show "$mv $output_obj $lobj" -+ if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist -@@ -597,48 +938,23 @@ - fi - fi - -- # If we have no pic_flag, then copy the object into place and finish. -- if (test -z "$pic_flag" || test "$pic_mode" != default) && -- test "$build_old_libs" = yes; then -- # Rename the .lo from within objdir to obj -- if test -f $obj; then -- $show $rm $obj -- $run $rm $obj -- fi -+ # Append the name of the PIC object to the libtool object file. -+ test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != x"$srcfile"; then -- echo "\ -+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -+ $echo "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -682,11 +996,11 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed -- if test x"$output_obj" != x"$obj"; then -+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else -@@ -696,29 +1010,31 @@ - fi - fi - -- # Create an invalid libtool object if no PIC, so that we do not -- # accidentally link it into a program. -- if test "$build_libtool_libs" != yes; then -- $show "echo timestamp > $libobj" -- $run eval "echo timestamp > \$libobj" || exit $? -- else -- # Move the .lo from within objdir -- $show "$mv $libobj $lo_libobj" -- if $run $mv $libobj $lo_libobj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -- fi -+ # Append the name of the non-PIC object the libtool object file. -+ # Only append if the libtool object file exists. -+ test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null 2>&1; then -+ pic_object= -+ non_pic_object= -+ -+ # Read the .lo file -+ # If there is no directory component, then add one. -+ case $arg in -+ */* | *\\*) . $arg ;; -+ *) . ./$arg ;; -+ esac -+ -+ if test -z "$pic_object" || \ -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && \ -+ test "$non_pic_object" = none; then -+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" -+ -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi -+ -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi -+ -+ # A PIC object. -+ libobjs="$libobjs $pic_object" -+ arg="$pic_object" -+ fi -+ -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if test -z "$run"; then -+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -+ exit $EXIT_FAILURE -+ else -+ # Dry-run case. -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -+ libobjs="$libobjs $pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ fi -+ done -+ else -+ $echo "$modename: link input file \`$save_arg' does not exist" -+ exit $EXIT_FAILURE -+ fi -+ arg=$save_arg -+ prev= -+ continue -+ ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then -@@ -938,13 +1372,26 @@ - finalize_command="$finalize_command $wl$qarg" - continue - ;; -+ xcclinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ compile_command="$compile_command $qarg" -+ finalize_command="$finalize_command $qarg" -+ continue -+ ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac -- fi # test -n $prev -+ fi # test -n "$prev" - - prevarg="$arg" - -@@ -986,7 +1433,7 @@ - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" -- exit 1 -+ exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms -@@ -1005,7 +1452,7 @@ - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in -- no/*-*-irix*) -+ no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; -@@ -1022,7 +1469,7 @@ - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - dir="$absdir" - ;; -@@ -1056,28 +1503,65 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; -- esac -- elif test "X$arg" = "X-lc_r"; then -- case $host in -- *-*-openbsd*) -- # Do not include libc_r directly, use -pthread flag. -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C and math libraries are in the System framework -+ deplibs="$deplibs -framework System" - continue -- ;; - esac -+ elif test "X$arg" = "X-lc_r"; then -+ case $host in -+ *-*-openbsd* | *-*-freebsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac - fi - deplibs="$deplibs $arg" - continue - ;; - -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -module) - module=yes - continue - ;; - -+ # gcc -m* arguments should be passed to the linker via $compiler_flags -+ # in order to pass architecture information to the linker -+ # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo -+ # but this is not reliable with gcc because gcc may use -mfoo to -+ # select a different linker, different libraries, etc, while -+ # -Wl,-mfoo simply passes -mfoo to the linker. -+ -m*) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ if test "$with_gcc" = "yes" ; then -+ compiler_flags="$compiler_flags $arg" -+ fi -+ continue -+ ;; -+ -+ -shrext) -+ prev=shrext -+ continue -+ ;; -+ - -no-fast-install) - fast_install=no - continue -@@ -1102,8 +1586,18 @@ - continue - ;; - -+ -objectlist) -+ prev=objectlist -+ continue -+ ;; -+ - -o) prev=output ;; - -+ -precious-files-regex) -+ prev=precious_regex -+ continue -+ ;; -+ - -release) - prev=release - continue -@@ -1126,7 +1620,7 @@ - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in -@@ -1154,6 +1648,11 @@ - prev=vinfo - continue - ;; -+ -version-number) -+ prev=vinfo -+ vinfo_number=yes -+ continue -+ ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` -@@ -1202,6 +1701,16 @@ - continue - ;; - -+ -XCClinker) -+ prev=xcclinker -+ continue -+ ;; -+ -+ -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread ) -+ compiler_flags="$compiler_flags $arg" -+ continue -+ ;; -+ - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need -@@ -1214,29 +1723,101 @@ - esac - ;; - -- *.lo | *.$objext) -- # A library or standard object. -- if test "$prev" = dlfiles; then -- # This file was specified with -dlopen. -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $arg" -- prev= -- continue -- else -- # If libtool objects are unsupported, then we need to preload. -- prev=dlprefiles -- fi -- fi -+ *.$objext) -+ # A standard object. -+ objs="$objs $arg" -+ ;; - -- if test "$prev" = dlprefiles; then -- # Preload the old-style object. -- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` -- prev= -- else -+ *.lo) -+ # A libtool-controlled object. -+ -+ # Check to see that this really is a libtool object. -+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ pic_object= -+ non_pic_object= -+ -+ # Read the .lo file -+ # If there is no directory component, then add one. - case $arg in -- *.lo) libobjs="$libobjs $arg" ;; -- *) objs="$objs $arg" ;; -+ */* | *\\*) . $arg ;; -+ *) . ./$arg ;; - esac -+ -+ if test -z "$pic_object" || \ -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && \ -+ test "$non_pic_object" = none; then -+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" -+ -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi -+ -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi -+ -+ # A PIC object. -+ libobjs="$libobjs $pic_object" -+ arg="$pic_object" -+ fi -+ -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if test -z "$run"; then -+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -+ exit $EXIT_FAILURE -+ else -+ # Dry-run case. -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -+ libobjs="$libobjs $pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi - fi - ;; - -@@ -1287,7 +1868,7 @@ - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -@@ -1296,6 +1877,7 @@ - finalize_command="$finalize_command $arg" - fi - -+ oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" -@@ -1330,7 +1912,7 @@ - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; -@@ -1338,7 +1920,17 @@ - *) linkmode=prog ;; # Anything else should be a program. - esac - -+ case $host in -+ *cygwin* | *mingw* | *pw32*) -+ # don't eliminate duplications in $postdeps and $predeps -+ duplicate_compiler_generated_deps=yes -+ ;; -+ *) -+ duplicate_compiler_generated_deps=$duplicate_deps -+ ;; -+ esac - specialdeplibs= -+ - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) -@@ -1358,7 +1950,7 @@ - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= -- if test "X$duplicate_deps" = "Xyes" ; then -+ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -@@ -1383,7 +1975,7 @@ - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -1400,25 +1992,39 @@ - ;; - esac - for pass in $passes; do -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan"; then -+ libs="$deplibs" -+ deplibs= -+ fi - if test "$linkmode" = prog; then -- # Determine which files to process - case $pass in -- dlopen) -- libs="$dlfiles" -- save_deplibs="$deplibs" # Collect dlpreopened libraries -- deplibs= -- ;; -+ dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi -+ if test "$pass" = dlopen; then -+ # Collect dlpreopened libraries -+ save_deplibs="$deplibs" -+ deplibs= -+ fi - for deplib in $libs; do - lib= - found=no - case $deplib in -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -l*) -- if test "$linkmode" = oldlib && test "$linkmode" = obj; then -- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 -+ if test "$linkmode" != lib && test "$linkmode" != prog; then -+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - if test "$pass" = conv; then -@@ -1427,12 +2033,18 @@ - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do -- # Search the libtool library -- lib="$searchdir/lib${name}.la" -- if test -f "$lib"; then -- found=yes -- break -- fi -+ for search_ext in .la $std_shrext .so .a; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}${search_ext}" -+ if test -f "$lib"; then -+ if test "$search_ext" = ".la"; then -+ found=yes -+ else -+ found=no -+ fi -+ break 2 -+ fi -+ done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library -@@ -1444,6 +2056,42 @@ - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue -+ else # deplib is a libtool library -+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, -+ # We need to do some special things here, and not later. -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $deplib "*) -+ if (${SED} -e '2q' $lib | -+ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ library_names= -+ old_library= -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; -+ esac -+ for l in $old_library $library_names; do -+ ll="$l" -+ done -+ if test "X$ll" = "X$old_library" ; then # only static version available -+ found=no -+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$ladir" = "X$lib" && ladir="." -+ lib=$ladir/$old_library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ fi -+ fi -+ ;; -+ *) ;; -+ esac -+ fi - fi - ;; # -l - -L*) -@@ -1461,14 +2109,14 @@ - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) -- $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 -+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue -@@ -1493,16 +2141,33 @@ - fi - case $linkmode in - lib) -- if test "$deplibs_check_method" != pass_all; then -- echo -- echo "*** Warning: This library needs some functionality provided by $deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ if eval $echo \"$deplib\" 2>/dev/null \ -+ | $SED 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then -+ $echo -+ $echo "*** Warning: Trying to link with static lib archive $deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because the file extensions .$libext of this argument makes me believe" -+ $echo "*** that it is just a static archive that I should not used here." - else -- echo -- echo "*** Warning: Linking the shared library $output against the" -- echo "*** static library $deplib is not portable!" -+ $echo -+ $echo "*** Warning: Linking the shared library $output against the" -+ $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue -@@ -1519,14 +2184,18 @@ - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) -- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -- # If there is no dlopen support or we're linking statically, -- # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- newdlfiles="$newdlfiles $deplib" -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ elif test "$linkmode" = prog; then -+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlopen support or we're linking statically, -+ # we need to preload. -+ newdlprefiles="$newdlprefiles $deplib" -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ newdlfiles="$newdlfiles $deplib" -+ fi - fi - continue - ;; -@@ -1538,14 +2207,14 @@ - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -@@ -1558,8 +2227,9 @@ - library_names= - old_library= - # If the library was installed with an old release of libtool, -- # it will not redefine variable installed. -+ # it will not redefine variables installed, or shouldnotlink - installed=yes -+ shouldnotlink=no - - # Read the .la file - case $lib in -@@ -1569,8 +2239,7 @@ - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || -- { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then -- # Add dl[pre]opened files of deplib -+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi -@@ -1581,7 +2250,7 @@ - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" -@@ -1598,11 +2267,12 @@ - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - -+ - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do -@@ -1610,19 +2280,23 @@ - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi -- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ if test -z "$dlname" || -+ test "$dlopen_support" != yes || -+ test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking -- # statically, we need to preload. -- dlprefiles="$dlprefiles $lib" -+ # statically, we need to preload. We also need to preload any -+ # dependent libraries so libltdl's deplib preloader doesn't -+ # bomb out in the load deplibs phase. -+ dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi -@@ -1655,10 +2329,17 @@ - absdir="$libdir" - fi - else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ dir="$ladir" -+ absdir="$abs_ladir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - -@@ -1666,7 +2347,7 @@ - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). -@@ -1688,11 +2369,12 @@ - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else -- deplibs="$lib $deplibs" -+ deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - -+ - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" -@@ -1726,13 +2408,19 @@ - continue - fi # $linkmode = prog... - -- link_static=no # Whether the deplib will be linked statically -- if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -- # Link against this shared library -+ if test "$linkmode,$pass" = "prog,link"; then -+ if test -n "$library_names" && -+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ # We need to hardcode the library path -+ if test -n "$shlibpath_var"; then -+ # Make sure the rpath contains only unique directories. -+ case "$temp_rpath " in -+ *" $dir "*) ;; -+ *" $absdir "*) ;; -+ *) temp_rpath="$temp_rpath $dir" ;; -+ esac -+ fi - -- if test "$linkmode,$pass" = "prog,link" || -- { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. -@@ -1754,17 +2442,6 @@ - esac - ;; - esac -- if test "$linkmode" = prog; then -- # We need to hardcode the library path -- if test -n "$shlibpath_var"; then -- # Make sure the rpath contains only unique directories. -- case "$temp_rpath " in -- *" $dir "*) ;; -- *" $absdir "*) ;; -- *) temp_rpath="$temp_rpath $dir" ;; -- esac -- fi -- fi - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && -@@ -1774,11 +2451,52 @@ - # We only need to search for static libraries - continue - fi -+ fi - -+ link_static=no # Whether the deplib will be linked statically -+ if test -n "$library_names" && -+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi -+ # This is a shared library -+ -+ # Warn about portability, can't link against -module's on -+ # some systems (darwin) -+ if test "$shouldnotlink" = yes && test "$pass" = link ; then -+ $echo -+ if test "$linkmode" = prog; then -+ $echo "*** Warning: Linking the executable $output against the loadable module" -+ else -+ $echo "*** Warning: Linking the shared library $output against the loadable module" -+ fi -+ $echo "*** $linklib is not portable!" -+ fi -+ if test "$linkmode" = lib && -+ test "$hardcode_into_libs" = yes; then -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname -@@ -1792,7 +2510,7 @@ - elif test -n "$soname_spec"; then - # bleh windows - case $host in -- *cygwin*) -+ *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; -@@ -1804,17 +2522,18 @@ - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" -- soname=`echo $soroot | sed -e 's/^.*\///'` -- newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" -+ soname=`$echo $soroot | ${SED} -e 's/^.*\///'` -+ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' -- eval cmds=\"$extract_expsyms_cmds\" -+ cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -1825,9 +2544,10 @@ - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' -- eval cmds=\"$old_archive_from_expsyms_cmds\" -+ cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -1847,6 +2567,22 @@ - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" -+ case $host in -+ *-*-sco3.2v5* ) add_dir="-L$dir" ;; -+ *-*-darwin* ) -+ # if the lib is a module then we can not link against -+ # it, someone is ignoring the new warnings I added -+ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then -+ $echo "** Warning, lib $linklib is a module, not a shared library" -+ if test -z "$old_library" ; then -+ $echo -+ $echo "** And there doesn't seem to be a static archive available" -+ $echo "** The link will probably fail, sorry" -+ else -+ add="$dir/$old_library" -+ fi -+ fi -+ esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; -@@ -1865,6 +2601,14 @@ - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case "$libdir" in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" -@@ -1878,7 +2622,7 @@ - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then -@@ -1912,16 +2656,7 @@ - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then -- # Try looking first in the location we're being installed to. -- add_dir= -- if test -n "$inst_prefix_dir"; then -- case "$libdir" in -- [\\/]*) -- add_dir="-L$inst_prefix_dir$libdir" -- ;; -- esac -- fi -- add_dir="$add_dir -L$libdir" -+ add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in -@@ -1929,18 +2664,24 @@ - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" -+ elif test "$hardcode_automatic" = yes; then -+ if test -n "$inst_prefix_dir" && -+ test -f "$inst_prefix_dir$libdir/$linklib" ; then -+ add="$inst_prefix_dir$libdir/$linklib" -+ else -+ add="$libdir/$linklib" -+ fi - else - # We cannot seem to hardcode it, guess we'll fake it. -+ add_dir="-L$libdir" - # Try looking first in the location we're being installed to. -- add_dir= - if test -n "$inst_prefix_dir"; then - case "$libdir" in -- [\\/]*) -- add_dir="-L$inst_prefix_dir$libdir" -- ;; -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; - esac - fi -- add_dir="$add_dir -L$libdir" - add="-l$name" - fi - -@@ -1953,15 +2694,6 @@ - fi - fi - elif test "$linkmode" = prog; then -- if test "$alldeplibs" = yes && -- { test "$deplibs_check_method" = pass_all || -- { test "$build_libtool_libs" = yes && -- test -n "$library_names"; }; }; then -- # We only need to search for static libraries -- continue -- fi -- -- # Try to link the static library - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. -@@ -1981,20 +2713,21 @@ - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- echo -- echo "*** Warning: This library needs some functionality provided by $lib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $echo -+ $echo "*** Warning: This system can not link to static lib archive $lib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- echo "*** Therefore, libtool will create a static module, that should work " -- echo "*** as long as the dlopening application is linked with the -dlopen flag." -+ $echo "*** But as you try to build a module library, libtool will still create " -+ $echo "*** a static module, that should work as long as the dlopening application" -+ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ $echo -+ $echo "*** However, this would only work if libtool was able to extract symbol" -+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $echo "*** not find such a program. So, this module is probably useless." -+ $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module -@@ -2013,7 +2746,8 @@ - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && -- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= -@@ -2065,22 +2799,67 @@ - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then -- path="-L$absdir/$objdir" -+ path="$absdir/$objdir" - else -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi -- path="-L$absdir" -+ path="$absdir" - fi -+ depdepl= -+ case $host in -+ *-*-darwin*) -+ # we do not want to link against static libs, -+ # but need to link against shared -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ if test -n "$deplibrary_names" ; then -+ for tmp in $deplibrary_names ; do -+ depdepl=$tmp -+ done -+ if test -f "$path/$depdepl" ; then -+ depdepl="$path/$depdepl" -+ fi -+ # do not add paths which are already there -+ case " $newlib_search_path " in -+ *" $path "*) ;; -+ *) newlib_search_path="$newlib_search_path $path";; -+ esac -+ fi -+ path="" -+ ;; -+ *) -+ path="-L$path" -+ ;; -+ esac -+ ;; -+ -l*) -+ case $host in -+ *-*-darwin*) -+ # Again, we only want to link against shared libraries -+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` -+ for tmp in $newlib_search_path ; do -+ if test -f "$tmp/lib$tmp_libs.dylib" ; then -+ eval depdepl="$tmp/lib$tmp_libs.dylib" -+ break -+ fi -+ done -+ path="" -+ ;; -+ *) continue ;; -+ esac - ;; - *) continue ;; - esac - case " $deplibs " in -+ *" $depdepl "*) ;; -+ *) deplibs="$depdepl $deplibs" ;; -+ esac -+ case " $deplibs " in - *" $path "*) ;; - *) deplibs="$deplibs $path" ;; - esac -@@ -2088,6 +2867,7 @@ - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs -+ dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do -@@ -2095,7 +2875,6 @@ - done - fi - if test "$pass" != dlopen; then -- test "$pass" != scan && dependency_libs="$newdependency_libs" - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= -@@ -2118,9 +2897,30 @@ - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do -+ # FIXME: Pedantically, this is the right thing to do, so -+ # that some nasty dependency loop isn't accidentally -+ # broken: -+ #new_libs="$deplib $new_libs" -+ # Pragmatically, this seems to cause very few problems in -+ # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; -+ -R*) ;; - *) -+ # And here is the reason: when a library appears more -+ # than once as an explicit dependence of a library, or -+ # is implicitly linked in more than once by the -+ # compiler, it is considered special, and multiple -+ # occurrences thereof are not removed. Compare this -+ # with having the same library being listed as a -+ # dependency of multiple other libraries: in this case, -+ # we know (pedantically, we assume) the library does not -+ # need to be listed more than once, so we keep only the -+ # last copy. This is not always right, but it is rare -+ # enough that we require users that really mean to play -+ # such unportable linking tricks to link the library -+ # using -Wl,-lname, so that libtool does not consider it -+ # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) -@@ -2148,11 +2948,20 @@ - eval $var=\"$tmp_libs\" - done # for var - fi -- if test "$pass" = "conv" && -- { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then -- libs="$deplibs" # reset libs -- deplibs= -- fi -+ # Last step: remove runtime libs from dependency_libs -+ # (they stay in deplibs) -+ tmp_libs= -+ for i in $dependency_libs ; do -+ case " $predeps $postdeps $compiler_lib_search_path " in -+ *" $i "*) -+ i="" -+ ;; -+ esac -+ if test -n "$i" ; then -+ tmp_libs="$tmp_libs $i" -+ fi -+ done -+ dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" -@@ -2161,6 +2970,10 @@ - - case $linkmode in - oldlib) -+ if test -n "$deplibs"; then -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 -+ fi -+ - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi -@@ -2174,7 +2987,7 @@ - fi - - if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 -+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then -@@ -2196,17 +3009,19 @@ - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -@@ -2217,11 +3032,11 @@ - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 -- exit 1 -+ exit $EXIT_FAILURE - else -- echo -- echo "*** Warning: Linking the shared library $output against the non-libtool" -- echo "*** objects $objs is not portable!" -+ $echo -+ $echo "*** Warning: Linking the shared library $output against the non-libtool" -+ $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi -@@ -2240,14 +3055,16 @@ - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. -- libext=al -+ # Some compilers have problems with a `.al' extension so -+ # convenience libraries should have the same extension an -+ # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 -+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then -@@ -2263,12 +3080,49 @@ - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - -- current="$2" -- revision="$3" -- age="$4" -+ # convert absolute version numbers to libtool ages -+ # this retains compatibility with .la files and attempts -+ # to make the code below a bit more comprehensible -+ -+ case $vinfo_number in -+ yes) -+ number_major="$2" -+ number_minor="$3" -+ number_revision="$4" -+ # -+ # There are really only two kinds -- those that -+ # use the current revision as the major version -+ # and those that subtract age and use age as -+ # a minor version. But, then there is irix -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+ darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+ freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+ ;; -+ irix|nonstopux) -+ current=`expr $number_major + $number_minor - 1` -+ age="$number_minor" -+ revision="$number_minor" -+ ;; -+ esac -+ ;; -+ no) -+ current="$2" -+ revision="$3" -+ age="$4" -+ ;; -+ esac - - # Check that each of the things are valid numbers. - case $current in -@@ -2276,7 +3130,7 @@ - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -2285,7 +3139,7 @@ - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -2294,14 +3148,14 @@ - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Calculate the version variables. -@@ -2318,7 +3172,7 @@ - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` -- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - ;; - - freebsd-aout) -@@ -2331,16 +3185,21 @@ - versuffix=".$current"; - ;; - -- irix) -+ irix | nonstopux) - major=`expr $current - $age + 1` -- verstring="sgi$major.$revision" -+ -+ case $version_type in -+ nonstopux) verstring_prefix=nonstopux ;; -+ *) verstring_prefix=sgi ;; -+ esac -+ verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` -- verstring="sgi$major.$iface:$verstring" -+ verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. -@@ -2354,7 +3213,7 @@ - ;; - - osf) -- major=`expr $current - $age` -+ major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - -@@ -2384,20 +3243,19 @@ - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= -- verstring="0.0" - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely -- verstring="" -+ verstring= - ;; - *) - verstring="0.0" -@@ -2431,9 +3289,30 @@ - fi - - if test "$mode" != relink; then -- # Remove our outputs. -- $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -- $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* -+ # Remove our outputs, but don't remove object files since they -+ # may have been created when compiling PIC objects. -+ removelist= -+ tempremovelist=`$echo "$output_objdir/*"` -+ for p in $tempremovelist; do -+ case $p in -+ *.$objext) -+ ;; -+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -+ if test "X$precious_files_regex" != "X"; then -+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -+ then -+ continue -+ fi -+ fi -+ removelist="$removelist $p" -+ ;; -+ *) ;; -+ esac -+ done -+ if test -n "$removelist"; then -+ $show "${rm}r $removelist" -+ $run ${rm}r $removelist -+ fi - fi - - # Now set the variables for building old libraries. -@@ -2446,9 +3325,9 @@ - - # Eliminate all temporary directories. - for path in $notinst_path; do -- lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` -- deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` -- dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` -+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` -+ deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` -+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` - done - - if test -n "$xrpath"; then -@@ -2499,10 +3378,11 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. -+ test "X$arg" = "X-lc" && continue - ;; -- *) -+ *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" -@@ -2531,7 +3411,7 @@ - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just -- # implementing what was already the behaviour. -+ # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) -@@ -2544,64 +3424,88 @@ - int main() { return 0; } - EOF - $rm conftest -- $CC -o conftest conftest.c $deplibs -+ $LTCC -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then - ldd_output=`ldd conftest` - for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ if test "$name" != "" && test "$name" -ne "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: dynamic linker does not accept needed library $i." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which I believe you do not have" -+ $echo "*** because a test_compile did reveal that the linker did not use it for" -+ $echo "*** its dynamic dependency list that programs get resolved with at runtime." -+ fi - fi - else - newdeplibs="$newdeplibs $i" - fi - done - else -- # Error occured in the first compile. Let's try to salvage the situation: -- # Compile a seperate program for each library. -+ # Error occurred in the first compile. Let's try to salvage -+ # the situation: Compile a separate program for each library. - for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" -- # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -+ # If $name is empty we are operating on a -L argument. -+ if test "$name" != "" && test "$name" != "0"; then - $rm conftest -- $CC -o conftest conftest.c $i -+ $LTCC -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then - ldd_output=`ldd conftest` -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: dynamic linker does not accept needed library $i." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because a test_compile did reveal that the linker did not use this one" -+ $echo "*** as a dynamic dependency that programs can get resolved with at runtime." -+ fi - fi - else - droppeddeps=yes -- echo -- echo "*** Warning! Library $i is needed by this library but I was not able to" -- echo "*** make it link in! You will probably need to install it or some" -- echo "*** library that it depends on before this library will be fully" -- echo "*** functional. Installing it before continuing would be even better." -+ $echo -+ $echo "*** Warning! Library $i is needed by this library but I was not able to" -+ $echo "*** make it link in! You will probably need to install it or some" -+ $echo "*** library that it depends on before this library will be fully" -+ $echo "*** functional. Installing it before continuing would be even better." - fi - else - newdeplibs="$newdeplibs $i" -@@ -2615,11 +3519,20 @@ - for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -+ if test "$name" != "" && test "$name" != "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then -@@ -2632,28 +3545,43 @@ - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do -- potliblink=`ls -ld $potlib | sed 's/.* -> //'` -+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done -+ # It is ok to link against an archive when -+ # building a shared library. -+ if $AR -t $potlib > /dev/null 2>&1; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ -- | sed 10q \ -- | egrep "$file_magic_regex" > /dev/null; then -+ | ${SED} 10q \ -+ | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi -- done -- done -+ done -+ done -+ fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $echo -+ $echo "*** Warning: linker path does not have real file for library $a_deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $echo "*** with $libname but no candidates were found. (...for file magic test)" -+ else -+ $echo "*** with $libname and none of the candidates passed a file format test" -+ $echo "*** using a file magic. Last file checked: $potlib" -+ fi - fi - else - # Add a -L argument. -@@ -2668,26 +3596,44 @@ - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -- if eval echo \"$potent_lib\" 2>/dev/null \ -- | sed 10q \ -- | egrep "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ 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" -+ a_deplib="" -+ break 2 -+ fi -+ done - done -- done -+ fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $echo -+ $echo "*** Warning: linker path does not have real file for library $a_deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $echo "*** with $libname but no candidates were found. (...for regex pattern test)" -+ else -+ $echo "*** with $libname and none of the candidates passed a file format test" -+ $echo "*** using a regex pattern. Last file checked: $potlib" -+ fi - fi - else - # Add a -L argument. -@@ -2697,16 +3643,23 @@ - ;; - none | unknown | *) - newdeplibs="" -- if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -- -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | -- grep . >/dev/null; then -- echo -+ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -+ -e 's/ -[LR][^ ]*//g'` -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ for i in $predeps $postdeps ; do -+ # can't use Xsed below, because $i might contain '/' -+ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` -+ done -+ fi -+ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ -+ | grep . >/dev/null; then -+ $echo - if test "X$deplibs_check_method" = "Xnone"; then -- echo "*** Warning: inter-library dependencies are not supported in this platform." -+ $echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- echo "*** Warning: inter-library dependencies are not known to be supported." -+ $echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- echo "*** All declared inter-library dependencies are being dropped." -+ $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; -@@ -2726,17 +3679,17 @@ - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- echo -- echo "*** Warning: libtool could not satisfy all declared inter-library" -- echo "*** dependencies of module $libname. Therefore, libtool will create" -- echo "*** a static module, that should work as long as the dlopening" -- echo "*** application is linked with the -dlopen flag." -+ $echo -+ $echo "*** Warning: libtool could not satisfy all declared inter-library" -+ $echo "*** dependencies of module $libname. Therefore, libtool will create" -+ $echo "*** a static module, that should work as long as the dlopening" -+ $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ $echo -+ $echo "*** However, this would only work if libtool was able to extract symbol" -+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $echo "*** not find such a program. So, this module is probably useless." -+ $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" -@@ -2746,16 +3699,16 @@ - build_libtool_libs=no - fi - else -- echo "*** The inter-library dependencies that have been dropped here will be" -- echo "*** automatically added whenever a program is linked with this library" -- echo "*** or is declared to -dlopen it." -+ $echo "*** The inter-library dependencies that have been dropped here will be" -+ $echo "*** automatically added whenever a program is linked with this library" -+ $echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then -- echo -- echo "*** Since this library must not contain undefined symbols," -- echo "*** because either the platform does not support them or" -- echo "*** it was explicitly requested with -no-undefined," -- echo "*** libtool will only create a static version of it." -+ $echo -+ $echo "*** Since this library must not contain undefined symbols," -+ $echo "*** because either the platform does not support them or" -+ $echo "*** it was explicitly requested with -no-undefined," -+ $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module -@@ -2813,7 +3766,11 @@ - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ if test -n "$hardcode_libdir_flag_spec_ld"; then -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" -+ else -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. -@@ -2833,6 +3790,7 @@ - fi - - # Get the real and link names of the library. -+ eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" -@@ -2843,7 +3801,9 @@ - else - soname="$realname" - fi -- test -z "$dlname" && dlname=$soname -+ if test -z "$dlname"; then -+ dlname=$soname -+ fi - - lib="$output_objdir/$realname" - for link -@@ -2851,23 +3811,6 @@ - linknames="$linknames $link" - done - -- # Ensure that we have .o objects for linkers which dislike .lo -- # (e.g. aix) in case we are running --disable-static -- for obj in $libobjs; do -- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$obj"; then -- xdir="." -- else -- xdir="$xdir" -- fi -- baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -- if test ! -f $xdir/$oldobj; then -- $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" -- $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? -- fi -- done -- - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - -@@ -2877,17 +3820,26 @@ - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols -- eval cmds=\"$export_symbols_cmds\" -+ cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -+ eval cmd=\"$cmd\" -+ if len=`expr "X$cmd" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ skipped_export=false -+ else -+ # The command line is too long to execute in one step. -+ $show "using reloadable object file for export list..." -+ skipped_export=: -+ fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then -- $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -- $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -+ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi -@@ -2898,46 +3850,30 @@ - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - -+ tmp_deplibs= -+ for test_deplib in $deplibs; do -+ case " $convenience " in -+ *" $test_deplib "*) ;; -+ *) -+ tmp_deplibs="$tmp_deplibs $test_deplib" -+ ;; -+ esac -+ done -+ deplibs="$tmp_deplibs" -+ - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test "$status" -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test "$status" -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- -- libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" - 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" -@@ -2949,14 +3885,147 @@ - fi - - # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ eval test_cmds=\"$module_expsym_cmds\" -+ cmds=$module_expsym_cmds -+ else -+ eval test_cmds=\"$module_cmds\" -+ cmds=$module_cmds -+ fi -+ else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval cmds=\"$archive_expsym_cmds\" -+ eval test_cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds -+ else -+ eval test_cmds=\"$archive_cmds\" -+ cmds=$archive_cmds -+ fi -+ fi -+ -+ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ : - else -- eval cmds=\"$archive_cmds\" -+ # The command line is too long to link in one step, link piecewise. -+ $echo "creating reloadable object files..." -+ -+ # Save the value of $output and $libobjs because we want to -+ # use them later. If we have whole_archive_flag_spec, we -+ # want to use save_libobjs as it was before -+ # whole_archive_flag_spec was expanded, because we can't -+ # assume the linker understands whole_archive_flag_spec. -+ # This may have to be revisited, in case too many -+ # convenience libraries get linked in and end up exceeding -+ # the spec. -+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ fi -+ save_output=$output -+ -+ # Clear the reloadable object creation command queue and -+ # initialize k to one. -+ test_cmds= -+ concat_cmds= -+ objlist= -+ delfiles= -+ last_robj= -+ k=1 -+ output=$output_objdir/$save_output-${k}.$objext -+ # Loop over the list of objects to be linked. -+ for obj in $save_libobjs -+ do -+ eval test_cmds=\"$reload_cmds $objlist $last_robj\" -+ if test "X$objlist" = X || -+ { len=`expr "X$test_cmds" : ".*"` && -+ test "$len" -le "$max_cmd_len"; }; then -+ objlist="$objlist $obj" -+ else -+ # The command $test_cmds is almost too long, add a -+ # command to the queue. -+ if test "$k" -eq 1 ; then -+ # The first file doesn't have a previous command to add. -+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ else -+ # All subsequent reloadable object files will link in -+ # the last one created. -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" -+ fi -+ last_robj=$output_objdir/$save_output-${k}.$objext -+ k=`expr $k + 1` -+ output=$output_objdir/$save_output-${k}.$objext -+ objlist=$obj -+ len=1 -+ fi -+ done -+ # Handle the remaining objects by creating one last -+ # reloadable object file. All subsequent reloadable object -+ # files will link in the last one created. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ -+ if ${skipped_export-false}; then -+ $show "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $run $rm $export_symbols -+ libobjs=$output -+ # Append the command to create the export file. -+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" -+ fi -+ -+ # Set up a command to remove the reloadale object files -+ # after they are used. -+ i=0 -+ while test "$i" -lt "$k" -+ do -+ i=`expr $i + 1` -+ delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" -+ done -+ -+ $echo "creating a temporary reloadable object file: $output" -+ -+ # Loop through the commands generated above and execute them. -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $concat_cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ -+ libobjs=$output -+ # Restore the value of output. -+ output=$save_output -+ -+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ fi -+ # Expand the library linking commands again to reset the -+ # value of $libobjs for piecewise linking. -+ -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ cmds=$module_expsym_cmds -+ else -+ cmds=$module_cmds -+ fi -+ else -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ cmds=$archive_expsym_cmds -+ else -+ cmds=$archive_cmds -+ fi -+ fi -+ -+ # Append the command to remove the reloadable object files -+ # to the just-reset $cmds. -+ eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -2965,7 +4034,7 @@ - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -- exit 0 -+ exit $EXIT_SUCCESS - fi - - # Create links to the real library. -@@ -3013,7 +4082,7 @@ - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` -@@ -3042,38 +4111,10 @@ - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${obj}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test "$status" -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test "$status" -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- -- reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -@@ -3081,10 +4122,11 @@ - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" -- eval cmds=\"$reload_cmds\" -+ cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -3097,7 +4139,7 @@ - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then -@@ -3108,37 +4150,24 @@ - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. -- $show "echo timestamp > $libobj" -- $run eval "echo timestamp > $libobj" || exit $? -- exit 0 -+ # $show "echo timestamp > $libobj" -+ # $run eval "echo timestamp > $libobj" || exit $? -+ exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" -- eval cmds=\"$reload_cmds\" -+ cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" -- else -- # Just create a symlink. -- $show $rm $libobj -- $run $rm $libobj -- xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$libobj"; then -- xdir="." -- else -- xdir="$xdir" -- fi -- baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` -- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -- $show "(cd $xdir && $LN_S $oldobj $baseobj)" -- $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? - fi - - if test -n "$gentop"; then -@@ -3146,12 +4175,12 @@ - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - prog) - case $host in -- *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; -+ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -@@ -3176,6 +4205,16 @@ - ;; - esac - -+ case $host in -+ *darwin*) -+ # Don't allow lazy linking, it breaks C++ global constructors -+ if test "$tagname" = CXX ; then -+ compile_command="$compile_command ${wl}-bind_at_load" -+ finalize_command="$finalize_command ${wl}-bind_at_load" -+ fi -+ ;; -+ esac -+ - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - -@@ -3326,12 +4365,12 @@ - done - - if test -n "$exclude_expsyms"; then -- $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then -- $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - -@@ -3339,9 +4378,9 @@ - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" - $run $rm $export_symbols -- $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - else -- $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' -+ $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' - $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - fi -@@ -3349,8 +4388,8 @@ - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" -- name=`echo "$arg" | sed -e 's%^.*/%%'` -- $run eval 'echo ": $name " >> "$nlist"' -+ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` -+ $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - -@@ -3359,12 +4398,18 @@ - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then -- egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. -- if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then -+ if grep -v "^: " < "$nlist" | -+ if sort -k 3 /dev/null 2>&1; then -+ sort -k 3 -+ else -+ sort +2 -+ fi | -+ uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S -@@ -3373,7 +4418,7 @@ - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else -- echo '/* NONE */' >> "$output_objdir/$dlsyms" -+ $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ -@@ -3425,18 +4470,18 @@ - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; -+ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DPIC";; -+ *) pic_flag_for_symtable=" $pic_flag";; - esac - esac - - # Now compile the dynamic symbol file. -- $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -- $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -+ $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -+ $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" -@@ -3448,7 +4493,7 @@ - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - else -@@ -3536,7 +4581,7 @@ - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then -@@ -3591,10 +4636,10 @@ - fi - - # Quote $echo for shipping. -- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then -- case $0 in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; -- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; -+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then -+ case $progpath in -+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else -@@ -3606,15 +4651,230 @@ - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in -- *.exe) output=`echo $output|sed 's,.exe$,,'` ;; -+ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in -- *cygwin*) exeext=.exe ;; -+ *cygwin*) -+ exeext=.exe -+ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac -+ case $host in -+ *cygwin* | *mingw* ) -+ cwrappersource=`$echo ${objdir}/lt-${output}.c` -+ cwrapper=`$echo ${output}.exe` -+ $rm $cwrappersource $cwrapper -+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 -+ -+ cat > $cwrappersource <> $cwrappersource<<"EOF" -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if defined(PATH_MAX) -+# define LT_PATHMAX PATH_MAX -+#elif defined(MAXPATHLEN) -+# define LT_PATHMAX MAXPATHLEN -+#else -+# define LT_PATHMAX 1024 -+#endif -+ -+#ifndef DIR_SEPARATOR -+#define DIR_SEPARATOR '/' -+#endif -+ -+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -+ defined (__OS2__) -+#define HAVE_DOS_BASED_FILE_SYSTEM -+#ifndef DIR_SEPARATOR_2 -+#define DIR_SEPARATOR_2 '\\' -+#endif -+#endif -+ -+#ifndef DIR_SEPARATOR_2 -+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -+#else /* DIR_SEPARATOR_2 */ -+# define IS_DIR_SEPARATOR(ch) \ -+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -+#endif /* DIR_SEPARATOR_2 */ -+ -+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -+#define XFREE(stale) do { \ -+ if (stale) { free ((void *) stale); stale = 0; } \ -+} while (0) -+ -+const char *program_name = NULL; -+ -+void * xmalloc (size_t num); -+char * xstrdup (const char *string); -+char * basename (const char *name); -+char * fnqualify(const char *path); -+char * strendzap(char *str, const char *pat); -+void lt_fatal (const char *message, ...); -+ -+int -+main (int argc, char *argv[]) -+{ -+ char **newargz; -+ int i; -+ -+ program_name = (char *) xstrdup ((char *) basename (argv[0])); -+ newargz = XMALLOC(char *, argc+2); -+EOF -+ -+ cat >> $cwrappersource <> $cwrappersource <<"EOF" -+ newargz[1] = fnqualify(argv[0]); -+ /* we know the script has the same name, without the .exe */ -+ /* so make sure newargz[1] doesn't end in .exe */ -+ strendzap(newargz[1],".exe"); -+ for (i = 1; i < argc; i++) -+ newargz[i+1] = xstrdup(argv[i]); -+ newargz[argc+1] = NULL; -+EOF -+ -+ cat >> $cwrappersource <> $cwrappersource <<"EOF" -+} -+ -+void * -+xmalloc (size_t num) -+{ -+ void * p = (void *) malloc (num); -+ if (!p) -+ lt_fatal ("Memory exhausted"); -+ -+ return p; -+} -+ -+char * -+xstrdup (const char *string) -+{ -+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -+; -+} -+ -+char * -+basename (const char *name) -+{ -+ const char *base; -+ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ /* Skip over the disk name in MSDOS pathnames. */ -+ if (isalpha (name[0]) && name[1] == ':') -+ name += 2; -+#endif -+ -+ for (base = name; *name; name++) -+ if (IS_DIR_SEPARATOR (*name)) -+ base = name + 1; -+ return (char *) base; -+} -+ -+char * -+fnqualify(const char *path) -+{ -+ size_t size; -+ char *p; -+ char tmp[LT_PATHMAX + 1]; -+ -+ assert(path != NULL); -+ -+ /* Is it qualified already? */ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ if (isalpha (path[0]) && path[1] == ':') -+ return xstrdup (path); -+#endif -+ if (IS_DIR_SEPARATOR (path[0])) -+ return xstrdup (path); -+ -+ /* prepend the current directory */ -+ /* doesn't handle '~' */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ -+ p = XMALLOC(char, size); -+ sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); -+ return p; -+} -+ -+char * -+strendzap(char *str, const char *pat) -+{ -+ size_t len, patlen; -+ -+ assert(str != NULL); -+ assert(pat != NULL); -+ -+ len = strlen(str); -+ patlen = strlen(pat); -+ -+ if (patlen <= len) -+ { -+ str += len - patlen; -+ if (strcmp(str, pat) == 0) -+ *str = '\0'; -+ } -+ return str; -+} -+ -+static void -+lt_error_core (int exit_status, const char * mode, -+ const char * message, va_list ap) -+{ -+ fprintf (stderr, "%s: %s: ", program_name, mode); -+ vfprintf (stderr, message, ap); -+ fprintf (stderr, ".\n"); -+ -+ if (exit_status >= 0) -+ exit (exit_status); -+} -+ -+void -+lt_fatal (const char *message, ...) -+{ -+ va_list ap; -+ va_start (ap, message); -+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ va_end (ap); -+} -+EOF -+ # we should really use a build-platform specific compiler -+ # here, but OTOH, the wrappers (shell script and this C one) -+ # are only useful if you want to execute the "real" binary. -+ # Since the "real" binary is built for $host, then this -+ # wrapper might as well be built for $host, too. -+ $run $LTCC -s -o $cwrapper $cwrappersource -+ ;; -+ esac - $rm $output -- trap "$rm $output; exit 1" 1 2 15 -+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ - #! $SHELL -@@ -3630,12 +4890,12 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' -+Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - relink_command=\"$relink_command\" - -@@ -3668,7 +4928,7 @@ - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - -@@ -3681,7 +4941,7 @@ - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. -@@ -3690,12 +4950,12 @@ - " - - if test "$fast_install" = yes; then -- echo >> $output "\ -+ $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ -- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" -@@ -3706,7 +4966,7 @@ - $rm \"\$progdir/\$file\" - fi" - -- echo >> $output "\ -+ $echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then -@@ -3714,7 +4974,7 @@ - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -3724,13 +4984,13 @@ - $rm \"\$progdir/\$file\" - fi" - else -- echo >> $output "\ -+ $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" - " - fi - -- echo >> $output "\ -+ $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - -@@ -3761,14 +5021,6 @@ - # Run the actual program with our arguments. - " - case $host in -- # win32 systems need to use the prog path for dll -- # lookup to work -- *-*-cygwin* | *-*-pw32*) -- $echo >> $output "\ -- exec \$progdir/\$program \${1+\"\$@\"} --" -- ;; -- - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ -@@ -3778,30 +5030,26 @@ - - *) - $echo >> $output "\ -- # Export the path to the program. -- PATH=\"\$progdir:\$PATH\" -- export PATH -- -- exec \$program \${1+\"\$@\"} -+ exec \$progdir/\$program \${1+\"\$@\"} - " - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -- exit 1 -+ exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 -- echo \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit 1 -+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit $EXIT_FAILURE - fi - fi\ - " - chmod +x $output - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - esac - -@@ -3817,74 +5065,86 @@ - oldobjs="$libobjs_save" - build_libtool_libs=no - else -- oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` -+ oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test "$status" -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- # Add in members from convenience archives. -- for xlib in $addlibs; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test "$status" -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- -- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -- eval cmds=\"$old_archive_from_new_cmds\" -+ cmds=$old_archive_from_new_cmds - else -- # Ensure that we have .o objects in place in case we decided -- # not to build a shared library, and have fallen back to building -- # static libs even though --disable-static was passed! -- for oldobj in $oldobjs; do -- if test ! -f $oldobj; then -- xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$oldobj"; then -- xdir="." -+ eval cmds=\"$old_archive_cmds\" -+ -+ if len=`expr "X$cmds" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ cmds=$old_archive_cmds -+ else -+ # the command line is too long to link in one step, link in parts -+ $echo "using piecewise archive linking..." -+ save_RANLIB=$RANLIB -+ RANLIB=: -+ objlist= -+ concat_cmds= -+ save_oldobjs=$oldobjs -+ # GNU ar 2.10+ was changed to match POSIX; thus no paths are -+ # encoded into archives. This makes 'ar r' malfunction in -+ # this piecewise linking case whenever conflicting object -+ # names appear in distinct ar calls; check, warn and compensate. -+ if (for obj in $save_oldobjs -+ do -+ $echo "X$obj" | $Xsed -e 's%^.*/%%' -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 -+ $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 -+ AR_FLAGS=cq -+ fi -+ # Is there a better way of finding the last object in the list? -+ for obj in $save_oldobjs -+ do -+ last_oldobj=$obj -+ done -+ for obj in $save_oldobjs -+ do -+ oldobjs="$objlist $obj" -+ objlist="$objlist $obj" -+ eval test_cmds=\"$old_archive_cmds\" -+ if len=`expr "X$test_cmds" : ".*"` && -+ test "$len" -le "$max_cmd_len"; then -+ : - else -- xdir="$xdir" -+ # the above command should be used before it gets too long -+ oldobjs=$objlist -+ if test "$obj" = "$last_oldobj" ; then -+ RANLIB=$save_RANLIB -+ fi -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -+ objlist= - fi -- baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` -- obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` -- $show "(cd $xdir && ${LN_S} $obj $baseobj)" -- $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? -+ done -+ RANLIB=$save_RANLIB -+ oldobjs=$objlist -+ if test "X$oldobjs" = "X" ; then -+ eval cmds=\"\$concat_cmds\" -+ else -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi -- done -- -- eval cmds=\"$old_archive_cmds\" -+ fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do -+ eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? -@@ -3916,8 +5176,12 @@ - fi - done - # Quote the link command for shipping. -- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" -+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ if test "$hardcode_automatic" = yes ; then -+ relink_command= -+ fi -+ - - # Only create the output if not a dry run. - if test -z "$run"; then -@@ -3933,24 +5197,65 @@ - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE -+ fi -+ # We do not want portage's install root ($D) present. Check only for -+ # this if the .la is being installed. -+ if test "$installed" = yes && test "$D"; then -+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'` -+ else -+ mynewdependency_lib="$libdir/$name" -+ fi -+ # Do not add duplicates -+ if test "$mynewdependency_lib"; then -+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` -+ if test -z "$my_little_ninja_foo_1"; then -+ newdependency_libs="$newdependency_libs $mynewdependency_lib" -+ fi -+ fi -+ ;; -+ *) -+ if test "$installed" = yes; then -+ # Rather use S=WORKDIR if our version of portage supports it. -+ # This is because some ebuild (gcc) do not use $S as buildroot. -+ if test "$PWORKDIR"; then -+ S="$PWORKDIR" -+ fi -+ # We do not want portage's build root ($S) present. -+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" -+ # We do not want portage's install root ($D) present. -+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` -+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then -+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'` -+ else -+ mynewdependency_lib="$deplib" -+ fi -+ else -+ mynewdependency_lib="$deplib" -+ fi -+ # Do not add duplicates -+ if test "$mynewdependency_lib"; then -+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` -+ if test -z "$my_little_ninja_foo_4"; then -+ newdependency_libs="$newdependency_libs $mynewdependency_lib" -+ fi - fi -- newdependency_libs="$newdependency_libs $libdir/$name" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done -@@ -3958,21 +5263,44 @@ - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" -+ else -+ newdlfiles= -+ for lib in $dlfiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlfiles="$newdlfiles $abs" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlprefiles="$newdlprefiles $abs" -+ done -+ dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac -+ # Do not add duplicates -+ if test "$installed" = yes && test "$D"; then -+ install_libdir=`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'` -+ fi - $echo > $output "\ - # $outputname - a libtool library file - # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -@@ -4000,6 +5328,9 @@ - # Is this an already installed library? - installed=$installed - -+# Should we warn about portability when linking against -modules? -+shouldnotlink=$module -+ - # Files to dlopen/dlpreopen - dlopen='$dlfiles' - dlpreopen='$dlprefiles' -@@ -4019,7 +5350,7 @@ - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - # libtool install mode -@@ -4108,13 +5439,13 @@ - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -z "$files"; then -@@ -4124,7 +5455,7 @@ - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. -@@ -4145,7 +5476,7 @@ - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - case $destdir in -@@ -4157,7 +5488,7 @@ - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -4182,11 +5513,11 @@ - - *.la) - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - library_names= -@@ -4218,21 +5549,24 @@ - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` -+ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. -+ # At present, this check doesn't affect windows .dll's that -+ # are installed into $libdir/../bin (currently, that works fine) -+ # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -- relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else -- relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` -+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 -@@ -4240,7 +5574,7 @@ - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -4275,10 +5609,11 @@ - - # Do each command in the postinstall commands. - lib="$destdir/$realname" -- eval cmds=\"$postinstall_cmds\" -+ cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -4318,7 +5653,7 @@ - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -4336,7 +5671,7 @@ - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - *) -@@ -4348,21 +5683,49 @@ - destfile="$destdir/$destfile" - fi - -+ # If the file is missing, and there is a .exe on the end, strip it -+ # because it is most likely a libtool script we actually want to -+ # install -+ stripped_ext="" -+ case $file in -+ *.exe) -+ if test ! -f "$file"; then -+ file=`$echo $file|${SED} 's,.exe$,,'` -+ stripped_ext=".exe" -+ fi -+ ;; -+ esac -+ - # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ case $host in -+ *cygwin*|*mingw*) -+ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` -+ ;; -+ *) -+ wrapper=$file -+ ;; -+ esac -+ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - -+ # To insure that "foo" is sourced, and not "foo.exe", -+ # finese the cygwin/MSYS system by explicitly sourcing "foo." -+ # which disallows the automatic-append-.exe behavior. -+ case $build in -+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; -+ *) wrapperdot=${wrapper} ;; -+ esac - # If there is no directory component, then add one. - case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -+ */* | *\\*) . ${wrapperdot} ;; -+ *) . ./${wrapperdot} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then -- $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 -- exit 1 -+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 -+ exit $EXIT_FAILURE - fi - - finalize=yes -@@ -4384,10 +5747,17 @@ - done - - relink_command= -+ # To insure that "foo" is sourced, and not "foo.exe", -+ # finese the cygwin/MSYS system by explicitly sourcing "foo." -+ # which disallows the automatic-append-.exe behavior. -+ case $build in -+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; -+ *) wrapperdot=${wrapper} ;; -+ esac - # If there is no directory component, then add one. - case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -+ */* | *\\*) . ${wrapperdot} ;; -+ *) . ./${wrapperdot} ;; - esac - - outputname= -@@ -4395,17 +5765,17 @@ - if test "$finalize" = yes && test -z "$run"; then - tmpdir="/tmp" - test -n "$TMPDIR" && tmpdir="$TMPDIR" -- tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` -- if test $? = 0 ; then : -- else -- tmpdir="$tmpdir/libtool-$$" -- fi -- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : -+ tmpdir="$tmpdir/libtool-$$" -+ save_umask=`umask` -+ umask 0077 -+ if $mkdir "$tmpdir"; then -+ umask $save_umask - else -+ umask $save_umask - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue - fi -- file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -@@ -4423,14 +5793,14 @@ - fi - else - # Install the binary that we compiled earlier. -- file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyways - case $install_prog,$host in -- /usr/bin/install*,*cygwin*) -+ */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok -@@ -4439,7 +5809,7 @@ - destfile=$destfile.exe - ;; - *:*.exe) -- destfile=`echo $destfile | sed -e 's,.exe$,,'` -+ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; -@@ -4460,16 +5830,17 @@ - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - -- if test -n "$stripme" && test -n "$striplib"; then -+ if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. -- eval cmds=\"$old_postinstall_cmds\" -+ cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -4483,9 +5854,9 @@ - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" -- exec_cmd='$SHELL $0 --finish$current_libdirs' -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -4504,10 +5875,11 @@ - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -- eval cmds=\"$finish_cmds\" -+ cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" -@@ -4524,43 +5896,43 @@ - fi - - # Exit here if they wanted silent mode. -- test "$show" = : && exit 0 -+ test "$show" = : && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -+ $echo "----------------------------------------------------------------------" -+ $echo "Libraries have been installed in:" - for libdir in $libdirs; do -- echo " $libdir" -+ $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:" -+ $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" -+ $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" -+ $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" -+ $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -+ $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'" -+ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" -- exit 0 -+ $echo -+ $echo "See any operating system documentation about shared libraries for" -+ $echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ $echo "----------------------------------------------------------------------" -+ exit $EXIT_SUCCESS - ;; - - # libtool execute mode -@@ -4572,7 +5944,7 @@ - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. -@@ -4580,18 +5952,18 @@ - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Read the libtool library. -@@ -4618,7 +5990,7 @@ - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - ;; - -@@ -4658,7 +6030,7 @@ - -*) ;; - *) - # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; -@@ -4681,7 +6053,7 @@ - eval "export $shlibpath_var" - fi - -- # Restore saved enviroment variables -+ # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi -@@ -4698,7 +6070,7 @@ - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -4726,18 +6098,19 @@ - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - rmdirs= - -+ origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. -- objdir="$objdir" -+ objdir="$origobjdir" - else -- objdir="$dir/$objdir" -+ objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" -@@ -4767,7 +6140,7 @@ - case $name in - *.la) - # Possibly a libtool archive, so verify it. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. -@@ -4780,10 +6153,11 @@ - if test "$mode" = uninstall; then - if test -n "$library_names"; then - # Do each command in the postuninstall commands. -- eval cmds=\"$postuninstall_cmds\" -+ cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then -@@ -4795,10 +6169,11 @@ - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. -- eval cmds=\"$old_postuninstall_cmds\" -+ cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then -@@ -4813,22 +6188,52 @@ - ;; - - *.lo) -- if test "$build_old_libs" = yes; then -- oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` -- rmfiles="$rmfiles $dir/$oldobj" -+ # Possibly a libtool object, so verify it. -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ -+ # Read the .lo file -+ . $dir/$name -+ -+ # 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" -+ 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" -+ fi - fi - ;; - - *) -- # Do a test to see if this is a libtool program. -- if test "$mode" = clean && -- (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- relink_command= -- . $dir/$file -+ if test "$mode" = clean ; then -+ noexename=$name -+ case $file in -+ *.exe) -+ file=`$echo $file|${SED} 's,.exe$,,'` -+ noexename=`$echo $name|${SED} 's,.exe$,,'` -+ # $file with .exe has already been added to rmfiles, -+ # add $file without .exe -+ rmfiles="$rmfiles $file" -+ ;; -+ esac -+ # Do a test to see if this is a libtool program. -+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ relink_command= -+ . $dir/$noexename - -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -- if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ # 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}" -+ if test "$fast_install" = yes && test -n "$relink_command"; then -+ rmfiles="$rmfiles $objdir/lt-$name" -+ fi -+ if test "X$noexename" != "X$name" ; then -+ rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ fi - fi - fi - ;; -@@ -4836,6 +6241,7 @@ - $show "$rm $rmfiles" - $run $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 -@@ -4851,20 +6257,20 @@ - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi # test -z "$show_help" - - if test -n "$exec_cmd"; then - eval exec $exec_cmd -- exit 1 -+ exit $EXIT_FAILURE - fi - - # We need to display help for each of the modes. -@@ -4883,6 +6289,7 @@ - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages -+ --tag=TAG use configuration variables from tag TAG - --version print version information - - MODE must be one of the following: -@@ -4896,8 +6303,10 @@ - uninstall remove libraries from an installed directory - - MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for --a more detailed description of MODE." -- exit 0 -+a more detailed description of MODE. -+ -+Report bugs to ." -+ exit $EXIT_SUCCESS - ;; - - clean) -@@ -5008,6 +6417,9 @@ - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -+ -objectlist FILE Use a list of object files found in FILE to specify objects -+ -precious-files-regex REGEX -+ don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -@@ -5049,14 +6461,34 @@ - *) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - --echo -+$echo - $echo "Try \`$modename --help' for more information about other modes." - --exit 0 -+exit $EXIT_SUCCESS -+ -+# The TAGs below are defined such that we never get into a situation -+# in which we disable both kinds of libraries. Given conflicting -+# choices, we go for a static library, that is the most portable, -+# since we can't tell whether shared libraries were disabled because -+# the user asked for that or because the platform doesn't support -+# them. This is particularly important on AIX, because we don't -+# support having both static and shared libraries enabled at the same -+# time on that platform, so we default to a shared-only configuration. -+# If a disable-shared tag is given, we'll fallback to a static-only -+# configuration. But we'll never go from static-only to shared-only. -+ -+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -+build_libtool_libs=no -+build_old_libs=yes -+# ### END LIBTOOL TAG CONFIG: disable-shared -+ -+# ### BEGIN LIBTOOL TAG CONFIG: disable-static -+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` -+# ### END LIBTOOL TAG CONFIG: disable-static - - # Local Variables: - # mode:shell-script -diff -Naur libodbc++-0.2.3/m4/ac_check_odbc.m4 libodbc++-0.2.3-20050404/m4/ac_check_odbc.m4 ---- libodbc++-0.2.3/m4/ac_check_odbc.m4 2003-04-14 10:38:31.000000000 +0200 -+++ libodbc++-0.2.3-20050404/m4/ac_check_odbc.m4 2003-12-02 12:31:49.000000000 +0100 -@@ -13,7 +13,7 @@ - fi - odbc_libraries_dir="$odbc_dir/lib" - odbc_includes_dir="$odbc_dir/include" --]) -+], [ odbc_dir=yes ] ) - - AC_ARG_WITH(odbc-includes, - [ --with-odbc-includes=DIR Find unixODBC headers in DIR], -@@ -25,27 +25,31 @@ - [odbc_libraries_dir=$withval] - ) - --save_CPPFLAGS="$CPPFLAGS" --save_LIBS="$LIBS" -- --if test "x$odbc_includes_dir" != "x" -a "x$odbc_includes_dir" != "x/usr/include" --then -- CPPFLAGS="$CPPFLAGS -I$odbc_includes_dir" --fi -- --if test "x$odbc_libraries_dir" != "x" --then -- LIBS="$LIBS -L$odbc_libraries_dir" --fi -- --AC_CHECK_HEADERS([sql.h sqlext.h sqlucode.h], --[odbc_ok=yes; odbc_headers="$odbc_headers $ac_hdr"], --[odbc_ok=no; break] --) -- --if test "x$odbc_ok" = "xyes" --then -- AC_CHECK_LIB(odbc,SQLConnect,[odbc_ok=yes],[odbc_ok=no]) -+if test "x$odbc_dir" != "xno"; then -+ save_CPPFLAGS="$CPPFLAGS" -+ save_LIBS="$LIBS" -+ -+ if test "x$odbc_includes_dir" != "x" -a "x$odbc_includes_dir" != "x/usr/include" -+ then -+ CPPFLAGS="$CPPFLAGS -I$odbc_includes_dir" -+ fi -+ -+ if test "x$odbc_libraries_dir" != "x" -+ then -+ LIBS="$LIBS -L$odbc_libraries_dir" -+ fi -+ -+ AC_CHECK_HEADERS([sql.h sqlext.h sqlucode.h], -+ [odbc_ok=yes; odbc_headers="$odbc_headers $ac_hdr"], -+ [odbc_ok=no; break] -+ ) -+ -+ if test "x$odbc_ok" = "xyes" -+ then -+ AC_CHECK_LIB(odbc,SQLConnect,[odbc_ok=yes],[odbc_ok=no]) -+ fi -+else -+ odbc_ok=no - fi - - AC_MSG_CHECKING([whether unixODBC should be used]) -diff -Naur libodbc++-0.2.3/Makefile.in libodbc++-0.2.3-20050404/Makefile.in ---- libodbc++-0.2.3/Makefile.in 2003-06-17 12:20:50.000000000 +0200 -+++ libodbc++-0.2.3-20050404/Makefile.in 2005-04-04 18:21:09.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,92 +32,146 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - SUBDIRS = \ -@@ -151,15 +205,16 @@ - DATA = $(pkgconf_DATA) - - --RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ -- uninstall-info-recursive all-recursive install-data-recursive \ -- install-exec-recursive installdirs-recursive install-recursive \ -- uninstall-recursive check-recursive installcheck-recursive --DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -- Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \ -- config.guess config.h.in config.sub configure configure.ac \ -- depcomp install-sh libodbc++.pc.in libodbc++.spec.in ltconfig \ -- ltmain.sh missing mkinstalldirs -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ -+ COPYING ChangeLog INSTALL Makefile.am NEWS THANKS TODO \ -+ acinclude.m4 aclocal.m4 config.guess config.h.in config.sub \ -+ configure configure.ac depcomp install-sh libodbc++.pc.in \ -+ libodbc++.spec.in ltmain.sh missing mkinstalldirs - DIST_SUBDIRS = $(SUBDIRS) - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -285,10 +340,17 @@ - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done - - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -304,9 +366,15 @@ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ else \ -+ include_option=--include; \ -+ fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ -+ test -f $$subdir/TAGS && \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -@@ -319,13 +387,28 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = . -@@ -337,13 +420,20 @@ - && rm -fr $(distdir); }; } - - GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print - - distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/m4 -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -377,7 +467,7 @@ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="${top_distdir}" distdir="$(distdir)" \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -@@ -399,12 +489,13 @@ - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - - chmod -R a-w $(distdir); chmod a+w $(distdir) -- mkdir $(distdir)/=build -- mkdir $(distdir)/=inst -+ mkdir $(distdir)/_build -+ mkdir $(distdir)/_inst - chmod a-w $(distdir) -- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ -- && cd $(distdir)/=build \ -- && ../configure --srcdir=.. --prefix=$$dc_install_base \ -+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -+ && cd $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ -@@ -412,23 +503,39 @@ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -- && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ -- || { echo "ERROR: files left after uninstall:" ; \ -- find $$dc_install_base -type f -print ; \ -- exit 1; } >&2 ) \ -+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ -+ distuninstallcheck \ -+ && chmod -R a-w "$$dc_install_base" \ -+ && ({ \ -+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ -+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ -+ && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' -+distuninstallcheck: -+ @cd $(distuninstallcheck_dir) \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ if test -n "$(DESTDIR)"; then \ -+ echo " (check DESTDIR support)"; \ -+ fi ; \ -+ $(distuninstallcheck_listfiles) ; \ -+ exit 1; } >&2 - distcleancheck: distclean -- if test '$(srcdir)' = . ; then \ -+ @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi -- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -- || { echo "ERROR: files left after distclean:" ; \ -+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 - check-am: all-am -@@ -449,7 +556,7 @@ - installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -457,7 +564,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -468,6 +575,7 @@ - - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ - distclean-tags - -@@ -491,22 +599,32 @@ - - maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -- -rm -rf autom4te.cache -+ -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ - uninstall-am: uninstall-info-am uninstall-pkgconfDATA - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive dist dist-all \ -- dist-gzip distcheck distclean distclean-generic distclean-hdr \ -- distclean-libtool distclean-recursive distclean-tags \ -- distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive dist dist-all dist-gzip distcheck distclean \ -+ distclean-generic distclean-hdr distclean-libtool \ -+ distclean-recursive distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ -@@ -515,7 +633,8 @@ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-pkgconfDATA \ - uninstall-recursive -diff -Naur libodbc++-0.2.3/missing libodbc++-0.2.3-20050404/missing ---- libodbc++-0.2.3/missing 2003-03-28 16:57:10.000000000 +0100 -+++ libodbc++-0.2.3-20050404/missing 2005-04-04 18:10:27.000000000 +0200 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Common stub for a few missing GNU programs while installing. --# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. - # Originally by Fran,cois Pinard , 1996. - - # This program is free software; you can redistribute it and/or modify -@@ -165,7 +165,7 @@ - WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. -- You can get \`$1Help2man' as part of \`Autoconf' from any GNU -+ You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` -@@ -326,7 +326,7 @@ - WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, -- it often tells you about the needed prerequirements for installing -+ it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 -diff -Naur libodbc++-0.2.3/mkinstalldirs libodbc++-0.2.3-20050404/mkinstalldirs ---- libodbc++-0.2.3/mkinstalldirs 2003-03-28 16:57:10.000000000 +0100 -+++ libodbc++-0.2.3-20050404/mkinstalldirs 2005-04-04 18:10:27.000000000 +0200 -@@ -4,8 +4,6 @@ - # Created: 1993-05-16 - # Public domain - --# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ -- - errstatus=0 - dirmode="" - -@@ -14,18 +12,29 @@ - - # process command line arguments - while test $# -gt 0 ; do -- case "${1}" in -- -h | --help | --h* ) # -h for help -- echo "${usage}" 1>&2; exit 0 ;; -- -m ) # -m PERM arg -- shift -- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } -- dirmode="${1}" -- shift ;; -- -- ) shift; break ;; # stop option processing -- -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option -- * ) break ;; # first non-opt arg -- esac -+ case $1 in -+ -h | --help | --h*) # -h for help -+ echo "$usage" 1>&2 -+ exit 0 -+ ;; -+ -m) # -m PERM arg -+ shift -+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } -+ dirmode=$1 -+ shift -+ ;; -+ --) # stop option processing -+ shift -+ break -+ ;; -+ -*) # unknown option -+ echo "$usage" 1>&2 -+ exit 1 -+ ;; -+ *) # first non-opt arg -+ break -+ ;; -+ esac - done - - for file -@@ -38,64 +47,65 @@ - done - - case $# in --0) exit 0 ;; -+ 0) exit 0 ;; - esac - - case $dirmode in --'') -- if mkdir -p -- . 2>/dev/null; then -- echo "mkdir -p -- $*" -- exec mkdir -p -- "$@" -- fi ;; --*) -- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then -- echo "mkdir -m $dirmode -p -- $*" -- exec mkdir -m "$dirmode" -p -- "$@" -- fi ;; -+ '') -+ if mkdir -p -- . 2>/dev/null; then -+ echo "mkdir -p -- $*" -+ exec mkdir -p -- "$@" -+ fi -+ ;; -+ *) -+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then -+ echo "mkdir -m $dirmode -p -- $*" -+ exec mkdir -m "$dirmode" -p -- "$@" -+ fi -+ ;; - esac - - for file - do -- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` -- shift -+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` -+ shift - -- pathcomp= -- for d -- do -- pathcomp="$pathcomp$d" -- case "$pathcomp" in -- -* ) pathcomp=./$pathcomp ;; -- esac -- -- if test ! -d "$pathcomp"; then -- echo "mkdir $pathcomp" -- -- mkdir "$pathcomp" || lasterr=$? -- -- if test ! -d "$pathcomp"; then -- errstatus=$lasterr -- else -- if test ! -z "$dirmode"; then -- echo "chmod $dirmode $pathcomp" -- -- lasterr="" -- chmod "$dirmode" "$pathcomp" || lasterr=$? -- -- if test ! -z "$lasterr"; then -- errstatus=$lasterr -- fi -- fi -- fi -- fi -+ pathcomp= -+ for d -+ do -+ pathcomp="$pathcomp$d" -+ case $pathcomp in -+ -*) pathcomp=./$pathcomp ;; -+ esac -+ -+ if test ! -d "$pathcomp"; then -+ echo "mkdir $pathcomp" -+ -+ mkdir "$pathcomp" || lasterr=$? -+ -+ if test ! -d "$pathcomp"; then -+ errstatus=$lasterr -+ else -+ if test ! -z "$dirmode"; then -+ echo "chmod $dirmode $pathcomp" -+ lasterr="" -+ chmod "$dirmode" "$pathcomp" || lasterr=$? -+ -+ if test ! -z "$lasterr"; then -+ errstatus=$lasterr -+ fi -+ fi -+ fi -+ fi - -- pathcomp="$pathcomp/" -- done -+ pathcomp="$pathcomp/" -+ done - done - - exit $errstatus - - # Local Variables: - # mode: shell-script --# sh-indentation: 3 -+# sh-indentation: 2 - # End: - # mkinstalldirs ends here -diff -Naur libodbc++-0.2.3/NEWS libodbc++-0.2.3-20050404/NEWS ---- libodbc++-0.2.3/NEWS 2003-06-17 12:08:02.000000000 +0200 -+++ libodbc++-0.2.3-20050404/NEWS 2003-06-19 13:24:16.000000000 +0200 -@@ -1,3 +1,7 @@ -+* News in version 0.2.3 -+ -+ * Fixed compilation with Borland C++ Builder -+ - * News in version 0.2.3pre4 - - * Fix time_t support in MSVC++ builds -diff -Naur libodbc++-0.2.3/qtsql++/Makefile.in libodbc++-0.2.3-20050404/qtsql++/Makefile.in ---- libodbc++-0.2.3/qtsql++/Makefile.in 2003-06-17 12:20:51.000000000 +0200 -+++ libodbc++-0.2.3-20050404/qtsql++/Makefile.in 2005-04-04 18:21:24.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,101 +32,154 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ @QT_DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - - INCLUDES = @INCLUDES@ $(QT_INCLUDES) -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - @BUILD_QTSQLXX_TRUE@bin_PROGRAMS = qtsql++ - @BUILD_QTSQLXX_FALSE@EXTRA_PROGRAMS = qtsql++ -+@THREADS_FALSE@thelib = ../src/libodbc++_qt.la - - @THREADS_TRUE@thelib = ../src/libodbc++_qt-mt.la --@THREADS_FALSE@thelib = ../src/libodbc++_qt.la --DEFS = @DEFS@ @QT_DEFS@ - - MOCS = \ - mainwindow.moc.cpp \ -@@ -152,6 +205,7 @@ - - CLEANFILES = $(MOCS) - subdir = qtsql++ -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -@@ -170,10 +224,8 @@ - @THREADS_TRUE@qtsql___DEPENDENCIES = ../src/libodbc++_qt-mt.la - @THREADS_FALSE@qtsql___DEPENDENCIES = ../src/libodbc++_qt.la - qtsql___LDFLAGS = -+ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/connectwindow.Po \ -@@ -190,8 +242,6 @@ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXFLAGS = @CXXFLAGS@ --CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -200,7 +250,7 @@ - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(dist_qtsql___SOURCES) --DIST_COMMON = Makefile.am Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - SOURCES = $(dist_qtsql___SOURCES) $(nodist_qtsql___SOURCES) - - all: all-am -@@ -223,7 +273,7 @@ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ - else :; fi; \ - done - -@@ -259,27 +309,38 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resultwindow.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resultwindow.moc.Po@am__quote@ - --distclean-depend: -- -rm -rf ./$(DEPDIR) -- - .cpp.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< --CXXDEPMODE = @CXXDEPMODE@ -+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -294,6 +355,9 @@ - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -319,20 +383,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -358,7 +443,6 @@ - - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -370,7 +454,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -379,7 +463,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -389,9 +473,10 @@ - clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -412,7 +497,8 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -420,19 +506,27 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-binPROGRAMS uninstall-info-am - --.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ -- clean-generic clean-libtool distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-binPROGRAMS install-data install-data-am \ -- install-exec install-exec-am install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool tags uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-info-am -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ -+ clean-generic clean-libtool ctags distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am info info-am install install-am install-binPROGRAMS \ -+ install-data install-data-am install-exec install-exec-am \ -+ install-info install-info-am install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am uninstall-binPROGRAMS \ -+ uninstall-info-am - - - %.moc.cpp : %.h -diff -Naur libodbc++-0.2.3/src/datastream.h libodbc++-0.2.3-20050404/src/datastream.h ---- libodbc++-0.2.3/src/datastream.h 2003-04-21 18:28:38.000000000 +0200 -+++ libodbc++-0.2.3-20050404/src/datastream.h 2003-12-16 11:45:14.000000000 +0100 -@@ -63,7 +63,7 @@ - return 0; - } - -- virtual int showmanyc() { -+ virtual std::streamsize showmanyc() { - if(this->gptr() < this->egptr()) { - return this->egptr() - this->gptr(); - } -diff -Naur libodbc++-0.2.3/src/drivermanager.cpp libodbc++-0.2.3-20050404/src/drivermanager.cpp ---- libodbc++-0.2.3/src/drivermanager.cpp 2001-06-12 12:38:31.000000000 +0200 -+++ libodbc++-0.2.3-20050404/src/drivermanager.cpp 2005-02-27 23:37:23.000000000 +0100 -@@ -1,18 +1,18 @@ --/* -+/* - This file is part of libodbc++. -- -+ - Copyright (C) 1999-2000 Manush Dodunekov -- -+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. -- -+ - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. -- -+ - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -@@ -35,46 +35,60 @@ - int DriverManager::loginTimeout_=-1; - - --// Note: this will probably not work in all cases, -+// Note: this will probably not work in all cases, - // static constructors are known to cause problems - - #ifdef ODBCXX_ENABLE_THREADS - --static odbc::Mutex DMAccess; -+#define DMAccess DMAccessMutex() - --#endif /* ODBCXX_ENABLE_THREADS */ -+odbc::Mutex & DMAccessMutex(bool shutdown=0) -+{ -+ static odbc::Mutex* mtx = new odbc::Mutex(); -+ if ( shutdown ) { -+ delete mtx; -+ mtx = 0; -+ } -+ return *mtx; -+} - -+#endif /* ODBCXX_ENABLE_THREADS */ - - void DriverManager::shutdown() - { -- ODBCXX_LOCKER(DMAccess); -+ { -+ ODBCXX_LOCKER(DMAccess); - -- if(henv_!=SQL_NULL_HENV) { -+ if(henv_!=SQL_NULL_HENV) { - -- SQLRETURN r=ODBC3_C -- (SQLFreeHandle(SQL_HANDLE_ENV, henv_), -- SQLFreeEnv(henv_)); -- -- switch(r) { -- case SQL_SUCCESS: -- break; -- -- case SQL_INVALID_HANDLE: -- // the check above should prevent this -- assert(false); -- break; -- -- case SQL_ERROR: -- // try to obtain an error description -- eh_->_checkEnvError(henv_, r, "Failed to shutdown DriverManager"); -- break; -- } -+ SQLRETURN r=ODBC3_C -+ (SQLFreeHandle(SQL_HANDLE_ENV, henv_), -+ SQLFreeEnv(henv_)); -+ -+ switch(r) { -+ case SQL_SUCCESS: -+ break; -+ -+ case SQL_INVALID_HANDLE: -+ // the check above should prevent this -+ assert(false); -+ break; -+ -+ case SQL_ERROR: -+ // try to obtain an error description -+ eh_->_checkEnvError(henv_, r, "Failed to shutdown DriverManager"); -+ break; -+ } - -- henv_=SQL_NULL_HENV; -- //if henv_ was valid, so is eh_ -- delete eh_; -- eh_=NULL; -+ henv_=SQL_NULL_HENV; -+ //if henv_ was valid, so is eh_ -+ delete eh_; -+ eh_=NULL; -+ } - } -+ -+ // remove the mutex as we can't rely on static destructors -+ DMAccessMutex(1); - } - - -@@ -129,7 +143,7 @@ - { - SQLHDBC hdbc; - SQLRETURN r; -- -+ - //allocate a handle - r= - #if ODBCVER >= 0x0300 -@@ -140,21 +154,21 @@ - ; - - eh_->_checkEnvError(henv_,r,"Failed to allocate connection handle"); -- -+ - Connection* con=new Connection(hdbc); - { - ODBCXX_LOCKER(DMAccess); //since we read loginTimeout_ -- -+ - //apply the login timeout. -1 means do-not-touch (the default) - if(loginTimeout_>-1) { -- -+ - con->_setNumericOption( - #if ODBCVER < 0x0300 - SQL_LOGIN_TIMEOUT - #else - SQL_ATTR_LOGIN_TIMEOUT - #endif -- -+ - ,(SQLUINTEGER)loginTimeout_); - } - } // end of lock scope -@@ -189,10 +203,10 @@ - DataSourceList* DriverManager::getDataSources() - { - DriverManager::_checkInit(); -- -+ - SQLRETURN r; - SQLSMALLINT dsnlen,desclen; -- -+ - DataSourceList* l=new DataSourceList(); - - char dsn[SQL_MAX_DSN_LENGTH+1]; -@@ -208,12 +222,12 @@ - (SQLCHAR*)desc, - 256, - &desclen); -- -+ - eh_->_checkEnvError(henv_,r,"Failed to obtain a list of datasources"); -- -+ - while(r==SQL_SUCCESS || r==SQL_SUCCESS_WITH_INFO) { - l->insert(l->end(),new DataSource(dsn,desc)); -- -+ - r=SQLDataSources(henv_, - SQL_FETCH_NEXT, - (SQLCHAR*)dsn, -@@ -222,7 +236,7 @@ - (SQLCHAR*)desc, - 256, - &desclen); -- -+ - eh_->_checkEnvError(henv_,r,"Failed to obtain a list of datasources"); - } - } // lock scope end -@@ -230,7 +244,7 @@ - } - - #define MAX_DESC_LEN 64 --#define MAX_ATTR_LEN 1024 -+#define MAX_ATTR_LEN 1024 - - DriverList* DriverManager::getDrivers() - { -@@ -239,7 +253,7 @@ - SQLRETURN r; - DriverList* l=new DriverList(); - -- -+ - char desc[MAX_DESC_LEN]; - char attrs[MAX_ATTR_LEN]; - -@@ -255,13 +269,13 @@ - (SQLCHAR*)attrs, - MAX_ATTR_LEN, - &alen); -- -+ - eh_->_checkEnvError(henv_,r,"Failed to obtain a list of drivers"); -- -+ - while(r==SQL_SUCCESS || r==SQL_SUCCESS_WITH_INFO) { - vector attr; - unsigned int i=0, last=0; -- -+ - //find our attributes - if(attrs[0]!=0) { - do { -@@ -270,10 +284,10 @@ - last=i+1; - } while(attrs[last]!=0); - } -- -+ - Driver* d=new Driver(desc,attr); - l->insert(l->end(),d); -- -+ - r=SQLDrivers(henv_, - SQL_FETCH_NEXT, - (SQLCHAR*)desc, -@@ -282,10 +296,10 @@ - (SQLCHAR*)attrs, - MAX_ATTR_LEN, - &alen); -- -+ - eh_->_checkEnvError(henv_,r,"Failed to obtain a list of drivers"); - } - } // lock scope end -- -+ - return l; - } -diff -Naur libodbc++-0.2.3/src/Makefile.in libodbc++-0.2.3-20050404/src/Makefile.in ---- libodbc++-0.2.3/src/Makefile.in 2003-06-17 12:20:52.000000000 +0200 -+++ libodbc++-0.2.3-20050404/src/Makefile.in 2005-04-04 18:21:23.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,92 +32,149 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+ -+ -+# confusing conditionals follow -+DEFS = @DEFS@ @QT_DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ @QT_INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - sources = \ -@@ -143,15 +200,14 @@ - - ldflags = -version-info @lib_version@ - -- --# confusing conditionals follow --DEFS = @DEFS@ @QT_DEFS@ -- - @QT_FALSE@@THREADS_TRUE@lib_LTLIBRARIES = libodbc++-mt.la --@QT_FALSE@@THREADS_FALSE@lib_LTLIBRARIES = libodbc++.la -+ - @QT_TRUE@@THREADS_TRUE@lib_LTLIBRARIES = libodbc++_qt-mt.la -+ - @QT_TRUE@@THREADS_FALSE@lib_LTLIBRARIES = libodbc++_qt.la - -+@QT_FALSE@@THREADS_FALSE@lib_LTLIBRARIES = libodbc++.la -+ - libodbc___mt_la_SOURCES = $(sources) - libodbc___mt_la_LDFLAGS = $(ldflags) - libodbc___mt_la_LIBADD = @THREAD_LIBS@ -@@ -167,6 +223,7 @@ - libodbc___qt_mt_la_LDFLAGS = $(ldflags) - libodbc___qt_mt_la_LIBADD = @THREAD_LIBS@ @QT_LIBS@ - subdir = src -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -@@ -189,10 +246,8 @@ - libodbc___qt_la_DEPENDENCIES = - am_libodbc___qt_la_OBJECTS = $(am__objects_1) - libodbc___qt_la_OBJECTS = $(am_libodbc___qt_la_OBJECTS) -+ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/callablestatement.Plo \ -@@ -215,8 +270,6 @@ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXFLAGS = @CXXFLAGS@ --CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -226,7 +279,7 @@ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(libodbc___mt_la_SOURCES) $(libodbc___la_SOURCES) \ - $(libodbc___qt_mt_la_SOURCES) $(libodbc___qt_la_SOURCES) --DIST_COMMON = Makefile.am Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - SOURCES = $(libodbc___mt_la_SOURCES) $(libodbc___la_SOURCES) $(libodbc___qt_mt_la_SOURCES) $(libodbc___qt_la_SOURCES) - - all: all-am -@@ -262,7 +315,7 @@ - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test -z "$dir" && dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -@@ -296,27 +349,38 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statement.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Plo@am__quote@ - --distclean-depend: -- -rm -rf ./$(DEPDIR) -- - .cpp.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< --CXXDEPMODE = @CXXDEPMODE@ -+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -331,6 +395,9 @@ - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -356,20 +423,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -395,7 +483,6 @@ - - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -407,7 +494,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -415,7 +502,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -426,9 +513,10 @@ - mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -449,7 +537,8 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -457,19 +546,28 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES - --.PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libLTLIBRARIES clean-libtool ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool tags uninstall \ -- uninstall-am uninstall-info-am uninstall-libLTLIBRARIES -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-libLTLIBRARIES - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff -Naur libodbc++-0.2.3/tests/Makefile.in libodbc++-0.2.3-20050404/tests/Makefile.in ---- libodbc++-0.2.3/tests/Makefile.in 2003-06-17 12:20:52.000000000 +0200 -+++ libodbc++-0.2.3-20050404/tests/Makefile.in 2005-04-04 18:21:24.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,93 +32,147 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ @QT_DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - - INCLUDES = @INCLUDES@ @QT_INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - @BUILD_TESTS_TRUE@noinst_PROGRAMS = \ -@@ -129,13 +183,15 @@ - @BUILD_TESTS_TRUE@mysql \ - @BUILD_TESTS_TRUE@dmtest - --DEFS = @DEFS@ @QT_DEFS@ - - @QT_FALSE@@THREADS_TRUE@testlibs = @THREAD_LIBS@ ../src/libodbc++-mt.la --@QT_FALSE@@THREADS_FALSE@testlibs = ../src/libodbc++.la -+ - @QT_TRUE@@THREADS_TRUE@testlibs = @THREAD_LIBS@ ../src/libodbc++_qt-mt.la -+ - @QT_TRUE@@THREADS_FALSE@testlibs = ../src/libodbc++_qt.la - -+@QT_FALSE@@THREADS_FALSE@testlibs = ../src/libodbc++.la -+ - scroll_SOURCES = scroll.cpp - scroll_LDADD = $(testlibs) - -@@ -156,6 +212,7 @@ - - EXTRA_DIST = README - subdir = tests -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -@@ -208,10 +265,8 @@ - @QT_TRUE@@THREADS_TRUE@streams_DEPENDENCIES = ../src/libodbc++_qt-mt.la - @QT_TRUE@@THREADS_FALSE@streams_DEPENDENCIES = ../src/libodbc++_qt.la - streams_LDFLAGS = -+ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dbmetadata.Po ./$(DEPDIR)/dmtest.Po \ -@@ -225,10 +280,9 @@ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXFLAGS = @CXXFLAGS@ - DIST_SOURCES = $(dbmetadata_SOURCES) $(dmtest_SOURCES) $(mysql_SOURCES) \ - $(oracle_SOURCES) $(scroll_SOURCES) $(streams_SOURCES) --DIST_COMMON = README Makefile.am Makefile.in -+DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am - SOURCES = $(dbmetadata_SOURCES) $(dmtest_SOURCES) $(mysql_SOURCES) $(oracle_SOURCES) $(scroll_SOURCES) $(streams_SOURCES) - - all: all-am -@@ -279,27 +333,38 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scroll.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/streams.Po@am__quote@ - --distclean-depend: -- -rm -rf ./$(DEPDIR) -- - .cpp.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< --CXXDEPMODE = @CXXDEPMODE@ -+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -314,6 +379,9 @@ - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -339,20 +407,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -377,7 +466,6 @@ - all-am: Makefile $(PROGRAMS) - - installdirs: -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -389,7 +477,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -397,7 +485,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -408,9 +496,10 @@ - mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -431,7 +520,8 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -439,18 +529,26 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-info-am - --.PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-noinstPROGRAMS ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- tags uninstall uninstall-am uninstall-info-am -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff -Naur libodbc++-0.2.3/win32/Makefile.in libodbc++-0.2.3-20050404/win32/Makefile.in ---- libodbc++-0.2.3/win32/Makefile.in 2003-06-17 12:20:52.000000000 +0200 -+++ libodbc++-0.2.3-20050404/win32/Makefile.in 2005-04-04 18:21:29.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,108 +32,164 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - SUBDIRS = tests - - EXTRA_DIST = Makefile.w32 - subdir = win32 -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - --RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ -- uninstall-info-recursive all-recursive install-data-recursive \ -- install-exec-recursive installdirs-recursive install-recursive \ -- uninstall-recursive check-recursive installcheck-recursive --DIST_COMMON = Makefile.am Makefile.in -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - -@@ -208,10 +264,17 @@ - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done - - ETAGS = etags - ETAGSFLAGS = - -+CTAGS = ctags -+CTAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -227,9 +290,15 @@ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ else \ -+ include_option=--include; \ -+ fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ -+ test -f $$subdir/TAGS && \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -242,20 +311,41 @@ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -305,7 +395,7 @@ - installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -313,7 +403,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -323,7 +413,7 @@ - clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-recursive -- -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -@@ -346,30 +436,40 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ - uninstall-am: uninstall-info-am - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive distclean \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive distclean distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -Naur libodbc++-0.2.3/win32/tests/Makefile.in libodbc++-0.2.3-20050404/win32/tests/Makefile.in ---- libodbc++-0.2.3/win32/tests/Makefile.in 2003-06-17 12:20:53.000000000 +0200 -+++ libodbc++-0.2.3-20050404/win32/tests/Makefile.in 2005-04-04 18:21:30.000000000 +0200 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -32,101 +32,156 @@ - # along with this library; see the file COPYING. If not, write to - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. --SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c --INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -- --EXEEXT = @EXEEXT@ --OBJEXT = @OBJEXT@ --PATH_SEPARATOR = @PATH_SEPARATOR@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ -+BUILD_ISQLXX_FALSE = @BUILD_ISQLXX_FALSE@ -+BUILD_ISQLXX_TRUE = @BUILD_ISQLXX_TRUE@ -+BUILD_QTSQLXX_FALSE = @BUILD_QTSQLXX_FALSE@ -+BUILD_QTSQLXX_TRUE = @BUILD_QTSQLXX_TRUE@ -+BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ -+BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ - INCLUDES = @INCLUDES@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ - LIBREADLINE = @LIBREADLINE@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - QT_DEFS = @QT_DEFS@ -+QT_FALSE = @QT_FALSE@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LIBS = @QT_LIBS@ - QT_MOC = @QT_MOC@ -+QT_TRUE = @QT_TRUE@ - RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ -+THREADS_FALSE = @THREADS_FALSE@ -+THREADS_TRUE = @THREADS_TRUE@ - THREAD_LIBS = @THREAD_LIBS@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ - bzip2 = @bzip2@ -+datadir = @datadir@ - db2html = @db2html@ - docdir = @docdir@ - doxygen = @doxygen@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ - lib_version = @lib_version@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ - perl = @perl@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ - sed = @sed@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - zip = @zip@ - - EXTRA_DIST = Makefile.w32 - subdir = win32/tests -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = --DIST_COMMON = Makefile.am Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: -@@ -148,13 +203,22 @@ - tags: TAGS - TAGS: - -+ctags: CTAGS -+CTAGS: -+ - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = ../.. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @list='$(DISTFILES)'; for file in $$list; do \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -@@ -179,7 +243,6 @@ - all-am: Makefile - - installdirs: -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -191,7 +254,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- INSTALL_STRIP_FLAG=-s \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -199,7 +262,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -209,7 +272,7 @@ - clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- -+ -rm -f Makefile - distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am -@@ -231,13 +294,21 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ - uninstall-am: uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -@@ -247,7 +318,8 @@ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool uninstall uninstall-am uninstall-info-am -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-dont-install-some-docs.patch b/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-dont-install-some-docs.patch deleted file mode 100644 index 8bbf50a2d..000000000 --- a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-dont-install-some-docs.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.am libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am ---- libodbc++-0.2.3-20050404/doc/Makefile.am 2001-06-12 12:38:12.000000000 +0200 -+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am 2005-04-04 21:16:50.447164392 +0200 -@@ -17,41 +17,6 @@ - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - --instdoc_dir=@docdir@/@PACKAGE@-@VERSION@/INSTALL -- --instdoc_name=INSTALL -- - SUBDIRS=progref - --all-local: $(instdoc_name) -- --$(instdoc_name): $(instdoc_name).sgml -- test -z "$(db2html)" && mkdir $@ || $(db2html) $< -- --maintainer-clean-local: -- rm -rf $(instdoc_name) -- --clean-local: -- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR* -- --dist-hook: all-local -- cp -r $(srcdir)/$(instdoc_name) $(distdir) -- --install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images -- for i in $(srcdir)/$(instdoc_name)/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \ -- done -- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \ -- done -- --uninstall-local: -- if test -d $(DESTDIR)$(instdoc_dir); then \ -- rm -rf $(DESTDIR)$(instdoc_dir)/*; \ -- rmdir $(DESTDIR)$(instdoc_dir) || true; \ -- fi -- --EXTRA_DIST=$(instdoc_name).sgml -+EXTRA_DIST=INSTALL.sgml -diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.in libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in ---- libodbc++-0.2.3-20050404/doc/Makefile.in 2005-04-04 18:21:26.000000000 +0200 -+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in 2005-04-04 21:16:50.447164392 +0200 -@@ -174,13 +174,9 @@ - target_alias = @target_alias@ - zip = @zip@ - --instdoc_dir = @docdir@/@PACKAGE@-@VERSION@/INSTALL -- --instdoc_name = INSTALL -- - SUBDIRS = progref - --EXTRA_DIST = $(instdoc_name).sgml -+EXTRA_DIST = INSTALL.sgml - subdir = doc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -382,12 +378,9 @@ - || exit 1; \ - fi; \ - done -- $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" distdir="$(distdir)" \ -- dist-hook - check-am: all-am - check: check-recursive --all-am: Makefile all-local -+all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: - -@@ -417,7 +410,7 @@ - @echo "it deletes files that may require special tools to rebuild." - clean: clean-recursive - --clean-am: clean-generic clean-libtool clean-local mostlyclean-am -+clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-recursive - -rm -f Makefile -@@ -432,7 +425,7 @@ - - info-am: - --install-data-am: install-data-local -+install-data-am: - - install-exec-am: - -@@ -444,8 +437,7 @@ - - maintainer-clean: maintainer-clean-recursive - -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic \ -- maintainer-clean-local -+maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive - -@@ -459,59 +451,27 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local -+uninstall-am: uninstall-info-am - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ -- check-am clean clean-generic clean-libtool clean-local \ -- clean-recursive ctags ctags-recursive distclean \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-local install-data-recursive install-exec \ -- install-exec-am install-exec-recursive install-info \ -- install-info-am install-info-recursive install-man \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive distclean distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ -- maintainer-clean-local maintainer-clean-recursive mostlyclean \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -- tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-local uninstall-recursive -- -- --all-local: $(instdoc_name) -- --$(instdoc_name): $(instdoc_name).sgml -- test -z "$(db2html)" && mkdir $@ || $(db2html) $< -- --maintainer-clean-local: -- rm -rf $(instdoc_name) -- --clean-local: -- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR* -- --dist-hook: all-local -- cp -r $(srcdir)/$(instdoc_name) $(distdir) -- --install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images -- for i in $(srcdir)/$(instdoc_name)/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \ -- done -- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \ -- done -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - --uninstall-local: -- if test -d $(DESTDIR)$(instdoc_dir); then \ -- rm -rf $(DESTDIR)$(instdoc_dir)/*; \ -- rmdir $(DESTDIR)$(instdoc_dir) || true; \ -- fi - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-no-namespace-closing-colon.patch b/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-no-namespace-closing-colon.patch deleted file mode 100644 index 2d927a863..000000000 --- a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-no-namespace-closing-colon.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h ---- libodbc++-0.2.3/include/odbc++/callablestatement.h 2003-03-20 16:52:27.000000000 +0100 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h 2005-01-18 14:47:32.761605624 +0100 -@@ -160,7 +160,7 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_CALLABLESTATEMENT_H -diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h ---- libodbc++-0.2.3/include/odbc++/connection.h 2001-06-12 12:38:16.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h 2005-01-18 14:47:41.210321224 +0100 -@@ -204,7 +204,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_CONNECTION_H -diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h ---- libodbc++-0.2.3/include/odbc++/databasemetadata.h 2001-06-12 12:38:17.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h 2005-01-18 14:47:44.922756848 +0100 -@@ -1333,7 +1333,7 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_DATABASEMETADATA_H -diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h ---- libodbc++-0.2.3/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h 2005-01-18 14:47:48.704181984 +0100 -@@ -147,7 +147,7 @@ - - - --}; -+} - - - #endif // __ODBCXX_DRIVERMANAGER_H -diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h ---- libodbc++-0.2.3/include/odbc++/errorhandler.h 2001-06-12 12:38:18.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h 2005-01-18 14:47:53.838401464 +0100 -@@ -127,6 +127,6 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - #endif -diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h ---- libodbc++-0.2.3/include/odbc++/preparedstatement.h 2003-05-09 10:45:48.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h 2005-01-18 14:47:57.663819912 +0100 -@@ -211,6 +211,6 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - #endif // __ODBCXX_PREPAREDSTATEMENT_H -diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h ---- libodbc++-0.2.3/include/odbc++/resultset.h 2001-06-12 12:38:19.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h 2005-01-18 14:48:01.966165856 +0100 -@@ -619,7 +619,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_RESULTSET_H -diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h ---- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h 2001-06-12 12:38:20.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h 2005-01-18 14:48:05.372647992 +0100 -@@ -176,7 +176,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_RESULTSETMETADATA_H -diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h ---- libodbc++-0.2.3/include/odbc++/statement.h 2003-03-20 16:52:32.000000000 +0100 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h 2005-01-18 14:48:11.589702856 +0100 -@@ -260,7 +260,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_STATEMENT_H -diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h ---- libodbc++-0.2.3/include/odbc++/threads.h 2001-06-12 12:38:20.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h 2005-01-18 14:48:16.409970064 +0100 -@@ -65,7 +65,7 @@ - } - }; - --}; //namespace odbc -+} //namespace odbc - - // macro used all over the place - #define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut) -diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h ---- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h 2005-01-18 14:48:22.560035112 +0100 -@@ -791,7 +791,7 @@ - } - }; - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_TYPES_H diff --git a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-no-thread-dmaccess-mutex-fix.patch b/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-no-thread-dmaccess-mutex-fix.patch deleted file mode 100644 index f5b03f203..000000000 --- a/campcaster/etc/portage/dev-db/libodbc++/files/libodbc++-no-thread-dmaccess-mutex-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur libodbc++-0.2.3-20050404/src/drivermanager.cpp libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp ---- libodbc++-0.2.3-20050404/src/drivermanager.cpp 2005-02-27 23:37:23.000000000 +0100 -+++ libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp 2005-04-04 18:35:25.725465880 +0200 -@@ -87,8 +87,10 @@ - } - } - -+#ifdef ODBCXX_ENABLE_THREADS - // remove the mutex as we can't rely on static destructors - DMAccessMutex(1); -+#endif - } - - diff --git a/campcaster/etc/portage/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild b/campcaster/etc/portage/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild index 1762850b1..2d228d967 100644 --- a/campcaster/etc/portage/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild +++ b/campcaster/etc/portage/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild @@ -24,11 +24,6 @@ src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/libodbc++-0.2.3-to-cvs-20050404.patch - epatch ${FILESDIR}/libodbc++-no-namespace-closing-colon.patch - epatch ${FILESDIR}/libodbc++-no-thread-dmaccess-mutex-fix.patch - epatch ${FILESDIR}/libodbc++-dont-install-some-docs.patch - # toch the programmers reference stamp, so that it is not re-generated touch doc/progref/progref-stamp } diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-dont-install-some-docs.patch b/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-dont-install-some-docs.patch deleted file mode 100644 index 8bbf50a2d..000000000 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-dont-install-some-docs.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.am libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am ---- libodbc++-0.2.3-20050404/doc/Makefile.am 2001-06-12 12:38:12.000000000 +0200 -+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am 2005-04-04 21:16:50.447164392 +0200 -@@ -17,41 +17,6 @@ - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - --instdoc_dir=@docdir@/@PACKAGE@-@VERSION@/INSTALL -- --instdoc_name=INSTALL -- - SUBDIRS=progref - --all-local: $(instdoc_name) -- --$(instdoc_name): $(instdoc_name).sgml -- test -z "$(db2html)" && mkdir $@ || $(db2html) $< -- --maintainer-clean-local: -- rm -rf $(instdoc_name) -- --clean-local: -- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR* -- --dist-hook: all-local -- cp -r $(srcdir)/$(instdoc_name) $(distdir) -- --install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images -- for i in $(srcdir)/$(instdoc_name)/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \ -- done -- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \ -- done -- --uninstall-local: -- if test -d $(DESTDIR)$(instdoc_dir); then \ -- rm -rf $(DESTDIR)$(instdoc_dir)/*; \ -- rmdir $(DESTDIR)$(instdoc_dir) || true; \ -- fi -- --EXTRA_DIST=$(instdoc_name).sgml -+EXTRA_DIST=INSTALL.sgml -diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.in libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in ---- libodbc++-0.2.3-20050404/doc/Makefile.in 2005-04-04 18:21:26.000000000 +0200 -+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in 2005-04-04 21:16:50.447164392 +0200 -@@ -174,13 +174,9 @@ - target_alias = @target_alias@ - zip = @zip@ - --instdoc_dir = @docdir@/@PACKAGE@-@VERSION@/INSTALL -- --instdoc_name = INSTALL -- - SUBDIRS = progref - --EXTRA_DIST = $(instdoc_name).sgml -+EXTRA_DIST = INSTALL.sgml - subdir = doc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -382,12 +378,9 @@ - || exit 1; \ - fi; \ - done -- $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" distdir="$(distdir)" \ -- dist-hook - check-am: all-am - check: check-recursive --all-am: Makefile all-local -+all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: - -@@ -417,7 +410,7 @@ - @echo "it deletes files that may require special tools to rebuild." - clean: clean-recursive - --clean-am: clean-generic clean-libtool clean-local mostlyclean-am -+clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-recursive - -rm -f Makefile -@@ -432,7 +425,7 @@ - - info-am: - --install-data-am: install-data-local -+install-data-am: - - install-exec-am: - -@@ -444,8 +437,7 @@ - - maintainer-clean: maintainer-clean-recursive - -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic \ -- maintainer-clean-local -+maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive - -@@ -459,59 +451,27 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local -+uninstall-am: uninstall-info-am - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ -- check-am clean clean-generic clean-libtool clean-local \ -- clean-recursive ctags ctags-recursive distclean \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-local install-data-recursive install-exec \ -- install-exec-am install-exec-recursive install-info \ -- install-info-am install-info-recursive install-man \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive distclean distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ -- maintainer-clean-local maintainer-clean-recursive mostlyclean \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -- tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-local uninstall-recursive -- -- --all-local: $(instdoc_name) -- --$(instdoc_name): $(instdoc_name).sgml -- test -z "$(db2html)" && mkdir $@ || $(db2html) $< -- --maintainer-clean-local: -- rm -rf $(instdoc_name) -- --clean-local: -- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR* -- --dist-hook: all-local -- cp -r $(srcdir)/$(instdoc_name) $(distdir) -- --install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images -- for i in $(srcdir)/$(instdoc_name)/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \ -- done -- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \ -- fn=`basename $$i` \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \ -- done -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - --uninstall-local: -- if test -d $(DESTDIR)$(instdoc_dir); then \ -- rm -rf $(DESTDIR)$(instdoc_dir)/*; \ -- rmdir $(DESTDIR)$(instdoc_dir) || true; \ -- fi - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-gcc-4.0-fix.patch b/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-gcc-4.0-fix.patch deleted file mode 100644 index 8b2a09580..000000000 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-gcc-4.0-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur libodbc++-0.2.3-20050404/include/odbc++/drivermanager.h libodbc++-0.2.3-20050404-gcc-4.0-fix/include/odbc++/drivermanager.h ---- libodbc++-0.2.3-20050404/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200 -+++ libodbc++-0.2.3-20050404-gcc-4.0-fix/include/odbc++/drivermanager.h 2005-11-19 17:51:33.979494541 +0100 -@@ -30,6 +30,7 @@ - namespace odbc { - - class Connection; -+ class ErrorHandler; - - /** An ODBC Driver with it's information. - */ diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-namespace-closing-colon.patch b/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-namespace-closing-colon.patch deleted file mode 100644 index 2d927a863..000000000 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-namespace-closing-colon.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h ---- libodbc++-0.2.3/include/odbc++/callablestatement.h 2003-03-20 16:52:27.000000000 +0100 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h 2005-01-18 14:47:32.761605624 +0100 -@@ -160,7 +160,7 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_CALLABLESTATEMENT_H -diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h ---- libodbc++-0.2.3/include/odbc++/connection.h 2001-06-12 12:38:16.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h 2005-01-18 14:47:41.210321224 +0100 -@@ -204,7 +204,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_CONNECTION_H -diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h ---- libodbc++-0.2.3/include/odbc++/databasemetadata.h 2001-06-12 12:38:17.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h 2005-01-18 14:47:44.922756848 +0100 -@@ -1333,7 +1333,7 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_DATABASEMETADATA_H -diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h ---- libodbc++-0.2.3/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h 2005-01-18 14:47:48.704181984 +0100 -@@ -147,7 +147,7 @@ - - - --}; -+} - - - #endif // __ODBCXX_DRIVERMANAGER_H -diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h ---- libodbc++-0.2.3/include/odbc++/errorhandler.h 2001-06-12 12:38:18.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h 2005-01-18 14:47:53.838401464 +0100 -@@ -127,6 +127,6 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - #endif -diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h ---- libodbc++-0.2.3/include/odbc++/preparedstatement.h 2003-05-09 10:45:48.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h 2005-01-18 14:47:57.663819912 +0100 -@@ -211,6 +211,6 @@ - }; - - --}; // namespace odbc -+} // namespace odbc - - #endif // __ODBCXX_PREPAREDSTATEMENT_H -diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h ---- libodbc++-0.2.3/include/odbc++/resultset.h 2001-06-12 12:38:19.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h 2005-01-18 14:48:01.966165856 +0100 -@@ -619,7 +619,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_RESULTSET_H -diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h ---- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h 2001-06-12 12:38:20.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h 2005-01-18 14:48:05.372647992 +0100 -@@ -176,7 +176,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_RESULTSETMETADATA_H -diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h ---- libodbc++-0.2.3/include/odbc++/statement.h 2003-03-20 16:52:32.000000000 +0100 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h 2005-01-18 14:48:11.589702856 +0100 -@@ -260,7 +260,7 @@ - - - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_STATEMENT_H -diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h ---- libodbc++-0.2.3/include/odbc++/threads.h 2001-06-12 12:38:20.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h 2005-01-18 14:48:16.409970064 +0100 -@@ -65,7 +65,7 @@ - } - }; - --}; //namespace odbc -+} //namespace odbc - - // macro used all over the place - #define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut) -diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h ---- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200 -+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h 2005-01-18 14:48:22.560035112 +0100 -@@ -791,7 +791,7 @@ - } - }; - --}; // namespace odbc -+} // namespace odbc - - - #endif // __ODBCXX_TYPES_H diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-thread-dmaccess-mutex-fix.patch b/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-thread-dmaccess-mutex-fix.patch deleted file mode 100644 index f5b03f203..000000000 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-thread-dmaccess-mutex-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur libodbc++-0.2.3-20050404/src/drivermanager.cpp libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp ---- libodbc++-0.2.3-20050404/src/drivermanager.cpp 2005-02-27 23:37:23.000000000 +0100 -+++ libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp 2005-04-04 18:35:25.725465880 +0200 -@@ -87,8 +87,10 @@ - } - } - -+#ifdef ODBCXX_ENABLE_THREADS - // remove the mutex as we can't rely on static destructors - DMAccessMutex(1); -+#endif - } - - diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-x64-fix.patch b/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-x64-fix.patch deleted file mode 100644 index 4e9f47db6..000000000 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-x64-fix.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- libodbc++-0.2.3-20050404/src/preparedstatement.cpp 2001-06-12 05:38:32.000000000 -0500 -+++ libodbc++-0.2.3-20050404-x64/src/preparedstatement.cpp 2006-10-04 11:06:36.000000000 -0500 -@@ -161,7 +161,7 @@ - numParams_=np; - - SQLSMALLINT sqlType; -- SQLUINTEGER prec; -+ SQLULEN prec; - SQLSMALLINT scale; - SQLSMALLINT nullable; - -@@ -303,7 +303,7 @@ - r=SQLParamData(hstmt_,¤tCol); - this->_checkStmtError(hstmt_,r,"SQLParamData failure"); - if(r==SQL_NEED_DATA) { -- DataHandler* dh=rowset_->getColumn((int)currentCol); -+ DataHandler* dh=rowset_->getColumn((long)currentCol); - - assert(dh->isStreamed_); - ---- libodbc++-0.2.3-20050404/src/resultset.cpp 2003-06-17 05:10:32.000000000 -0500 -+++ libodbc++-0.2.3-20050404-x64/src/resultset.cpp 2006-10-04 18:08:03.000000000 -0500 -@@ -528,7 +528,7 @@ - r=SQLParamData(hstmt_,¤tCol); - this->_checkStmtError(hstmt_,r,"SQLParamData failure"); - if(r==SQL_NEED_DATA) { -- DataHandler* dh=rowset_->getColumn((int)currentCol); -+ DataHandler* dh=rowset_->getColumn((long)currentCol); - - assert(dh->isStreamed_); - -@@ -1356,8 +1356,9 @@ - DataHandler* dh=rowset_->getColumn(idx); - ODBCXX_STREAM* s=dh->getStream(); - if(s==NULL) { -- s=new DataStream(this,hstmt_,idx,SQL_C_BINARY, -- dh->dataStatus_[dh->currentRow_]); -+ SQLINTEGER Status=dh->dataStatus_[dh->currentRow_]; -+ s=new DataStream(this,hstmt_,idx,SQL_C_BINARY,Status); -+ dh->dataStatus_[dh->currentRow_]=Status; - dh->setStream(s); - } - lastWasNull_=dh->isNull(); ---- libodbc++-0.2.3-20050404/src/resultsetmetadata.cpp 2001-06-12 05:38:35.000000000 -0500 -+++ libodbc++-0.2.3-20050404-x64/src/resultsetmetadata.cpp 2006-10-04 12:05:45.000000000 -0500 -@@ -39,7 +39,7 @@ - int ResultSetMetaData::_getNumericAttribute(unsigned int col, - SQLUSMALLINT attr) - { -- SQLINTEGER res=0; -+ SQLLEN res=0; - SQLRETURN r= - ODBC3_C(SQLColAttribute,SQLColAttributes)(resultSet_->hstmt_, - (SQLUSMALLINT)col, -@@ -63,7 +63,7 @@ - odbc::Deleter _buf(buf,true); - buf[maxlen]=0; - -- SQLINTEGER res=0; -+ SQLLEN res=0; - SQLSMALLINT len=0; - - SQLRETURN r= ---- libodbc++-0.2.3-20050404/src/statement.cpp 2003-03-28 08:26:02.000000000 -0500 -+++ libodbc++-0.2.3-20050404-x64/src/statement.cpp 2006-10-04 12:06:54.000000000 -0500 -@@ -672,7 +672,7 @@ - - if(lastExecute_!=ODBC3_C(SQL_NO_DATA,SQL_NO_DATA_FOUND)) { - -- SQLINTEGER res; -+ SQLLEN res; - SQLRETURN r=SQLRowCount(hstmt_,&res); - this->_checkStmtError(hstmt_,r,"Error fetching update count"); - return res; ---- libodbc++-0.2.3-20050404/src/datahandler.cpp 2006-10-04 17:37:32.000000000 -0500 -+++ libodbc++-0.2.3-20050404-x64/src/datahandler.cpp 2006-10-04 12:07:52.000000000 -0500 -@@ -269,7 +269,7 @@ - }; - this->setupBuffer(bs); - -- dataStatus_=new SQLINTEGER[rows_]; -+ dataStatus_=new SQLLEN[rows_]; - - //set everything to NULL - for(unsigned int i=0; i