summaryrefslogtreecommitdiff
path: root/ext/ccvs
diff options
context:
space:
mode:
authorBrendan W. McAdams <bmcadams@php.net>2000-08-09 16:45:49 +0000
committerBrendan W. McAdams <bmcadams@php.net>2000-08-09 16:45:49 +0000
commit1030d7a7d8ce8f1696f6cc1ae4bab5a0ea64ab46 (patch)
treeb0717743622cdf7688ca30dd616ac82a8169e12d /ext/ccvs
parent4d692049b22a90e147e1cbe47c6de2e77b7f7e6b (diff)
downloadphp-git-1030d7a7d8ce8f1696f6cc1ae4bab5a0ea64ab46.tar.gz
Tracked the stray -libccvs call to a bad config directive in the config.m4 file.
Diffstat (limited to 'ext/ccvs')
-rw-r--r--ext/ccvs/config.m47
1 files changed, 4 insertions, 3 deletions
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