cvs: php4 /ext/mcal/ config.m4

chagenbu Mon Jun 12 17:57:57 2000 EDT Modified files: /php4/ext/mcal config.m4 Log: Check more locations. Submitted by Anil Madhavapeddy <anil@recoil.org> Index: php4/ext/mcal/config.m4 diff -u php4/ext/mcal/config.m4:1.6 php4/ext/mcal/config.m4:1.7 --- php4/ext/mcal/config.m4:1.6 Wed May 31 10:33:29 2000 +++ php4/ext/mcal/config.m4 Mon Jun 12 17:57:57 2000 @@ -1,18 +1,40 @@ -dnl $Id: config.m4,v 1.6 2000/05/31 17:33:29 chagenbu Exp $ +dnl $Id: config.m4,v 1.7 2000/06/13 00:57:57 chagenbu Exp $ PHP_ARG_WITH(mcal,for MCAL support, [ --with-mcal[=DIR] Include MCAL support.]) if test "$PHP_MCAL" != "no"; then + MCAL_DEFAULT_SEARCH=/usr/local if test "$PHP_MCAL" = "yes"; then - MCAL_DIR=/usr/local + MCAL_DIR=$MCAL_DEFAULT_SEARCH else AC_EXPAND_PATH($PHP_MCAL, MCAL_DIR) fi - - AC_ADD_INCLUDE($MCAL_DIR) - AC_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_DIR, MCAL_SHARED_LIBADD) + + for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/include $MCAL_DIR/include; do + if test -r "$i/mcal.h"; then + MCAL_INCLUDE=$i + fi + done + + for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib; do + if test -r "$i/libmcal.a"; then + MCAL_LIBRARY=$i + fi + done + + if test ! -f "$MCAL_INCLUDE/mcal.h"; then + AC_MSG_ERROR(Unable to locate your libmcal header files - mcal.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) + fi + + AC_ADD_INCLUDE($MCAL_INCLUDE) + AC_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) fi +