--- parser3/configure 2005/11/22 16:13:01 1.86 +++ parser3/configure 2009/12/04 04:45:26 1.119 @@ -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 CURL_INCLUDES 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,12 +891,15 @@ 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-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 Gnome XML libraries are installed (static libs) + --with-curl=D D is the curl includes directory + --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 +1669,7 @@ fi # Define the identity of the package. PACKAGE=parser - VERSION=3.2.0beta + VERSION=3.4.1b # Some tools Automake needs. @@ -3827,6 +3834,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 +3854,7 @@ _ACEOF fi + # Check whether --enable-execs or --disable-execs was given. if test "${enable_execs+set}" = set; then enableval="$enable_execs" @@ -3864,6 +3873,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 +4003,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 +4033,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 +4061,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 +4218,29 @@ 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 +# 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" @@ -4189,21 +4263,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=glib-config - 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 @@ -4231,23 +4295,45 @@ 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 + XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libxml2" + XML_LIBS="$XMLLIB/libxslt.a $XMLLIB/libexslt.a $XMLLIB/libxml2.a" + +fi; + + + + +# Check whether --with-curl or --without-curl was given. +if test "${with_curl+set}" = set; then + withval="$with_curl" + + CURLINC=$withval + + if test \! -d $CURLINC -o \! -r $CURLINC/curl.h; then + { { echo "$as_me:$LINENO: error: $CURLINC does not seem to be valid curl includes directory" >&5 +echo "$as_me: error: $CURLINC does not seem to be valid curl includes directory" >&2;} + { (exit 1); exit 1; }; } 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" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CURL +_ACEOF + + + CURL_INCLUDES="-I$CURLINC" 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 @@ -4273,9 +4359,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` @@ -4311,9 +4400,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` @@ -6146,6 +6238,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 @@ -6819,16 +6918,20 @@ fi + + for ac_func in flock \ _locking \ fcntl \ lockf \ ftruncate \ +fchmod \ getrusage \ gettimeofday \ crypt \ sigsetjmp \ -siglongjmp +siglongjmp \ +unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -7452,7 +7555,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/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 @@ -8024,16 +8127,15 @@ 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" ;; "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" ;; @@ -8198,10 +8300,14 @@ 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,@CURL_INCLUDES@,$CURL_INCLUDES,;t t s,@MIME_INCLUDES@,$MIME_INCLUDES,;t t s,@MIME_LIBS@,$MIME_LIBS,;t t s,@APACHE13@,$APACHE13,;t t