From 14e86fcf0aba884a8352776bfcf9a5bbec357aff Mon Sep 17 00:00:00 2001
From: "Brendan W. McAdams" <bmcadams@php.net>
Date: Wed, 9 Aug 2000 14:31:12 +0000
Subject: [PATCH] Trying to resolve the build issue. This module is currently
 broken. PHP compiles it fine but I'm having linking issues when it gets to
 the apache level. Any help would be greatly appreciated.

---
 ext/ccvs/config.m4 | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4
index 032f27d8f1..a62ef96725 100644
--- a/ext/ccvs/config.m4
+++ b/ext/ccvs/config.m4
@@ -8,17 +8,19 @@ AC_ARG_WITH(ccvs,
 ],
 [
   if test "$withval" != "no"; then
-      if test -n "$CCVS_DIR"; then
-	AC_MSG_RESULT(yes)
-	PHP_EXTENSION(ccvs)
-	LIBS="$LIBS -LCCVS_DIR/lib"
-	LIBS="$old_LIBS"
-	AC_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_DIR)
-	AC_ADD_INCLUDE($withval/include)
-      else
-        AC_MSG_RESULT(no)
-      fi
-fi
+     CCVS_DIR="$withval"
+     CCVS_LIB_DIR="$CCVS_DIR/lib"
+     CCVS_INCLUDE_DIR="$CCVS_DIR/include"
+     	if test -n "$CCVS_DIR"; then
+		AC_MSG_RESULT(yes)
+		PHP_EXTENSION(ccvs)
+		LIBS="$LIBS -LCCVS_DIR/lib"
+		AC_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_LIB_DIR)
+		AC_ADD_INCLUDE($CCVS_INCLUDE_DIR)
+    	  else
+    	    AC_MSG_RESULT(no)
+    	  fi
+	fi
 ],[
   AC_MSG_RESULT(no)
 ])
-- 
2.50.1