1 --- php-4.2.1/ext/mcal/config.m4.orig Thu Apr 4 01:04:44 2002
2 +++ php-4.2.1/ext/mcal/config.m4 Tue May 14 00:26:25 2002
6 for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
7 - if test -r "$i/libmcal.a"; then
8 + if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
13 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)
16 - if test ! -f "$MCAL_LIBRARY/libmcal.a"; then
17 - 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)
18 + if test -z "$MCAL_LIBRARY"; then
19 + 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)
22 PHP_ADD_INCLUDE($MCAL_INCLUDE)
23 - PHP_ADD_LIBRARY_DEFER_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD)
24 + PHP_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD)
25 PHP_SUBST(MCAL_SHARED_LIBADD)
26 AC_DEFINE(HAVE_MCAL,1,[ ])
27 PHP_EXTENSION(mcal,$ext_shared)