cvs: /php4/ext/icap Makefile.in config.m4 php3_icap.c

musone Mon Aug 9 18:02:43 1999 EDT Modified files: /php4/ext/icap Makefile.in config.m4 php3_icap.c Log: more ports Index: php4/ext/icap/Makefile.in diff -u php4/ext/icap/Makefile.in:1.1 php4/ext/icap/Makefile.in:1.2 --- php4/ext/icap/Makefile.in:1.1 Mon Aug 9 17:34:52 1999 +++ php4/ext/icap/Makefile.in Mon Aug 9 18:02:42 1999 @@ -10,7 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# $Id: Makefile.in,v 1.1 1999/08/09 21:34:52 musone Exp $ +# $Id: Makefile.in,v 1.2 1999/08/09 22:02:42 musone Exp $ SHELL = @SHELL@ @@ -205,7 +205,7 @@ 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 Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.1 php4/ext/icap/config.m4:1.2 --- php4/ext/icap/config.m4:1.1 Mon Aug 9 17:34:52 1999 +++ php4/ext/icap/config.m4 Mon Aug 9 18:02:42 1999 @@ -1,35 +1,24 @@ -dnl $Id: config.m4,v 1.1 1999/08/09 21:34:52 musone Exp $ +dnl $Id: config.m4,v 1.2 1999/08/09 22:02:42 musone Exp $ 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) ]) - Index: php4/ext/icap/php3_icap.c diff -u php4/ext/icap/php3_icap.c:1.2 php4/ext/icap/php3_icap.c:1.3 --- php4/ext/icap/php3_icap.c:1.2 Mon Aug 9 17:39:29 1999 +++ php4/ext/icap/php3_icap.c Mon Aug 9 18:02:42 1999 @@ -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)