diff -ru -x autom4te.cache php5-source.orig/ext/xml/config.m4 php5-source/ext/xml/config.m4
--- php5-source.orig/ext/xml/config.m4	2009-01-21 01:09:14 +0300
+++ php5-source/ext/xml/config.m4	2009-01-21 15:14:32 +0300
@@ -10,8 +10,8 @@
   [  --with-libxml-dir=DIR     XML: libxml2 install prefix], no, no)
 fi
 
-PHP_ARG_WITH(libexpat-dir, libexpat install dir,
-[  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
+PHP_ARG_WITH(xml-libexpat-dir, libexpat install dir,
+[  --with-xml-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
 
 if test "$PHP_XML" != "no"; then
 
@@ -33,11 +33,11 @@
   fi
   
   dnl
-  dnl Check for expat only if --with-libexpat-dir is used.
+  dnl Check for expat only if --with-xml-libexpat-dir is used.
   dnl
-  if test "$PHP_LIBEXPAT_DIR" != "no"; then
-    for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
-      if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
+  if test "$PHP_XML_LIBEXPAT_DIR" != "no"; then
+    for i in $PHP_XML $PHP_XML_LIBEXPAT_DIR /usr /usr/local; do
+      if test -f "$i/libexpat.a" || test -f "$i/libexpat.$SHLIB_SUFFIX_NAME"; then
         EXPAT_DIR=$i
         break
       fi
@@ -48,7 +48,7 @@
     fi
 
     PHP_ADD_INCLUDE($EXPAT_DIR/include)
-    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/$PHP_LIBDIR, XML_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR, XML_SHARED_LIBADD)
     AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
   fi