--- parser3/Attic/configure.in	2005/11/22 15:55:14	1.85
+++ parser3/Attic/configure.in	2009/11/16 23:35:17	1.121
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
 AC_INIT(README)
 AC_PREREQ(2.57)
 
-AM_INIT_AUTOMAKE(parser, 3.2.0beta, nodefine)
+AM_INIT_AUTOMAKE(parser, 3.4.0b, nodefine)
 
 dnl expand srcdir
 P3S=`cd $srcdir/src ; pwd`
@@ -70,6 +70,7 @@ AC_ARG_WITH(assertions, [  --with-assert
 	AC_DEFINE(NDEBUG,,assertions disabled)
 )
 
+
 AC_ARG_ENABLE(safe-mode, [  --disable-safe-mode	  to enable reading and executing
                           files belonging to group+user other then effective],
 [
@@ -82,7 +83,8 @@ else
 	AC_DEFINE(PA_SAFE_MODE,,disabled reading of files belonging to group+user other then effective)
 fi
 
-AC_ARG_ENABLE(execs, [  --disable-execs	  to disable any execs
+
+AC_ARG_ENABLE(execs, [  --disable-execs	      to disable any execs
                           (file::exec, file::cgi, unix mail:send)],
 [
 if test "$enableval" = "no"; then
@@ -93,6 +95,17 @@ fi
 )
 
 
+AC_ARG_ENABLE(stringstream, [  --disable-stringstream  to disable stringstream usage.
+                          when disabled table.save use more memory but it's safer on freebsd 4.x],
+[
+if test "$enableval" = "no"; then
+	AC_MSG_WARN(disabling stringstream usage)
+	AC_DEFINE(NO_STRINGSTREAM,,stringstream disabled)
+fi
+]
+)
+
+
 srccharsetsdir=$srcdir/etc/parser3.charsets
 CHARSETS_REQUESTED="windows-1251"
 AC_ARG_WITH(charsets, [  --with-charsets=CHARSET[,CHARSET,...]  Enables charsets in root config (windows-1251,
@@ -107,7 +120,7 @@ for c in $CHARSETS_REQUESTED; do
 done
 
 # Switching on commentcharset_XXX='#'
-AC_DEFUN(PA_SUBSTCHARSET, [
+AC_DEFUN([PA_SUBSTCHARSET], [
 	commentcharset_$2='#'
 	for c in $CHARSETS_REQUESTED; do
 		if test "$1" = "$c"; then
@@ -159,9 +172,10 @@ AC_ARG_WITH(mysql-client,[  --with-mysql
 )
 AC_SUBST(mysql_client)
 
+
 AC_ARG_WITH(pgsql-client,[  --with-pgsql-client=pgsqlclientlib?withparams
                           PgSQL client dynamic library to root config],
-	mysql_client=$withval
+	pgsql_client=$withval
 ,
 	AC_MSG_CHECKING(for pgsql client)
 	for lib in \
@@ -181,6 +195,7 @@ AC_ARG_WITH(pgsql-client,[  --with-pgsql
 )
 AC_SUBST(pgsql_client)
 
+
 AC_ARG_WITH(oracle-client,[  --with-oracle-client=oracleclientlib?withparams
                           Oracle client dynamic library],
 	oracle_client=$withval
@@ -201,6 +216,29 @@ AC_ARG_WITH(oracle-client,[  --with-orac
 AC_SUBST(oracle_client)
 
 
+AC_ARG_WITH(sqlite-client,[  --with-sqlite-client=sqliteclientlib?withparams
+                          SQLite client dynamic library to root config],
+	sqlite_client=$withval
+,
+	AC_MSG_CHECKING(for sqlite_client client)
+	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-"
+		AC_MSG_RESULT(could not guess)
+	else
+		AC_MSG_RESULT($sqlite_client)
+	fi
+
+)
+AC_SUBST(sqlite_client)
+
+
 
 AC_ARG_WITH(pathlink,[  --with-pathlink=LKEY    put dynamic libraries paths to binary
                           using linker key (-R, -rpath-link)],
@@ -253,10 +291,22 @@ AC_SUBST(GC_LIBS)
 LIBS=$SAVE_LIBS
 
 
-AC_ARG_WITH(glib-config,[  --with-glib-config=FILE FILE is glib library
-                          configuration file (search for glib*-config)],
-	GLIB_CONFIG=$withval
-)
+AC_ARG_WITH(static-pcre,[  --with-static-pcre=D     D is the directory where
+                          PCRE library is installed (static lib)],[
+	PCRE=$withval
+	PCREINC="$PCRE/include"
+	PCRELIB="$PCRE/lib"
+
+	if test \! -d $PCREINC -o \! -d $PCRELIB; then
+		AC_MSG_ERROR($PCRE does not seem to be valid PCRE installation directory)
+	fi
+
+	PCRE_INCLUDES="-I$PCREINC"
+	PCRE_LIBS="$PCRELIB/libpcre.a"
+])
+AC_SUBST(PCRE_INCLUDES)
+AC_SUBST(PCRE_LIBS)
+
 
 AC_ARG_WITH(shared-xml,[  --with-shared-xml=D     D is the directory where
                           Gnome XML libraries are installed (shared libs)],[
@@ -272,21 +322,11 @@ AC_ARG_WITH(shared-xml,[  --with-shared-
 	AC_DEFINE(XML,,xml-abled parser (uses shared library))
 	
 	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
@@ -304,25 +344,17 @@ AC_ARG_WITH(static-xml,[  --with-static-
 
 	AC_DEFINE(XML,,xml-abled parser (uses static library))
 
-	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`
-
-dnl  '-L/usr/local/lib -lglib' -> /usr/local/lib
-changequote(, )dnl
-	GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'`
-	GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'`
-changequote([, ])dnl
-	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"
 ])
 AC_SUBST(XML_INCLUDES)
 AC_SUBST(XML_LIBS)
 
+AC_ARG_WITH(glib-config,[  --with-glib-config=FILE FILE is glib library
+                          configuration file (search for glib*-config)],
+	GLIB_CONFIG=$withval
+)
+
 AC_ARG_WITH(shared-mailreceive,[  --with-shared-mailreceive=D is the directory where
                           Gnome MIME library is installed (shared lib)],[
 	GNOME_MIME=$withval
@@ -339,9 +371,12 @@ AC_ARG_WITH(shared-mailreceive,[  --with
 	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`
@@ -367,9 +402,12 @@ AC_ARG_WITH(static-mailreceive,[  --with
 	AC_DEFINE(WITH_MAILRECEIVE,,has \$mail:received (uses static library))
 
 	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`
@@ -475,6 +513,9 @@ dnl Checks for libraries.
 
 dnl Some systems (Solaris 2.x) require libnsl (Network Services Library)
 case "$host" in
+  *-freebsd4*)
+	  AC_DEFINE(FREEBSD4,,FreeBSD4X target platform)
+  ;;
   *-sunos5.6* | *-solaris2.6*)
 	  AC_CHECK_LIB(xnet, main)
   ;;
@@ -508,11 +549,13 @@ _locking \
 fcntl \
 lockf \
 ftruncate \
+fchmod \
 getrusage \
 gettimeofday \
 crypt \
 sigsetjmp \
-siglongjmp
+siglongjmp \
+unsetenv
 )
 
 dnl on some linux[seen on 2.4] it's a macro 
@@ -622,16 +665,15 @@ AC_OUTPUT(
 	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/pcre/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