--- dbxml-2.3.10/xqilla/configure.new	2008-04-01 17:55:01.000000000 -0300
+++ dbxml-2.3.10/xqilla/configure	2008-04-01 17:55:57.000000000 -0300
@@ -2131,6 +2131,15 @@
         xerces_lib="$with_xerces/lib"
         xerces_include="$with_xerces/src"
         xerces_library="xerces-c"
+elif test `ls $with_xerces/lib64/libxerces-c*2[6-7].* 2>/dev/null | wc -l` -gt 0 ; then
+        echo "$as_me:$LINENO: checking for Xerces C++ version from source tree" >&5
+echo $ECHO_N "checking for Xerces C++ version from source tree... $ECHO_C" >&6
+        xerces_version=`ls "$with_xerces"/lib64/libxerces-c*[0-9][0-9].* | tail -1 | sed 's/.*xerces-c*\([0-9]\)\([0-9]\).*/\1.\2/'`
+        echo "$as_me:$LINENO: result: $xerces_version" >&5
+echo "${ECHO_T}$xerces_version" >&6
+        xerces_lib="$with_xerces/lib64"
+        xerces_include="$with_xerces/src"
+        xerces_library="xerces-c"
 else
         { { echo "$as_me:$LINENO: error: Xerces-C++ is required to build XQuery.  $with_xerces not a valid, supported Xerces tree.  You must specify the path where Xerces is installed with --with-xerces." >&5
 echo "$as_me: error: Xerces-C++ is required to build XQuery.  $with_xerces not a valid, supported Xerces tree.  You must specify the path where Xerces is installed with --with-xerces." >&2;}
--- dbxml-2.3.10/dbxml/dist/aclocal/options.ac.orig	2008-04-01 19:03:26.000000000 -0300
+++ dbxml-2.3.10/dbxml/dist/aclocal/options.ac	2008-04-01 19:13:49.000000000 -0300
@@ -147,7 +147,10 @@
 fi
 with_xqilla=`cd $with_xqilla && pwd`
 # Try as an install directory
-if test `ls "$with_xqilla"/lib/libxqilla*.la 2>/dev/null | wc -l` -gt 0 ; then
+if test `ls "$with_xqilla"/lib64/libxqilla*.la 2>/dev/null | wc -l` -gt 0 ; then
+	echo "$CPPFLAGS" | grep "$with_xqilla/include" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_xqilla/include"
+	LIBS="$LIBS -L$with_xqilla/lib64 -lxqilla"
+elif test `ls "$with_xqilla"/lib/libxqilla*.la 2>/dev/null | wc -l` -gt 0 ; then
 	echo "$CPPFLAGS" | grep "$with_xqilla/include" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_xqilla/include"
 	LIBS="$LIBS -L$with_xqilla/lib -lxqilla"
 # Try as a source directory, built in the top level directory