diff options
| author | Sascha Schumann <sas@php.net> | 2000-05-02 04:00:47 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-05-02 04:00:47 +0000 |
| commit | f1dfd1f5f746b33b85ab307dbfdde8131aa1d6b6 (patch) | |
| tree | ba01698a96acea78999cf12f99483dcbcd4748cb /ext | |
| parent | 0b516602fd274d477850095b0edea52f09b01e82 (diff) | |
| download | php-git-f1dfd1f5f746b33b85ab307dbfdde8131aa1d6b6.tar.gz | |
Make mcal buildable as shared module
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mcal/Makefile.in | 2 | ||||
| -rw-r--r-- | ext/mcal/config.m4 | 35 |
2 files changed, 16 insertions, 21 deletions
diff --git a/ext/mcal/Makefile.in b/ext/mcal/Makefile.in index fa78917882..cda0b29b9e 100644 --- a/ext/mcal/Makefile.in +++ b/ext/mcal/Makefile.in @@ -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 diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4 index 79be84b821..01c898bb2c 100644 --- a/ext/mcal/config.m4 +++ b/ext/mcal/config.m4 @@ -1,25 +1,18 @@ dnl $Id$ -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 |