--- parser3/Attic/configure.in	2005/01/19 15:48:03	1.82
+++ parser3/Attic/configure.in	2005/11/24 14:45:34	1.83.6.3
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
 AC_INIT(README)
 AC_PREREQ(2.57)
 
-AM_INIT_AUTOMAKE(parser, 3.1.4beta, nodefine)
+AM_INIT_AUTOMAKE(parser, 3.1.5beta, nodefine)
 
 dnl expand srcdir
 P3S=`cd $srcdir/src ; pwd`
@@ -107,7 +107,7 @@ for c in $CHARSETS_REQUESTED; do
 done
 
 # Switching on commentcharset_XXX='#'
-AC_DEFUN(PA_SUBSTCHARSET, [
+AC_DEFUN([PA_SUBSTCHARSET], [
 	commentcharset_$2='#'
 	for c in $CHARSETS_REQUESTED; do
 		if test "$1" = "$c"; then
@@ -279,7 +279,10 @@ AC_ARG_WITH(shared-xml,[  --with-shared-
 	if test -z "$GLIB_CONFIG"; then
 		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`