Fixed bug: #10914

diff --git a/ext/ccvs/Makefile.in b/ext/ccvs/Makefile.in
index 441ef6e603df92b5f20d8532c04490494eca1dd3..133e50c9c649a22aea69d91ebe97b103a4c391ba 100644 (file)
--- 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 9e72e1382c2f4cdbbd08decc6f902842557e631b..117226f2ab08050221b36830679e7506a44c06ea 100644 (file)
--- 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 6e9581470c51dcda216decf61304769d2e8244b9..480cea070df27f93eee578d79786b23b138d9d72 100644 (file)
--- 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