From: Brendan W. McAdams <bmcadams@php.net>
Date: Wed, 9 Aug 2000 16:45:49 +0000 (+0000)
Subject: Tracked the stray -libccvs call to a bad config directive in the config.m4 file.
X-Git-Tag: php-4.0.2RC1~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1030d7a7d8ce8f1696f6cc1ae4bab5a0ea64ab46;p=php

Tracked the stray -libccvs call to a bad config directive in the config.m4 file.
---

diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4
index a62ef96725..44cc23f426 100644
--- a/ext/ccvs/config.m4
+++ b/ext/ccvs/config.m4
@@ -9,12 +9,13 @@ AC_ARG_WITH(ccvs,
 [
   if test "$withval" != "no"; then
      CCVS_DIR="$withval"
-     CCVS_LIB_DIR="$CCVS_DIR/lib"
-     CCVS_INCLUDE_DIR="$CCVS_DIR/include"
+	test -f $withval/include/cv_api.h && CCVS_INCLUDE_DIR="$withval/include"
+    test -f $withval/lib/libccvs.a && CCVS_LIB_DIR="$withval/lib"
+
      	if test -n "$CCVS_DIR"; then
 		AC_MSG_RESULT(yes)
 		PHP_EXTENSION(ccvs)
-		LIBS="$LIBS -LCCVS_DIR/lib"
+		LIBS="$LIBS -L$CCVS_LIB_DIR"
 		AC_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_LIB_DIR)
 		AC_ADD_INCLUDE($CCVS_INCLUDE_DIR)
     	  else