diff options
| author | Mark Musone <musone@php.net> | 1999-08-09 22:02:42 +0000 |
|---|---|---|
| committer | Mark Musone <musone@php.net> | 1999-08-09 22:02:42 +0000 |
| commit | 00763741254ae362e2ad87144b6bfba59573adbf (patch) | |
| tree | 7148c129f810a264f947c3524c9bb8427a1c9114 /ext/icap | |
| parent | f0552d929f860af88cb23d3d86353b88540b452e (diff) | |
| download | php-git-00763741254ae362e2ad87144b6bfba59573adbf.tar.gz | |
more ports
Diffstat (limited to 'ext/icap')
| -rw-r--r-- | ext/icap/Makefile.in | 2 | ||||
| -rw-r--r-- | ext/icap/config.m4 | 43 | ||||
| -rw-r--r-- | ext/icap/php3_icap.c | 5 |
3 files changed, 17 insertions, 33 deletions
diff --git a/ext/icap/Makefile.in b/ext/icap/Makefile.in index d549a3d29c..53058bca95 100644 --- a/ext/icap/Makefile.in +++ b/ext/icap/Makefile.in @@ -205,7 +205,7 @@ maintainer-clean-libtool: libphpext_php3_icap.a: $(libphpext_php3_icap_a_OBJECTS) $(libphpext_php3_icap_a_DEPENDENCIES) -rm -f libphpext_php3_icap.a $(AR) cru libphpext_php3_icap.a $(libphpext_php3_icap_a_OBJECTS) $(libphpext_php3_icap_a_LIBADD) - $(RANLIB) libphpex_icap.a + $(RANLIB) libphpext_php3_icap.a tags: TAGS diff --git a/ext/icap/config.m4 b/ext/icap/config.m4 index 122816d095..e757b89af3 100644 --- a/ext/icap/config.m4 +++ b/ext/icap/config.m4 @@ -2,34 +2,23 @@ dnl $Id$ AC_MSG_CHECKING(for ICAP support) AC_ARG_WITH(icap, -[ --with-icap[=DIR] Include ICAP support (DIR is the ICAP include dir and lib dir).], +[ --with-icap[=DIR] Include ICAP support.], [ - if test "$withval" = "yes"; then - if test -f /usr/local/include/icap.h; then - withval=/usr/local - elif test -f /usr/include/icap.h; then - withval=/usr - fi - fi - if test "$withval" != "no" && test "$withval" != "yes"; then - ICAP_DIR=$withval - if test -f $ICAP_DIR/include/icap/icap.h; then - ICAP_INC_DIR=$ICAP_DIR/include/icap - else - ICAP_INC_DIR=$withval/include - fi - ICAP_LIBDIR="$ICAP_DIR/lib" - ICAP_LIB="c-client" - AC_ADD_LIBRARY_WITH_PATH($ICAP_LIB, $ICAP_LIBDIR) - AC_ADD_INCLUDE($ICAP_INC_DIR) - AC_DEFINE(HAVE_ICAP) - AC_MSG_RESULT(yes) - PHP_EXTENSION(icap) - else - AC_MSG_ERROR(could not find icap library!) - fi + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + ICAP_DIR=/usr/local + else + ICAP_DIR=$withval + fi + + AC_ADD_INCLUDE($ICAP_DIR/) + AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR/) + AC_DEFINE(HAVE_ICAP) + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR(no) + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) - diff --git a/ext/icap/php3_icap.c b/ext/icap/php3_icap.c index 64281909be..de25976c6a 100644 --- a/ext/icap/php3_icap.c +++ b/ext/icap/php3_icap.c @@ -34,11 +34,7 @@ #undef ERROR #endif -#if !(WIN32|WINNT) -#include "config.h" -#endif #include "php.h" -#include "internal_functions.h" #if COMPILE_DL #include "dl/phpdl.h" @@ -53,7 +49,6 @@ #include <stdarg.h> #include "icap.h" #include "icapclient.h" -#include "php3_list.h" #include "php3_icap.h" #include "modules.h" #if (WIN32|WINNT) |