diff options
| author | foobar <sniper@php.net> | 2001-05-22 21:33:17 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-05-22 21:33:17 +0000 |
| commit | 3461a40063b7a7be18f694baf772393d92a6ffb6 (patch) | |
| tree | 47e6039a7db8ac26b3f40ac4156f3367d76e7d05 | |
| parent | b31fbdc7b3a16e78abf887aa0cdbeeabeba64756 (diff) | |
| download | php-git-3461a40063b7a7be18f694baf772393d92a6ffb6.tar.gz | |
Fixed bug: #10914
| -rw-r--r-- | ext/ccvs/Makefile.in | 2 | ||||
| -rw-r--r-- | ext/ccvs/ccvs.c | 3 | ||||
| -rw-r--r-- | ext/ccvs/config.m4 | 44 |
3 files changed, 27 insertions, 22 deletions
diff --git a/ext/ccvs/Makefile.in b/ext/ccvs/Makefile.in index 441ef6e603..133e50c9c6 100644 --- a/ext/ccvs/Makefile.in +++ b/ext/ccvs/Makefile.in @@ -2,5 +2,7 @@ LTLIBRARY_NAME = libccvs.la LTLIBRARY_SOURCES = ccvs.c +LTLIBRARY_SHARED_NAME = ccvs.la +LTLIBRARY_SHARED_LIBADD = $(CCVS_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk diff --git a/ext/ccvs/ccvs.c b/ext/ccvs/ccvs.c index 9e72e1382c..117226f2ab 100644 --- a/ext/ccvs/ccvs.c +++ b/ext/ccvs/ccvs.c @@ -104,6 +104,9 @@ static char const cvsid[] = "$Id$"; STANDARD_MODULE_PROPERTIES }; +#ifdef COMPILE_DL_LDAP +ZEND_GET_MODULE(ldap) +#endif /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */ diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4 index 6e9581470c..480cea070d 100644 --- a/ext/ccvs/config.m4 +++ b/ext/ccvs/config.m4 @@ -1,26 +1,26 @@ dnl $Id$ dnl config.m4 for PHP4 CCVS Extension -AC_MSG_CHECKING(CCVS Support) -AC_ARG_WITH(ccvs, -[ --with-ccvs[=DIR] Compile CCVS support into PHP4. Please specify your - CCVS base install directory as DIR.], -[ - if test "$withval" != "no"; then - CCVS_DIR="$withval" - test -f $withval/include/cv_api.h && CCVS_INCLUDE_DIR=$withval/include - test -f $withval/lib/libccvs.a && CCVS_LIB_DIR=$withval/lib +PHP_ARG_WITH(ccvs, for CCVS support, +[ --with-ccvs[=DIR] Include CCVS support]) - if test -n "$CCVS_DIR"; then - AC_MSG_RESULT(yes) - PHP_EXTENSION(ccvs) - LIBS="$LIBS -L$CCVS_LIB_DIR" - PHP_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_LIB_DIR) - PHP_ADD_INCLUDE($CCVS_INCLUDE_DIR) - else - AC_MSG_RESULT(no) - fi - fi -],[ - AC_MSG_RESULT(no) -]) +if test "$PHP_CCVS" != "no"; then + if test -r $PHP_CCVS/include/cv_api.h; then + CCVS_DIR=$PHP_CCVS + else + for i in /usr /usr/local /usr/local/ccvs ; do + if test -r $i/include/cv_api.h; then + CCVS_DIR=$i + fi + done + fi + + if test -z "$CCVS_DIR"; then + AC_MSG_ERROR(not found. Please check your CCVS installation; cv_api.h should be in <ccvs_dir>/include/) + fi + + PHP_ADD_INCLUDE($CCVS_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_DIR/lib, CCVS_SHARED_LIBADD) + PHP_EXTENSION(ccvs, $ext_shared) + PHP_SUBST(CCVS_SHARED_LIBADD) +fi |