--- parser3/Attic/configure.in	2012/06/09 22:54:39	1.145
+++ parser3/Attic/configure.in	2012/06/13 19:07:13	1.157
@@ -133,17 +133,6 @@ fi
 )
 
 
-dnl Dynamic libstdc++ argument
-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)
-	CPP_LIBS="-lstdc++"
-],[
-	CPP_LIBS="-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic"
-])
-AC_SUBST(CPP_LIBS)
-
-
 dnl GC argument
 GC_LIB_NAME=gc
 AC_ARG_WITH(shared-gc,[  --with-shared-gc[=D]      D is the directory where
@@ -152,29 +141,29 @@ 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="$withval/lib$GC_LIB_NAME.a"
+	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
 
 
 dnl PCRE argument
@@ -189,7 +178,7 @@ AC_ARG_WITH(static-pcre,[  --with-static
 	fi
 
 	PCRE_INCLUDES="-I$PCREINC"
-	PCRE_LIBS="$PCRELIB/libpcre.a"
+	PCRE_LIBS="$PCRELIB/libpcre.la"
 ])
 AC_SUBST(PCRE_INCLUDES)
 AC_SUBST(PCRE_LIBS)
@@ -233,7 +222,7 @@ AC_ARG_WITH(static-xml,[  --with-static-
 	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"
+	XML_LIBS="$XMLLIB/libxslt.la $XMLLIB/libexslt.la $XMLLIB/libxml2.la"
 ])
 AC_SUBST(XML_INCLUDES)
 AC_SUBST(XML_LIBS)
@@ -307,7 +296,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)
@@ -328,7 +317,10 @@ AC_ARG_WITH(apache,[  --with-apache=FILE
 
 	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`
 
@@ -350,13 +342,10 @@ 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)
 LTDL_INIT
 
 
-dnl Configure libtool
-AC_DISABLE_STATIC
-
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN(
 	AC_DEFINE(PA_BIG_ENDIAN,,compile for sparc processor)