- backport from PHP CVS to fix compilation with PostgreSQL 7.2.x

[packages/php.git] / php-mcal-shared-lib.patch

diff --git a/php-mcal-shared-lib.patch b/php-mcal-shared-lib.patch
index 1ea548ea0b319bd2082db62ec2492feedf403879..a39ae73a7cae2001bbb65c0096ba94285283d104 100644 (file)
--- a/php-mcal-shared-lib.patch
+++ b/php-mcal-shared-lib.patch
@@ -1,5 +1,5 @@
---- 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
+--- ./ext/mcal/config.m4.org   Mon Jun 24 13:37:15 2002
++++ ./ext/mcal/config.m4       Sat Sep  7 11:19:45 2002
 @@ -20,7 +20,7 @@
    done
  
@@ -9,19 +9,14 @@
        MCAL_LIBRARY=$i
      fi
    done
-@@ -37,12 +37,12 @@
+@@ -37,8 +37,8 @@
      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
++  if test ! -f "$MCAL_LIBRARY/libmcal.a" -a ! -f "$MCAL_LIBRARY/libmcal.so"; 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)