--- parser3/configure 2005/12/19 14:22:21 1.90 +++ parser3/configure 2009/05/20 13:50:22 1.108 @@ -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 PCRE_INCLUDES PCRE_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. @@ -862,8 +862,10 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-safe-mode to enable reading and executing files belonging to group+user other then effective - --disable-execs to disable any execs + --disable-execs to disable any execs (file::exec, file::cgi, unix mail:send) + --disable-stringstream to disable stringstream usage. + when disabled table.save use more memory but it's safer on freebsd 4.x Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -878,6 +880,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,6 +891,8 @@ 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-static-pcre=D D is the directory where + PCRE library is installed (static lib) --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 @@ -1662,7 +1668,7 @@ fi # Define the identity of the package. PACKAGE=parser - VERSION=3.2.1b + VERSION=3.4.0b # Some tools Automake needs. @@ -3827,6 +3833,7 @@ _ACEOF fi; + # Check whether --enable-safe-mode or --disable-safe-mode was given. if test "${enable_safe_mode+set}" = set; then enableval="$enable_safe_mode" @@ -3846,6 +3853,7 @@ _ACEOF fi + # Check whether --enable-execs or --disable-execs was given. if test "${enable_execs+set}" = set; then enableval="$enable_execs" @@ -3864,6 +3872,24 @@ fi fi; +# Check whether --enable-stringstream or --disable-stringstream was given. +if test "${enable_stringstream+set}" = set; then + enableval="$enable_stringstream" + +if test "$enableval" = "no"; then + { echo "$as_me:$LINENO: WARNING: disabling stringstream usage" >&5 +echo "$as_me: WARNING: disabling stringstream usage" >&2;} + +cat >>confdefs.h <<\_ACEOF +#define NO_STRINGSTREAM +_ACEOF + +fi + + +fi; + + srccharsetsdir=$srcdir/etc/parser3.charsets CHARSETS_REQUESTED="windows-1251" @@ -3976,10 +4002,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 +4032,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 +4060,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,6 +4217,29 @@ LIBS=$SAVE_LIBS +# Check whether --with-static-pcre or --without-static-pcre was given. +if test "${with_static_pcre+set}" = set; then + withval="$with_static_pcre" + + PCRE=$withval + PCREINC="$PCRE/include" + PCRELIB="$PCRE/lib" + + if test \! -d $PCREINC -o \! -d $PCRELIB; then + { { echo "$as_me:$LINENO: error: $PCRE does not seem to be valid PCRE installation directory" >&5 +echo "$as_me: error: $PCRE does not seem to be valid PCRE installation directory" >&2;} + { (exit 1); exit 1; }; } + fi + + PCRE_INCLUDES="-I$PCREINC" + PCRE_LIBS="$PCRELIB/libpcre.a" + +fi; + + + + + # Check whether --with-shared-xml or --without-shared-xml was given. if test "${with_shared_xml+set}" = set; then withval="$with_shared_xml" @@ -6132,6 +6213,13 @@ done case "$host" in + *-freebsd4*) + +cat >>confdefs.h <<\_ACEOF +#define FREEBSD4 +_ACEOF + + ;; *-sunos5.6* | *-solaris2.6*) echo "$as_me:$LINENO: checking for main in -lxnet" >&5 @@ -6805,6 +6893,7 @@ fi + for ac_func in flock \ _locking \ fcntl \ @@ -6814,7 +6903,8 @@ getrusage \ gettimeofday \ crypt \ sigsetjmp \ -siglongjmp +siglongjmp \ +unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -7438,7 +7528,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/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/pcre/Makefile src/lib/cord/Makefile src/lib/cord/include/Makefile src/lib/cord/include/private/Makefile src/lib/ltdl/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 @@ -8014,11 +8104,11 @@ do "src/lib/smtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/smtp/Makefile" ;; "src/lib/gc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gc/Makefile" ;; "src/lib/gc/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gc/include/Makefile" ;; + "src/lib/pcre/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/pcre/Makefile" ;; "src/lib/cord/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/cord/Makefile" ;; "src/lib/cord/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/cord/include/Makefile" ;; "src/lib/cord/include/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/cord/include/private/Makefile" ;; "src/lib/ltdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/ltdl/Makefile" ;; - "src/lib/pcre/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/pcre/Makefile" ;; "src/lib/md5/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/md5/Makefile" ;; "src/lib/sdbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/sdbm/Makefile" ;; "src/lib/sdbm/apr-include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/sdbm/apr-include/Makefile" ;; @@ -8183,8 +8273,11 @@ 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,@PCRE_INCLUDES@,$PCRE_INCLUDES,;t t +s,@PCRE_LIBS@,$PCRE_LIBS,;t t s,@XML_INCLUDES@,$XML_INCLUDES,;t t s,@XML_LIBS@,$XML_LIBS,;t t s,@MIME_INCLUDES@,$MIME_INCLUDES,;t t