cvs: /php4/ext/mcal Makefile.in config.m4

sas Tue May 2 06:00:45 2000 EDT Modified files: /php4/ext/mcal Makefile.in config.m4 Log: Make mcal buildable as shared module Index: php4/ext/mcal/Makefile.in diff -u php4/ext/mcal/Makefile.in:1.8 php4/ext/mcal/Makefile.in:1.9 --- php4/ext/mcal/Makefile.in:1.8 Tue May 2 00:38:29 2000 +++ php4/ext/mcal/Makefile.in Tue May 2 06:00:45 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libmcal.la LTLIBRARY_SOURCES = php_mcal.c +LTLIBRARY_SHARED_NAME = mcal.la +LTLIBRARY_SHARED_LIBADD = $(MCAL_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/mcal/config.m4 diff -u php4/ext/mcal/config.m4:1.4 php4/ext/mcal/config.m4:1.5 --- php4/ext/mcal/config.m4:1.4 Thu Dec 30 05:52:06 1999 +++ php4/ext/mcal/config.m4 Tue May 2 06:00:45 2000 @@ -1,25 +1,18 @@ -dnl $Id: config.m4,v 1.4 1999/12/30 04:52:06 sas Exp $ +dnl $Id: config.m4,v 1.5 2000/05/02 04:00:45 sas Exp $ -AC_MSG_CHECKING(for MCAL support) -AC_ARG_WITH(mcal, -[ --with-mcal[=DIR] Include MCAL support.], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - MCAL_DIR=/usr/local - else - MCAL_DIR=$withval - fi - - AC_ADD_INCLUDE($MCAL_DIR) - AC_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_DIR) - AC_DEFINE(HAVE_MCAL,1,[ ]) - PHP_EXTENSION(mcal) - AC_MSG_RESULT(yes) +PHP_ARG_WITH(mcal,for MCAL support, +[ --with-mcal[=DIR] Include MCAL support.]) + +if test "$PHP_MCAL" != "no"; then + if test "$PHP_MCAL" = "yes"; then + MCAL_DIR=/usr/local else - AC_MSG_ERROR(no) + MCAL_DIR=$PHP_MCAL fi -],[ - AC_MSG_RESULT(no) -]) - + + AC_ADD_INCLUDE($MCAL_DIR) + AC_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_DIR, MCAL_SHARED_LIBADD) + PHP_SUBST(MCAL_SHARED_LIBADD) + AC_DEFINE(HAVE_MCAL,1,[ ]) + PHP_EXTENSION(mcal,$ext_shared) +fi