- link with pthread library

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

diff --git a/php-mcal-shared-lib.patch b/php-mcal-shared-lib.patch
index c32cc8ab0ec9689d77dcbb504677c6a6a3b88253..a39ae73a7cae2001bbb65c0096ba94285283d104 100644 (file)
--- a/php-mcal-shared-lib.patch
+++ b/php-mcal-shared-lib.patch
@@ -9,20 +9,14 @@
        MCAL_LIBRARY=$i
      fi
    done
-@@ -37,13 +37,14 @@
+@@ -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 ! -f "$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_LIBPATH($MCAL_LIBRARY,MCAL_SHARED_LIBADD)
-   PHP_ADD_LIBRARY_DEFER(mcal,[],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)