--- parser3/Attic/configure.in	2012/06/11 23:11:35	1.148
+++ parser3/Attic/configure.in	2012/06/15 12:02:11	1.166
@@ -1,6 +1,6 @@
 dnl Autoconf initialisation
 AC_PREREQ(2.59)
-AC_INIT(parser, 3.4.2b)
+AC_INIT(parser, 3.4.2 RC)
 AC_CONFIG_SRCDIR(README)
 
 
@@ -13,20 +13,9 @@ P3S=`cd $srcdir/src ; pwd`
 AC_SUBST(P3S)
 
 
-dnl Update pa_version.h
+dnl Parser version update
 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
-cmp $srcdir/src/include/pa_version.h.new $srcdir/src/include/pa_version.h >/dev/null 2>&1
-if test $? -ne 0 ; then
-	rm -f $srcdir/src/include/pa_version.h && mv $srcdir/src/include/pa_version.h.new $srcdir/src/include/pa_version.h && \
-	echo Updated $srcdir/src/include/pa_version.h
-else
-	rm -f $srcdir/src/include/pa_version.h.new
-fi
+AC_DEFINE(PARSER_VERSION,$VERSION (compiled on $host),parser version)
 
 AC_SUBST(host_os)
 case $host_os in
@@ -110,7 +99,7 @@ fi
 
 
 dnl Disable execs argument
-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
@@ -134,96 +123,121 @@ fi
 
 
 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)],[
-	GC_LIBS="-L$withval -l$GC_LIB_NAME"
-])
-AC_ARG_WITH(static-gc,[  --with-static-gc[=D]      D is the directory where
-                          Boehm garbage collecting library is installed (static lib)],[
-	GC_LIBS="$withval/lib$GC_LIB_NAME.a"
+AC_ARG_WITH(gc,[  --with-gc[=D]             D is the directory where
+                          Boehm garbage collecting library is installed],[
+
+	GC=$withval
+	GC_LIBS="$GC/libgc.la"
+
+	if test -f $GC_LIBS; then
+		GC_OK="yes"
+	else
+		GC_LIBS="-L$GC -lgc"
+	fi
+],[
+	GC_LIBS="-lgc"
+	AC_MSG_WARN([--with-gc was not specified, hoping linker would find it])
 ])
-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])
+
+if test -z "$GC_OK"; then
+	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)
+		if test -z "$GC"; then
+			AC_MSG_ERROR(please specify path to libgc: --with-gc)
+		else
+			AC_MSG_ERROR($GC does not seem to be valid libgc installation directory)
+		fi
+	)
+	LIBS=$SAVE_LIBS
 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_SUBST(GC_LIBS)
-LIBS=$SAVE_LIBS
 
 
 dnl PCRE argument
-AC_ARG_WITH(static-pcre,[  --with-static-pcre=D    D is the directory where
-                          PCRE library is installed (static lib)],[
+AC_ARG_WITH(pcre,[  --with-pcre=D           D is the directory where
+                          PCRE library is installed],[
 	PCRE=$withval
-	PCREINC="$PCRE/include"
-	PCRELIB="$PCRE/lib"
+	PCRE_INCLUDES="-I$PCRE/include"
+	PCRE_LIBS="$PCRE/lib/libpcre.la"
 
-	if test \! -d $PCREINC -o \! -d $PCRELIB; then
-		AC_MSG_ERROR($PCRE does not seem to be valid PCRE installation directory)
+	if test -f $PCRE/include/pcre.h -a -f $PCRE_LIBS; then
+		PCRE_OK="yes"
+	else
+		PCRE_LIBS="-L$PCRE -lpcre"
 	fi
 
-	PCRE_INCLUDES="-I$PCREINC"
-	PCRE_LIBS="$PCRELIB/libpcre.a"
+],[
+	PCRE_LIBS="-lpcre"
+	AC_MSG_WARN([--with-pcre was not specified, hoping linker would find it])
 ])
+
+if test -z "$PCRE_OK"; then
+	AC_MSG_CHECKING(for prce)
+	SAVE_LIBS=$LIBS
+	LIBS="$LIBS $PCRE_LIBS $PCRE_INCLUDES"
+	AC_TRY_LINK([ #include <pcre.h> ],[ const char *v=pcre_version(); ],
+		AC_MSG_RESULT(yes)
+	,
+		AC_MSG_RESULT(no)
+		if test -z "$PCRE"; then
+			AC_MSG_ERROR(please specify path to PCRE: --with-pcre)
+		else
+			AC_MSG_ERROR($PCRE does not seem to be valid PCRE installation directory)
+		fi
+	)
+	LIBS=$SAVE_LIBS
+fi
+
 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
-	XMLBIN="$GNOME_XML/bin"
-	XMLINC="$GNOME_XML/include"
-	XMLLIB="$GNOME_XML/lib"
-
-	if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then
-		AC_MSG_ERROR($GNOME_XML does not seem to be valid Gnome installation directory)
-	fi
+AC_ARG_WITH(xml,[  --with-xml=D            D is the directory where
+                          Gnome XML libraries are installed],[
 
-	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/\..*//'`
-	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/\..*//'`
+	XML=$withval
+	XML_LIBS="-lxml2 -lxslt -lexslt"
 
-	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"
+	if test -z "$XML" -o "$XML" = "yes"; then
+		XML=""
+		XML_INCLUDES="-I/usr/include/libxml2"
+		AC_MSG_WARN([--with-xml value was not specified, hoping linker would find it])
+	else
+		XML_INCLUDES="-I$XML/include -I$XML/include/libxml2"
+
+		if test -f $XML/include/libxslt/xslt.h -a -f $XML/lib/libxml2.la \
+			-a -f $XML/lib/libxslt.la -a -f $XML/lib/libexslt.la; then
+			XML_LIBS="$XML/lib/libxml2.la $XML/lib/libxslt.la $XML/lib/libexslt.la"
+			XML_OK="yes"
+		fi
 	fi
-])
-AC_ARG_WITH(static-xml,[  --with-static-xml=D     D is the directory where
-                          Gnome XML libraries are installed (static libs)],[
-	GNOME_XML=$withval
-	XMLBIN="$GNOME_XML/bin"
-	XMLINC="$GNOME_XML/include"
-	XMLLIB="$GNOME_XML/lib"
 
-	if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then
-		AC_MSG_ERROR($GNOME_XML does not seem to be valid Gnome installation directory)
+	if test -z "$XML_OK"; then
+		AC_MSG_CHECKING(for xml)
+		SAVE_LIBS=$LIBS
+		LIBS="$LIBS $XML_LIBS $XML_INCLUDES"
+		AC_TRY_LINK([ #include <libxslt/xslt.h> ],[ const char *v=xsltEngineVersion; ],
+			AC_MSG_RESULT(yes)
+		,
+			AC_MSG_RESULT(no)
+			if test -z "$XML"; then
+				AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml)
+			else
+				AC_MSG_ERROR($XML does not seem to be valid Gnome XML installation directory)
+			fi
+		)
+		LIBS=$SAVE_LIBS
 	fi
-
-	AC_DEFINE(XML,,xml-abled parser (uses static library))
-
-	XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libxml2"
-	XML_LIBS="$XMLLIB/libxslt.a $XMLLIB/libexslt.a $XMLLIB/libxml2.a"
+	AC_DEFINE(XML,,xml-abled parser)
 ])
+
 AC_SUBST(XML_INCLUDES)
 AC_SUBST(XML_LIBS)
 
@@ -296,7 +310,7 @@ 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)
@@ -311,23 +325,21 @@ AC_ARG_WITH(sendmail,[  \"--with-sendmai
 
 
 dnl Apache module argument
-AC_ARG_WITH(apache,[  --with-apache=FILE is the full path for APXS
+AC_ARG_WITH(apache,[  --with-apache=FILE      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;
+		if test -z "$APXS"; then
+			APXS=`which apxs2 2>/dev/null`
+		fi
+	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
+		AC_MSG_ERROR($APXS does not seem to be valid apache apxs utility path)
 	fi
 
 	APACHE_MAIN_INC=`$APXS -q INCLUDEDIR`
@@ -343,7 +355,7 @@ AM_CONDITIONAL(COMPILE_APACHE_MODULE, te
 
 dnl Enable building of the convenience library
 LT_CONFIG_LTDL_DIR(src/lib/ltdl)
-LT_INIT(dlopen win32-dll)
+LT_INIT(dlopen win32-dll no-pic)
 LTDL_INIT