diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4
index 032f27d8f13..a62ef967258 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)
 ])