--- parser3/Attic/configure.in	2012/06/13 21:42:26	1.159
+++ parser3/Attic/configure.in	2012/06/15 19:31:12	1.172
@@ -1,6 +1,6 @@
 dnl Autoconf initialisation
 AC_PREREQ(2.59)
-AC_INIT(parser, 3.4.2b)
+AC_INIT(parser, 3.4.2)
 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_UNQUOTED(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,7 +123,7 @@ fi
 
 
 dnl GC argument
-AC_ARG_WITH(gc,[  --with-gc[=D]      D is the directory where
+AC_ARG_WITH(gc,[  --with-gc[=D]             D is the directory where
                           Boehm garbage collecting library is installed],[
 
 	GC=$withval
@@ -145,6 +134,12 @@ AC_ARG_WITH(gc,[  --with-gc[=D]      D i
 	else
 		GC_LIBS="-L$GC -lgc"
 	fi
+
+	if test "$GC" = "yes"; then
+		GC=""
+		GC_LIBS="-lgc"
+		AC_MSG_WARN([--with-gc value was not specified, hoping linker would find it])
+	fi
 ],[
 	GC_LIBS="-lgc"
 	AC_MSG_WARN([--with-gc was not specified, hoping linker would find it])
@@ -159,7 +154,7 @@ if test -z "$GC_OK"; then
 	,
 		AC_MSG_RESULT(no)
 		if test -z "$GC"; then
-			AC_MSG_ERROR(please specify path to libgc: --with-gc)
+			AC_MSG_ERROR(please specify path to libgc: --with-gc=D)
 		else
 			AC_MSG_ERROR($GC does not seem to be valid libgc installation directory)
 		fi
@@ -171,7 +166,7 @@ AC_SUBST(GC_LIBS)
 
 
 dnl PCRE argument
-AC_ARG_WITH(pcre,[  --with-pcre=D    D is the directory where
+AC_ARG_WITH(pcre,[  --with-pcre=D           D is the directory where
                           PCRE library is installed],[
 	PCRE=$withval
 	PCRE_INCLUDES="-I$PCRE/include"
@@ -183,8 +178,15 @@ AC_ARG_WITH(pcre,[  --with-pcre=D    D i
 		PCRE_LIBS="-L$PCRE -lpcre"
 	fi
 
+	if test "$PCRE" = "yes"; then
+		PCRE=""
+		PCRE_LIBS="-lpcre"
+		PCRE_INCLUDES=""
+		AC_MSG_WARN([--with-pcre value was not specified, hoping linker would find it])
+	fi
 ],[
 	PCRE_LIBS="-lpcre"
+	PCRE_INCLUDES=""
 	AC_MSG_WARN([--with-pcre was not specified, hoping linker would find it])
 ])
 
@@ -197,7 +199,7 @@ if test -z "$PCRE_OK"; then
 	,
 		AC_MSG_RESULT(no)
 		if test -z "$PCRE"; then
-			AC_MSG_ERROR(please specify path to PCRE: --with-pcre)
+			AC_MSG_ERROR(please specify path to PCRE: --with-pcre=D)
 		else
 			AC_MSG_ERROR($PCRE does not seem to be valid PCRE installation directory)
 		fi
@@ -210,7 +212,7 @@ AC_SUBST(PCRE_LIBS)
 
 
 dnl XML/XSLT argument
-AC_ARG_WITH(xml,[  --with-xml=D     D is the directory where
+AC_ARG_WITH(xml,[  --with-xml=D            D is the directory where
                           Gnome XML libraries are installed],[
 
 	XML=$withval
@@ -239,7 +241,7 @@ AC_ARG_WITH(xml,[  --with-xml=D     D is
 		,
 			AC_MSG_RESULT(no)
 			if test -z "$XML"; then
-				AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml)
+				AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml=D)
 			else
 				AC_MSG_ERROR($XML does not seem to be valid Gnome XML installation directory)
 			fi
@@ -336,7 +338,7 @@ 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
 
@@ -366,8 +368,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(disable-shared dlopen win32-dll)
+LT_INIT(dlopen win32-dll no-pic)
 LTDL_INIT