]>
Commit | Line | Data |
---|---|---|
85c7abaf PG |
1 | --- ./ext/mcal/config.m4.org Mon Jun 24 13:37:15 2002 |
2 | +++ ./ext/mcal/config.m4 Sat Sep 7 11:19:45 2002 | |
9d6174b1 | 3 | @@ -20,7 +20,7 @@ |
4 | done | |
5 | ||
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 | |
9 | MCAL_LIBRARY=$i | |
10 | fi | |
11 | done | |
85c7abaf | 12 | @@ -37,13 +37,14 @@ |
9d6174b1 | 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) |
14 | fi | |
15 | ||
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) | |
85c7abaf | 18 | + if test ! -f "$MCAL_LIBRARY"; then |
9d6174b1 | 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) |
20 | fi | |
21 | ||
22 | PHP_ADD_INCLUDE($MCAL_INCLUDE) | |
85c7abaf PG |
23 | PHP_ADD_LIBPATH($MCAL_LIBRARY,MCAL_SHARED_LIBADD) |
24 | PHP_ADD_LIBRARY_DEFER(mcal,[],MCAL_SHARED_LIBADD) | |
9d6174b1 | 25 | + PHP_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD) |
26 | PHP_SUBST(MCAL_SHARED_LIBADD) | |
27 | AC_DEFINE(HAVE_MCAL,1,[ ]) | |
28 | PHP_EXTENSION(mcal,$ext_shared) |