--- parser3/configure 2005/12/07 11:16:02 1.87.2.1 +++ parser3/configure 2008/01/18 13:23:14 1.93 @@ -310,7 +310,7 @@ ac_includes_default="\ # 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar P3S build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB YACC CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE commentcharset_windows1251 commentcharset_windows1250 commentcharset_windows1257 commentcharset_koi8r dll_extension mysql_client pgsql_client oracle_client CPP_LIBS GC_LIBS XML_INCLUDES XML_LIBS MIME_INCLUDES MIME_LIBS APACHE13 COMPILE_APACHE13_MODULE_TRUE COMPILE_APACHE13_MODULE_FALSE INCLTDL LIBLTDL subdirs LIBADD_DL CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar P3S build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB YACC CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE commentcharset_windows1251 commentcharset_windows1250 commentcharset_windows1257 commentcharset_koi8r dll_extension mysql_client pgsql_client oracle_client sqlite_client CPP_LIBS GC_LIBS XML_INCLUDES XML_LIBS MIME_INCLUDES MIME_LIBS APACHE13 COMPILE_APACHE13_MODULE_TRUE COMPILE_APACHE13_MODULE_FALSE INCLTDL LIBLTDL subdirs LIBADD_DL CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -878,6 +878,8 @@ Optional Packages: PgSQL client dynamic library to root config --with-oracle-client=oracleclientlib?withparams Oracle client dynamic library + --with-sqlite-client=sqliteclientlib?withparams + SQLite client dynamic library to root config --with-pathlink=LKEY put dynamic libraries paths to binary using linker key (-R, -rpath-link) --with-dynamic-stdcpp link libstdc++ dynamically @@ -887,12 +889,12 @@ Optional Packages: Boehm garbage collecting library is installed (shared lib) --with-static-gc=D D is the directory where Boehm garbage collecting library is installed (static lib) - --with-glib-config=FILE FILE is glib library - configuration file (search for glib*-config) --with-shared-xml=D D is the directory where Gnome XML libraries are installed (shared libs) --with-static-xml=D D is the directory where Gnome XML libraries are installed (static libs) + --with-glib-config=FILE FILE is glib library + configuration file (search for glib*-config) --with-shared-mailreceive=D is the directory where Gnome MIME library is installed (shared lib) --with-static-mailreceive=D is the directory where @@ -1662,7 +1664,7 @@ fi # Define the identity of the package. PACKAGE=parser - VERSION=3.2.0 + VERSION=3.2.3b # Some tools Automake needs. @@ -3976,10 +3978,11 @@ fi; + # Check whether --with-pgsql-client or --without-pgsql-client was given. if test "${with_pgsql_client+set}" = set; then withval="$with_pgsql_client" - mysql_client=$withval + pgsql_client=$withval else echo "$as_me:$LINENO: checking for pgsql client" >&5 @@ -4005,6 +4008,7 @@ fi; + # Check whether --with-oracle-client or --without-oracle-client was given. if test "${with_oracle_client+set}" = set; then withval="$with_oracle_client" @@ -4032,6 +4036,36 @@ fi; +# Check whether --with-sqlite-client or --without-sqlite-client was given. +if test "${with_sqlite_client+set}" = set; then + withval="$with_sqlite_client" + sqlite_client=$withval + +else + echo "$as_me:$LINENO: checking for sqlite_client client" >&5 +echo $ECHO_N "checking for sqlite_client client... $ECHO_C" >&6 + for lib in \ + /usr/local/sqlite/lib/sqlite3.$dll_extension \ + /usr/local/lib/sqlite3.$dll_extension \ + /usr/lib/sqlite3.$dll_extension; do + if test -f $lib; then sqlite_client=$lib; fi + done + + if test -z "$sqlite_client"; then + sqlite_client="-configure could not guess-" + echo "$as_me:$LINENO: result: could not guess" >&5 +echo "${ECHO_T}could not guess" >&6 + else + echo "$as_me:$LINENO: result: $sqlite_client" >&5 +echo "${ECHO_T}$sqlite_client" >&6 + fi + + +fi; + + + + # Check whether --with-pathlink or --without-pathlink was given. if test "${with_pathlink+set}" = set; then @@ -4159,14 +4193,6 @@ LIBS=$SAVE_LIBS -# Check whether --with-glib-config or --without-glib-config was given. -if test "${with_glib_config+set}" = set; then - withval="$with_glib_config" - GLIB_CONFIG=$withval - -fi; - - # Check whether --with-shared-xml or --without-shared-xml was given. if test "${with_shared_xml+set}" = set; then withval="$with_shared_xml" @@ -4189,24 +4215,11 @@ _ACEOF LIBXML2_SO_NAME=`cd $XMLLIB ; ls libxml2.?? libxml2.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - LIBGDOME_SO_NAME=`cd $XMLLIB ; ls libgdome.?? libgdome.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` LIBXSLT_SO_NAME=`cd $XMLLIB ; ls libxslt.?? libxslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` LIBEXSLT_SO_NAME=`cd $XMLLIB ; ls libexslt.?? libexslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$XMLBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=$XMLBIN/glib2-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config - fi - fi - fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - GLIB_LIBS=`$GLIB_CONFIG --libs` - - XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libgdome -I$XMLINC/libxml2" - XML_LIBS="$GLIB_LIBS -L$XMLLIB -l$LIBXML2_SO_NAME -l$LIBGDOME_SO_NAME -l$LIBXSLT_SO_NAME -l$LIBEXSLT_SO_NAME" + XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libxml2" + XML_LIBS="-L$XMLLIB -l$LIBXML2_SO_NAME -l$LIBXSLT_SO_NAME -l$LIBEXSLT_SO_NAME" if test \! -z "$LD_PATHLINK"; then XML_LIBS="$XML_LIBS -Wl,$LD_PATHLINK -Wl,$XMLLIB" fi @@ -4234,24 +4247,22 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$XMLBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config - fi - fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - - GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'` - GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'` - XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libgdome -I$XMLINC/libxml2" - XML_LIBS="$XMLLIB/libgdome.a $XMLLIB/libxslt.a $XMLLIB/libexslt.a $XMLLIB/libxml2.a $GLIB_DIR/lib$GLIB_NAME.a" + XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libxml2" + XML_LIBS="$XMLLIB/libxslt.a $XMLLIB/libexslt.a $XMLLIB/libxml2.a" fi; +# Check whether --with-glib-config or --without-glib-config was given. +if test "${with_glib_config+set}" = set; then + withval="$with_glib_config" + GLIB_CONFIG=$withval + +fi; + + # Check whether --with-shared-mailreceive or --without-shared-mailreceive was given. if test "${with_shared_mailreceive+set}" = set; then withval="$with_shared_mailreceive" @@ -4276,9 +4287,12 @@ _ACEOF LIBMIME_SO_NAME=`cd $MIMELIB ; ls libgmime.?? libgmime.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$MIMEBIN/glib-config + GLIB_CONFIG=$XMLBIN/glib-config if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config + GLIB_CONFIG=$XMLBIN/glib2-config + if test \! -x $GLIB_CONFIG; then + GLIB_CONFIG=glib-config + fi fi fi GLIB_CFLAGS=`$GLIB_CONFIG --cflags` @@ -4314,9 +4328,12 @@ _ACEOF if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$MIMEBIN/glib-config + GLIB_CONFIG=$XMLBIN/glib-config if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config + GLIB_CONFIG=$XMLBIN/glib2-config + if test \! -x $GLIB_CONFIG; then + GLIB_CONFIG=glib-config + fi fi fi GLIB_CFLAGS=`$GLIB_CONFIG --cflags` @@ -6822,6 +6839,7 @@ fi + for ac_func in flock \ _locking \ fcntl \ @@ -6831,7 +6849,8 @@ getrusage \ gettimeofday \ crypt \ sigsetjmp \ -siglongjmp +siglongjmp \ +unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -7455,7 +7474,7 @@ rm -f conftest.err conftest.$ac_objext c ac_config_headers="$ac_config_headers src/include/pa_config_auto.h" - ac_config_files="$ac_config_files Makefile src/Makefile src/types/Makefile src/classes/Makefile src/include/Makefile src/main/Makefile src/sql/Makefile src/lib/Makefile src/lib/patches/Makefile src/lib/gd/Makefile src/lib/smtp/Makefile src/lib/gc/Makefile src/lib/gc/include/Makefile src/lib/cord/Makefile src/lib/cord/include/Makefile src/lib/cord/include/private/Makefile src/lib/ltdl/Makefile src/lib/pcre/Makefile src/lib/md5/Makefile src/lib/sdbm/Makefile src/lib/sdbm/apr-include/Makefile src/targets/Makefile src/targets/cgi/Makefile src/targets/apache13core/Makefile src/targets/apache13/Makefile src/targets/apache13/p3runConfigure src/targets/isapi/Makefile etc/Makefile etc/parser3.charsets/Makefile bin/Makefile bin/auto.p.dist" + ac_config_files="$ac_config_files Makefile src/Makefile src/types/Makefile src/classes/Makefile src/include/Makefile src/main/Makefile src/sql/Makefile src/lib/Makefile src/lib/gd/Makefile src/lib/smtp/Makefile src/lib/gc/Makefile src/lib/gc/include/Makefile src/lib/cord/Makefile src/lib/cord/include/Makefile src/lib/cord/include/private/Makefile src/lib/ltdl/Makefile src/lib/pcre/Makefile src/lib/md5/Makefile src/lib/sdbm/Makefile src/lib/sdbm/apr-include/Makefile src/targets/Makefile src/targets/cgi/Makefile src/targets/apache13core/Makefile src/targets/apache13/Makefile src/targets/apache13/p3runConfigure src/targets/isapi/Makefile etc/Makefile etc/parser3.charsets/Makefile bin/Makefile bin/auto.p.dist" 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 @@ -8027,7 +8046,6 @@ do "src/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;; "src/sql/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/sql/Makefile" ;; "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; - "src/lib/patches/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/patches/Makefile" ;; "src/lib/gd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gd/Makefile" ;; "src/lib/smtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/smtp/Makefile" ;; "src/lib/gc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gc/Makefile" ;; @@ -8201,6 +8219,7 @@ s,@dll_extension@,$dll_extension,;t t s,@mysql_client@,$mysql_client,;t t s,@pgsql_client@,$pgsql_client,;t t s,@oracle_client@,$oracle_client,;t t +s,@sqlite_client@,$sqlite_client,;t t s,@CPP_LIBS@,$CPP_LIBS,;t t s,@GC_LIBS@,$GC_LIBS,;t t s,@XML_INCLUDES@,$XML_INCLUDES,;t t