From: Brendan W. McAdams <bmcadams@php.net>
Date: Tue, 8 Aug 2000 23:15:56 +0000 (+0000)
Subject: Had some issues with apache build.  PHP Was passing a -llibccvs inadvertantly.  Seeme... 
X-Git-Tag: php-4.0.2RC1~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a4f3d397391ae2b34a8e233811adc66e662bc3b;p=php

Had some issues with apache build.  PHP Was passing a -llibccvs inadvertantly.  Seemed to be an issue with the autoconf file.  Fixed. I'll get back to cleaning up that AutoConf later.
---

diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4
index 2d2bd883a9..032f27d8f1 100644
--- a/ext/ccvs/config.m4
+++ b/ext/ccvs/config.m4
@@ -3,18 +3,17 @@ 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.],
+[  --with-ccvs[=DIR]  Compile CCVS support into PHP4. 
+					  Please specify your CCVS base install directory as DIR.
+],
 [
   if test "$withval" != "no"; then
-      test -f $withval/include/cv_api.h && CCVS_DIR="$withval/include"
-      test -f $withval/lib/libccvs.a && CCVS_DIR="$withval/lib"
       if test -n "$CCVS_DIR"; then
 	AC_MSG_RESULT(yes)
 	PHP_EXTENSION(ccvs)
-	old_LIBS="$LIBS"
 	LIBS="$LIBS -LCCVS_DIR/lib"
-	LIBS="$old_LIBS -lccvs"
-	AC_ADD_LIBRARY_WITH_PATH(libccvs, $CCVS_DIR)
+	LIBS="$old_LIBS"
+	AC_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_DIR)
 	AC_ADD_INCLUDE($withval/include)
       else
         AC_MSG_RESULT(no)