--- parser3/Attic/configure.in	2009/11/16 23:35:17	1.121
+++ parser3/Attic/configure.in	2010/11/28 14:18:15	1.133
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
 AC_INIT(README)
 AC_PREREQ(2.57)
 
-AM_INIT_AUTOMAKE(parser, 3.4.0b, nodefine)
+AM_INIT_AUTOMAKE(parser, 3.4.1b, nodefine)
 
 dnl expand srcdir
 P3S=`cd $srcdir/src ; pwd`
@@ -266,7 +266,7 @@ 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.a"
 ])
 if test -z "$GC_LIBS"; then
 	#undefined? use any found in system
@@ -291,7 +291,7 @@ AC_SUBST(GC_LIBS)
 LIBS=$SAVE_LIBS
 
 
-AC_ARG_WITH(static-pcre,[  --with-static-pcre=D     D is the directory where
+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"
@@ -350,6 +350,19 @@ AC_ARG_WITH(static-xml,[  --with-static-
 AC_SUBST(XML_INCLUDES)
 AC_SUBST(XML_LIBS)
 
+AC_ARG_WITH(curl,[  --with-curl=D           D is the curl includes directory],[
+	CURLINC=$withval
+
+	if test \! -d $CURLINC -o \! -r $CURLINC/curl.h; then
+		AC_MSG_ERROR($CURLINC does not seem to be valid curl includes directory)
+	fi
+
+	AC_DEFINE(HAVE_CURL,,curl enabled parser)
+
+	CURL_INCLUDES="-I$CURLINC -I$CURLINC/../"
+])
+AC_SUBST(CURL_INCLUDES)
+
 AC_ARG_WITH(glib-config,[  --with-glib-config=FILE FILE is glib library
                           configuration file (search for glib*-config)],
 	GLIB_CONFIG=$withval
@@ -431,16 +444,29 @@ 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)
+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
+		AC_MSG_ERROR($APXS does not seem to be valid apache apxs utility path)
 	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
@@ -676,12 +702,11 @@ AC_OUTPUT(
 	src/lib/ltdl/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/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