Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pgsql/configure.in,v
retrieving revision 1.515
diff -u -r1.515 configure.in
--- configure.in	4 Jun 2007 21:55:43 -0000	1.515
+++ configure.in	28 Jun 2007 18:18:10 -0000
@@ -571,16 +571,8 @@
 if test "$with_libxml" = yes ; then
   AC_CHECK_PROGS(XML2_CONFIG, xml2-config)
   if test -n "$XML2_CONFIG"; then
-    for pgac_option in `$XML2_CONFIG --cflags`; do
-      case $pgac_option in
-        -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
-      esac
-    done
-    for pgac_option in `$XML2_CONFIG --libs`; do
-      case $pgac_option in
-        -L*) LDFLAGS="$LDFLAGS $pgac_option";;
-      esac
-    done
+    CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags`"
+    LDFLAGS="$LDFLAGS `$XML2_CONFIG --libs`"
   fi
 fi
 
@@ -698,7 +690,7 @@
 # awk -F is a regex on some platforms, and not on others, so make "." a tab
 PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
 tr '.' '	' |
-$AWK '{printf \"%d%02d%02d\", $1, $2, (NF >= 3) ? $3 : 0}'`"
+$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"
 AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
 
 ##