--- /dev/null
+--- php-4.2.1/ext/mcal/config.m4.orig Thu Apr 4 01:04:44 2002
++++ php-4.2.1/ext/mcal/config.m4 Tue May 14 00:26:25 2002
+@@ -20,7 +20,7 @@
+ done
+
+ for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
+- if test -r "$i/libmcal.a"; then
++ if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
+ MCAL_LIBRARY=$i
+ fi
+ done
+@@ -37,12 +37,12 @@
+ AC_MSG_ERROR(Unable to locate your libmcal header files - icalroutines.h should be in the directory you specify or in the include/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
+ fi
+
+- if test ! -f "$MCAL_LIBRARY/libmcal.a"; then
+- AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
++ if test -z "$MCAL_LIBRARY"; then
++ AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.* should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
+ fi
+
+ PHP_ADD_INCLUDE($MCAL_INCLUDE)
+- PHP_ADD_LIBRARY_DEFER_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD)
+ PHP_SUBST(MCAL_SHARED_LIBADD)
+ AC_DEFINE(HAVE_MCAL,1,[ ])
+ PHP_EXTENSION(mcal,$ext_shared)
--- /dev/null
+--- php-4.2.1/ext/xmlrpc/config.m4.orig Tue Mar 26 01:15:29 2002
++++ php-4.2.1/ext/xmlrpc/config.m4 Tue May 14 17:48:54 2002
+@@ -57,12 +57,18 @@
+
+ if test -r $PHP_XMLRPC/include/xmlrpc.h; then
+ XMLRPC_DIR=$PHP_XMLRPC
++ XMLRPC_INC=$$XMLRPC_DIR/include
+ else
+ AC_MSG_CHECKING(for XMLRPC-EPI in default path)
+ for i in /usr/local /usr; do
+ if test -r $i/include/xmlrpc.h; then
+ XMLRPC_DIR=$i
++ XMLRPC_INC=$i/include
+ AC_MSG_RESULT(found in $i)
++ elif test -r $i/include/xmlrpc-epi/xmlrpc.h; then
++ XMLRPC_DIR=$i
++ XMLRPC_INC=$i/include/xmlrpc-epi
++ AC_MSG_RESULT([found in $i, includes in $i/include/xmlrpc-rpi])
+ fi
+ done
+ fi
+@@ -72,7 +78,7 @@
+ AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution)
+ fi
+
+- PHP_ADD_INCLUDE($XMLRPC_DIR/include)
++ PHP_ADD_INCLUDE($XMLRPC_INC)
+ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
+
+ fi