cvs: php4 /ext/ccvs Makefile.in ccvs.c config.m4

sniper Tue May 22 14:33:18 2001 EDT Modified files: /php4/ext/ccvs Makefile.in ccvs.c config.m4 Log: Fixed bug: #10914 Index: php4/ext/ccvs/Makefile.in diff -u php4/ext/ccvs/Makefile.in:1.2 php4/ext/ccvs/Makefile.in:1.3 --- php4/ext/ccvs/Makefile.in:1.2 Tue Aug 8 16:15:56 2000 +++ php4/ext/ccvs/Makefile.in Tue May 22 14:33:17 2001 @@ -1,6 +1,8 @@ -# $Id: Makefile.in,v 1.2 2000/08/08 23:15:56 bmcadams Exp $ +# $Id: Makefile.in,v 1.3 2001/05/22 21:33:17 sniper Exp $ 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 Index: php4/ext/ccvs/ccvs.c diff -u php4/ext/ccvs/ccvs.c:1.14 php4/ext/ccvs/ccvs.c:1.15 --- php4/ext/ccvs/ccvs.c:1.14 Sun Apr 22 16:40:34 2001 +++ php4/ext/ccvs/ccvs.c Tue May 22 14:33:17 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ /* -* cvvs.c $Revision: 1.14 $ - PHP4 Interface to the RedHat CCVS API +* cvvs.c $Revision: 1.15 $ - PHP4 Interface to the RedHat CCVS API * ------- * Interfaces RedHat's CCVS [Credit Card Verification System] <http://www.redhat.com/products/ccvs/> * This code is ported from an original php3 interface written by RedHat's Doug DeJulio <ddj@redhat.com> @@ -27,10 +27,10 @@ /* * Code started on 2000.07.24@09.04.EST by Brendan W. McAdams <bmcadams@php.net> -* $Revision: 1.14 $ +* $Revision: 1.15 $ */ -static char const cvsid[] = "$Id: ccvs.c,v 1.14 2001/04/22 23:40:34 sterling Exp $"; +static char const cvsid[] = "$Id: ccvs.c,v 1.15 2001/05/22 21:33:17 sniper Exp $"; #include <php.h> #include <stdlib.h> @@ -104,6 +104,9 @@ 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) */ Index: php4/ext/ccvs/config.m4 diff -u php4/ext/ccvs/config.m4:1.8 php4/ext/ccvs/config.m4:1.9 --- php4/ext/ccvs/config.m4:1.8 Sat May 12 04:08:47 2001 +++ php4/ext/ccvs/config.m4 Tue May 22 14:33:17 2001 @@ -1,26 +1,26 @@ -dnl $Id: config.m4,v 1.8 2001/05/12 11:08:47 sas Exp $ +dnl $Id: config.m4,v 1.9 2001/05/22 21:33:17 sniper Exp $ 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