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

sas Tue May 2 04:01:13 2000 EDT Modified files: /php4/ext/icap Makefile.in config.m4 Log: Make icap buildable as shared module Index: php4/ext/icap/Makefile.in diff -u php4/ext/icap/Makefile.in:1.10 php4/ext/icap/Makefile.in:1.11 --- php4/ext/icap/Makefile.in:1.10 Tue May 2 00:38:28 2000 +++ php4/ext/icap/Makefile.in Tue May 2 04:01:13 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libicap.la LTLIBRARY_SOURCES = php_icap.c +LTLIBRARY_SHARED_NAME = icap.la +LTLIBRARY_SHARED_LIBADD = $(ICAP_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.6 php4/ext/icap/config.m4:1.7 --- php4/ext/icap/config.m4:1.6 Thu Dec 30 05:52:02 1999 +++ php4/ext/icap/config.m4 Tue May 2 04:01:13 2000 @@ -1,25 +1,19 @@ -dnl $Id: config.m4,v 1.6 1999/12/30 04:52:02 sas Exp $ +dnl $Id: config.m4,v 1.7 2000/05/02 02:01:13 sas Exp $ -AC_MSG_CHECKING(for ICAP support) -AC_ARG_WITH(icap, -[ --with-icap[=DIR] Include ICAP support.], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - ICAP_DIR=/usr/local - else - ICAP_DIR=$withval - fi +PHP_ARG_WITH(icap,for ICAP support, +[ --with-icap[=DIR] Include ICAP support.]) + +if test "$PHP_ICAP" != "no"; then + ICAP_DIR=$PHP_ICAP + test "$ICAP_DIR" = "yes" && ICAP_DIR=/usr/local - AC_ADD_INCLUDE($ICAP_DIR) - AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR) - AC_DEFINE(HAVE_ICAP,1,[ ]) - PHP_EXTENSION(icap) - AC_MSG_RESULT(yes) + AC_ADD_INCLUDE($ICAP_DIR) + if test "$ext_shared" = "yes"; then + ICAP_SHARED_LIBADD="-R$ICAP_DIR/lib -L$ICAP_DIR/lib -licap" + PHP_SUBST(ICAP_SHARED_LIBADD) else - AC_MSG_ERROR(no) + AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR) fi -],[ - AC_MSG_RESULT(no) -]) - + AC_DEFINE(HAVE_ICAP,1,[ ]) + PHP_EXTENSION(icap, $ext_shared) +fi