--- parser3/Attic/configure.in	2003/11/06 14:37:03	1.68
+++ parser3/Attic/configure.in	2012/06/13 10:47:52	1.155
@@ -1,14 +1,22 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(README)
-AC_PREREQ(2.57)
+dnl Autoconf initialisation
+AC_PREREQ(2.59)
+AC_INIT(parser, 3.4.2b)
+AC_CONFIG_SRCDIR(README)
 
-AM_INIT_AUTOMAKE(parser, 3.1.2beta, nodefine)
 
-dnl expand srcdir
+dnl Automake Initialisation
+AM_INIT_AUTOMAKE
+
+
+dnl Expand srcdir
 P3S=`cd $srcdir/src ; pwd`
 AC_SUBST(P3S)
 
-PARSER_VERSION=$VERSION
+
+dnl Update pa_version.h
+AC_CANONICAL_HOST
+
+PARSER_VERSION="$VERSION (compiled on $host)"
 echo "/* automatically generated by configure */" > $srcdir/src/include/pa_version.h.new
 echo "/* edit configure.in to change version number */" >> $srcdir/src/include/pa_version.h.new
 echo "#define PARSER_VERSION \"$PARSER_VERSION\"" >> $srcdir/src/include/pa_version.h.new
@@ -20,19 +28,14 @@ else
 	rm -f $srcdir/src/include/pa_version.h.new
 fi
 
-
-
-dnl AC_CANONICAL_SYSTEM
-AC_CANONICAL_HOST
 AC_SUBST(host_os)
 case $host_os in
   *cygwin* ) AC_DEFINE(CYGWIN,,using cygwin building environment);;
 esac
 
-dnl Checks for programs.
+
+dnl Checks for programs
 AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 AC_PROG_AWK
 
 AC_PROG_YACC
@@ -51,11 +54,29 @@ fi
 
 AC_PROG_CXX
 AC_PROG_CC
+
 dnl most tests should be compiled with C compiler [especially qsort test]
-AC_LANG_C 
-AC_C_INLINE
+AC_LANG_C
 
-dnl Arguments
+
+dnl Dll extension
+AC_MSG_CHECKING(for dynamic-link library extension)
+case "$host_os" in
+cygwin)
+	dll_extension=dll
+	;;
+*)
+	dll_extension=so
+esac
+AC_MSG_RESULT($dll_extension)
+AC_SUBST(dll_extension)
+
+
+dnl Misc arguments
+AC_ARG_WITH(build-warnings, [  --with-build-warnings   to enable build-time compiler warnings if gcc is used],
+	AC_MSG_WARN(enabling compiler warnings)
+	CXXFLAGS="$CXXFLAGS -W -Wall -Wstrict-prototypes -Wmissing-prototypes"
+)
 
 AC_ARG_WITH(assertions, [  --with-assertions       to enable assertions],
 	AC_MSG_WARN(enabling assertions)
@@ -63,19 +84,33 @@ AC_ARG_WITH(assertions, [  --with-assert
 	AC_DEFINE(NDEBUG,,assertions disabled)
 )
 
+AC_ARG_WITH(pathlink,[  --with-pathlink=LKEY    put dynamic libraries paths to binary
+                          using linker key (-R, -rpath-link)],
+	LD_PATHLINK=$withval
+)
+
+AC_ARG_WITH(sjlj-exceptions,[  --with-sjlj-exceptions  enable simple 'throw' from dynamic library],
+	AC_DEFINE(PA_WITH_SJLJ_EXCEPTIONS,,one can throw from dynamic library)
+)
+
+
+dnl Safe mode argument
 AC_ARG_ENABLE(safe-mode, [  --disable-safe-mode	  to enable reading and executing
                           files belonging to group+user other then effective],
 [
 	SAFE_MODE=$enableval
 ]
 )
+
 if test "$SAFE_MODE" = "no"; then
 	AC_MSG_WARN(enabling reading of files belonging to group+user other then effective)
 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
+
+dnl Disable execs argument
+AC_ARG_ENABLE(execs, [  --disable-execs	      to disable any execs
                           (file::exec, file::cgi, unix mail:send)],
 [
 if test "$enableval" = "no"; then
@@ -86,134 +121,19 @@ 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,
-                          windows-1250 windows-1257 koi8-r; Default is windows-1251)],
-[CHARSETS_REQUESTED=`echo $withval | sed -e 's/,/ /g'`])
-
-# Checking whether all requested charsets have corresponding .cfg files
-for c in $CHARSETS_REQUESTED; do
-	if test \! -f $srccharsetsdir/$c.cfg; then
-		AC_MSG_ERROR(bad charset requested "$c" - file $srccharsetsdir/$c.cfg not found)
-	fi
-done
-
-# Switching on commentcharset_XXX='#'
-AC_DEFUN(PA_SUBSTCHARSET, [
-	commentcharset_$2='#'
-	for c in $CHARSETS_REQUESTED; do
-		if test "$1" = "$c"; then
-			AC_MSG_WARN(enabling charset $1)
-			commentcharset_$2=
-		fi
-	done
-	AC_SUBST(commentcharset_$2)
-])
-PA_SUBSTCHARSET(windows-1251,windows1251)
-PA_SUBSTCHARSET(windows-1250,windows1250)
-PA_SUBSTCHARSET(windows-1257,windows1257)
-PA_SUBSTCHARSET(koi8-r,koi8r)
-
-
-AC_MSG_CHECKING(for dynamic-link library extension)
-case "$host_os" in
-hpux9* | hpux10* | hpux11*)
-	dll_extension=sl
-	;;
-cygwin)
-	dll_extension=dll
-	;;
-*)
-	dll_extension=so
-esac
-AC_MSG_RESULT($dll_extension)
-AC_SUBST(dll_extension)
-
-AC_ARG_WITH(mysql-client,[  --with-mysql-client=mysqlclientlib?withparams
-                          MySQL client dynamic library to root config],
-	mysql_client=$withval
-,
-	AC_MSG_CHECKING(for mysql client)
-	for lib in \
-		/usr/local/lib/mysql/libmysqlclient.$dll_extension \
-		/usr/local/lib/libmysqlclient.$dll_extension \
-		/usr/lib/libmysqlclient.$dll_extension; do
-		if test -f $lib; then mysql_client=$lib; fi
-	done
-
-	if test -z "$mysql_client"; then
-		mysql_client="-configure could not guess-"
-		AC_MSG_RESULT(could not guess)
-	else
-		AC_MSG_RESULT($mysql_client)
-	fi
-
-)
-AC_SUBST(mysql_client)
-
-AC_ARG_WITH(pgsql-client,[  --with-pgsql-client=pgsqlclientlib?withparams
-                          PgSQL client dynamic library to root config],
-	mysql_client=$withval
-,
-	AC_MSG_CHECKING(for pgsql client)
-	for lib in \
-		/usr/local/pgsql/lib/libpq.$dll_extension \
-		/usr/local/lib/libpq.$dll_extension \
-		/usr/lib/libpq.$dll_extension; do
-		if test -f $lib; then pgsql_client=$lib; fi
-	done
-
-	if test -z "$pgsql_client"; then
-		pgsql_client="-configure could not guess-"
-		AC_MSG_RESULT(could not guess)
-	else
-		AC_MSG_RESULT($pgsql_client)
-	fi
-
-)
-AC_SUBST(pgsql_client)
-
-AC_ARG_WITH(oracle-client,[  --with-oracle-client=oracleclientlib?withparams
-                          Oracle client dynamic library],
-	oracle_client=$withval
-,
-	AC_MSG_CHECKING(for oracle client)
-	lib=$ORACLE_HOME/lib/libclntsh.$dll_extension
-	if test -f $lib; then oracle_client=$lib; fi
-
-	if test -z "$oracle_client"; then
-		oracle_client="-configure could not guess-"
-		AC_MSG_RESULT(could not guess)
-	else
-		oracle_client="$oracle_client?ORACLE_HOME=$ORACLE_HOME&ORA_NLS33=$ORACLE_HOME/ocommon/nls/admin/data"
-		AC_MSG_RESULT($oracle_client)
-	fi
-
-)
-AC_SUBST(oracle_client)
-
-
-
-AC_ARG_WITH(pathlink,[  --with-pathlink=LKEY    put dynamic libraries paths to binary
-                          using linker key (-R, -rpath-link)],
-	LD_PATHLINK=$withval
+dnl String stream argument
+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
+]
 )
-AC_ARG_WITH(dynamic-stdcpp, [  --with-dynamic-stdcpp   link libstdc++ dynamically
-                          by default, libstdc++ is linked statically],[
-	AC_MSG_WARN(libstdc++ will be linked dynamically: this is probably incompatible with other platforms)
-	# this is for apache, it's linked with gcc and need to know
-	# and it would not harm linking with c++ toolchain
-	CPP_LIBS="-lstdc++"
-],[
-	CPP_LIBS="-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic"
-])
-AC_SUBST(CPP_LIBS)
 
-AC_ARG_WITH(sjlj-exceptions,[  --with-sjlj-exceptions  enable simple 'throw' from dynamic library],
-	AC_DEFINE(PA_WITH_SJLJ_EXCEPTIONS,,one can throw from dynamic library)
-)
 
+dnl GC argument
 GC_LIB_NAME=gc
 AC_ARG_WITH(shared-gc,[  --with-shared-gc[=D]      D is the directory where
                           Boehm garbage collecting library is installed (shared lib)],[
@@ -221,36 +141,50 @@ AC_ARG_WITH(shared-gc,[  --with-shared-g
 ])
 AC_ARG_WITH(static-gc,[  --with-static-gc[=D]      D is the directory where
                           Boehm garbage collecting library is installed (static lib)],[
-	GC_LIBS="-L$withval -Wl,-Bstatic -l$GC_LIB_NAME -Wl,-Bdynamic"
+	GC_LIBS="$withval/lib$GC_LIB_NAME.la"
 ])
 if test -z "$GC_LIBS"; then
 	#undefined? use any found in system
 	GC_LIBS="-l$GC_LIB_NAME"
 	AC_MSG_WARN([neither --with-shared/static-gc were specified, hoping linker would find it])
-fi
 
-AC_MSG_CHECKING(for libgc)
-SAVE_LIBS=$LIBS
-LIBS="$LIBS $GC_LIBS"
-AC_TRY_LINK([
-	extern int GC_dont_gc;
-],[
-	GC_dont_gc=0;
-],
-	AC_MSG_RESULT(yes)
-,
-	AC_MSG_RESULT(no)
-	AC_MSG_ERROR(please specify path to libgc: --with-shared-gc OR --with-static-gc)
-)
+	AC_MSG_CHECKING(for libgc)
+	SAVE_LIBS=$LIBS
+	LIBS="$LIBS $GC_LIBS"
+	AC_TRY_LINK([
+		extern int GC_dont_gc;
+	],[
+		GC_dont_gc=0;
+	],
+		AC_MSG_RESULT(yes)
+	,
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR(please specify path to libgc: --with-shared-gc OR --with-static-gc)
+	)
+	LIBS=$SAVE_LIBS
+fi
 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
-)
+dnl PCRE argument
+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.la"
+])
+AC_SUBST(PCRE_INCLUDES)
+AC_SUBST(PCRE_LIBS)
+
 
+dnl XML/XSLT argument
 AC_ARG_WITH(shared-xml,[  --with-shared-xml=D     D is the directory where
                           Gnome XML libraries are installed (shared libs)],[
 	GNOME_XML=$withval
@@ -265,21 +199,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
@@ -297,25 +221,18 @@ 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.la $XMLLIB/libexslt.la $XMLLIB/libxml2.la"
 ])
 AC_SUBST(XML_INCLUDES)
 AC_SUBST(XML_LIBS)
 
+dnl Mail receive argument
+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
@@ -332,9 +249,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`
@@ -360,9 +280,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`
@@ -373,12 +296,13 @@ changequote(, )dnl
 	GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'`
 changequote([, ])dnl
 	MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime"
-	MIME_LIBS="$MIMELIB/libgmime.a $GLIB_DIR/lib$GLIB_NAME.a"
+	MIME_LIBS="$MIMELIB/libgmime.la $GLIB_DIR/lib$GLIB_NAME.la"
 ])
 AC_SUBST(MIME_INCLUDES)
 AC_SUBST(MIME_LIBS)
 
 
+dnl Sendmail argument
 AC_ARG_WITH(sendmail,[  \"--with-sendmail=COMMAND\" forces this command to send mail.
                           example: \"--with-sendmail=/usr/sbin/sendmail -t\"
                           (makes parser ignore user-defined sendmail commands)],
@@ -386,42 +310,62 @@ AC_ARG_WITH(sendmail,[  \"--with-sendmai
 )
 
 
-AC_ARG_WITH(apache13,[  --with-apache13=D       D is the Apache13 source distribution directory
-                          builds library for apache_module using that dir
-                          (do not add /src)],
-	APACHE13=$withval
-	if test \! -f "$APACHE13/src/include/httpd.h"; then
-		AC_MSG_ERROR($APACHE13 does not seem to be valid Apache13 source distribution directory)
+dnl Apache module argument
+AC_ARG_WITH(apache,[  --with-apache=FILE is the full path for APXS
+                          builds apache DSO module using apxs],[
+	APXS=$withval
+
+	if test -z "$APXS" -o "$APXS" = "yes"; then
+		APXS=`which apxs 2>/dev/null`
+	fi;
+
+	APACHE=`$APXS -q TARGET 2>/dev/null`
+
+	if test -z "$APACHE"; then
+		APXS=`which apxs2 2>/dev/null`
+		APACHE=`$APXS -q TARGET 2>/dev/null`
+
+		if test -z "$APACHE"; then
+			AC_MSG_ERROR($APXS does not seem to be valid apache apxs utility path)
+		fi
 	fi
-)
-AC_SUBST(APACHE13)
-AM_CONDITIONAL(COMPILE_APACHE13_MODULE, test -n "$APACHE13")
+
+	APACHE_MAIN_INC=`$APXS -q INCLUDEDIR`
+	APACHE_EXTRA_INC=`$APXS -q EXTRA_INCLUDES 2>/dev/null`
+	APACHE_INC="-I$APACHE_MAIN_INC $APACHE_EXTRA_INC"
+	APACHE_CFLAGS=`$APXS -q CFLAGS`
+])
+AC_SUBST(APACHE)
+AC_SUBST(APACHE_INC)
+AC_SUBST(APACHE_CFLAGS)
+AM_CONDITIONAL(COMPILE_APACHE_MODULE, test -n "$APACHE")
 
 
 dnl Enable building of the convenience library
-dnl and set LIBLTDL accordingly
-AC_LIBLTDL_CONVENIENCE(src/lib/ltdl)
-dnl Substitute INCLTDL and LIBLTDL in the Makefiles
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-
-dnl Configure libltdl
-AC_CONFIG_SUBDIRS(src/lib/ltdl)
-
-dnl detecting which libraries are needed to dynamic open
-AC_LTDL_DLLIB
-AC_SUBST(LIBADD_DL)
+LT_CONFIG_LTDL_DIR(src/lib/ltdl)
+LT_INIT(dlopen win32-dll)
+#LT_INIT(disable-shared dlopen win32-dll)
+LTDL_INIT
+
 
 dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_BIGENDIAN(
+	AC_DEFINE(PA_BIG_ENDIAN,,compile for sparc processor)
+,
+	AC_DEFINE(PA_LITTLE_ENDIAN,,compile for intel processor or compatible)
+,
+	AC_MSG_ERROR(word endianness not determined for some obscure reason)
+)
 
 AC_TYPE_SIZE_T
+
+
 dnl gmime
 AC_CHECK_TYPE(off_t, long)
 AC_CHECK_TYPE(ssize_t, int)
 
 
 dnl Checks for C header files.
-
 AC_HEADER_TIME
 
 AC_CHECK_HEADERS(
@@ -444,6 +388,7 @@ string.h \
 direct.h \
 setjmp.h \
 memory.h \
+limits.h \
 sys/file.h \
 sys/locking.h \
 sys/types.h \
@@ -456,10 +401,15 @@ arpa/inet.h \
 netdb.h
 )
 
-dnl Checks for libraries.
+
+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)
   ;;
@@ -475,14 +425,9 @@ case "$host" in
 	  AC_DEFINE(WIN32,,Windows32 target platform)
 	  AC_CHECK_LIB(wsock32, socket)
   ;;
-# never tested this, only theoretically by letter from demos about parser2 build
-  *-hpux*)
-	  AC_CHECK_LIB(nsl, main)
-  ;;
 esac
 
 AC_CHECK_LIB(m, sin)
-
 AC_CHECK_LIB(crypt, crypt)
 
 dnl Checks for functions.
@@ -493,13 +438,16 @@ _locking \
 fcntl \
 lockf \
 ftruncate \
+fchmod \
 getrusage \
 gettimeofday \
 crypt \
-siglongjmp
+sigsetjmp \
+siglongjmp \
+unsetenv
 )
 
-dnl on some linux[seen on 2.4] it's a macro 
+dnl on some linux[seen on 2.4] it's a macro
 PA_CHECK_SIGSETJMP
 
 dnl see comment above
@@ -511,10 +459,9 @@ sign
 )
 AC_LANG_POP
 
-dnl We require qsort(3) and select(2).
+dnl We require qsort(3)
 
 AC_CHECK_FUNCS(qsort, , AC_MSG_ERROR([No qsort library function.]))
-AC_CHECK_FUNCS(select, , AC_MSG_ERROR([No select library function.]))
 
 dnl For correct mail receiving we need to know local offset from GMT
 dnl it be timezone+(daylight?60*60*sign(timezone):0)
@@ -522,83 +469,43 @@ dnl or it can be tm.tm_gmtoff
 dnl or it can be tm.tm_tzadj
 
 AC_MSG_CHECKING(for timezone variable)
-AC_TRY_COMPILE([#include <time.h>],		
+AC_TRY_COMPILE([#include <time.h>],
 [
 time_t test=timezone;
-],                        				 
-AC_DEFINE(HAVE_TIMEZONE)				  
-AC_MSG_RESULT(yes),                        
-AC_MSG_RESULT(no))                         
+],
+AC_DEFINE(HAVE_TIMEZONE)
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING(for daylight variable)
-AC_TRY_COMPILE([#include <time.h>],		
+AC_TRY_COMPILE([#include <time.h>],
 [
 int test=daylight;
-],                        				 
-AC_DEFINE(HAVE_DAYLIGHT)			  
-AC_MSG_RESULT(yes),                        
-AC_MSG_RESULT(no))                         
+],
+AC_DEFINE(HAVE_DAYLIGHT)
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING(for tm_gmtoff in struct tm)
-AC_TRY_COMPILE([#include <time.h>],		
-[struct tm tm;                        	 
-tm.tm_gmtoff=0;                        	
-],                        				 
-AC_DEFINE(HAVE_TM_GMTOFF)				  
-AC_MSG_RESULT(yes),                        
-AC_MSG_RESULT(no))                         
+AC_TRY_COMPILE([#include <time.h>],
+[struct tm tm;
+tm.tm_gmtoff=0;
+],
+AC_DEFINE(HAVE_TM_GMTOFF)
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING(for tm_tzadj in struct tm)
-AC_TRY_COMPILE([#include <time.h>],		
-[struct tm tm;                        	 
-tm.tm_tzadj=0;                        	
-],                        				 
-AC_DEFINE(HAVE_TM_TZADJ)				  
-AC_MSG_RESULT(yes),                        
-AC_MSG_RESULT(no))                         
-
-
-dnl AC_ARG_ENABLE(db, [  --enable-db			 to enable 'hashfile' parser class],
-dnl [
-dnl if test "$enableval" != "no"; then
-dnl AC_CHECK_HEADERS(db.h)
-dnl AC_CHECK_LIB(db, __db_open)
-dnl fi
-dnl ]
-dnl )
-
-dnl install directories
-
-# expand apostrophed
-e_prefix=$prefix
-test "x$e_prefix" = xNONE && e_prefix=$ac_default_prefix
-
-e_sysconfdir=$sysconfdir
-test "$e_sysconfdir" = "\${prefix}/etc" && e_sysconfdir="${e_prefix}/etc"
-
-dnl these are used to fill in etc/parser3.conf
-
-charsetsdir=$e_sysconfdir/parser3.charsets
-AC_SUBST(charsetsdir)
-
-# expand apostrophed
-e_libdir=$libdir
-if test "$e_libdir" = "\${exec_prefix}/lib"; then
-
-	# Let make expand exec_prefix.
-	e_exec_prefix=$exec_prefix
-	test "x$e_exec_prefix" = xNONE && e_exec_prefix=$e_prefix
-
-	# expand apostrophed
-	test "$e_libdir" = "\${exec_prefix}/lib" && e_libdir="${e_exec_prefix}/lib"
-fi
-
-sqldriversdir=$e_libdir
-AC_SUBST(sqldriversdir)
+AC_TRY_COMPILE([#include <time.h>],
+[struct tm tm;
+tm.tm_tzadj=0;
+],
+AC_DEFINE(HAVE_TM_TZADJ)
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no))
 
 
 dnl Output header and makefiles
-
 AH_TEMPLATE([HAVE_DLD],[Define if you have the GNU dld library])
 
 AH_TEMPLATE([HAVE_LIBDL],
@@ -628,33 +535,33 @@ AH_TEMPLATE([HAVE_TM_TZADJ],
 
 
 AM_CONFIG_HEADER(src/include/pa_config_auto.h)
+
 AC_OUTPUT(
 	Makefile 
 	src/Makefile 
 	src/types/Makefile 
 	src/classes/Makefile 
-	src/classes/gd/Makefile 
-	src/classes/smtp/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/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
+	src/lib/sdbm/pa-include/Makefile
+	src/lib/json/Makefile
+	src/lib/memcached/Makefile
+	src/lib/curl/Makefile
 	src/targets/Makefile
 	src/targets/cgi/Makefile
-	src/targets/apache13core/Makefile
-	src/targets/apache13/Makefile
-	src/targets/apache13/p3runConfigure
+	src/targets/apache/Makefile
 	src/targets/isapi/Makefile
 	etc/Makefile
 	etc/parser3.charsets/Makefile