more ports

diff --git a/ext/icap/Makefile.in b/ext/icap/Makefile.in
index d549a3d29c820427aad039a861ecac3796ccecff..53058bca954e3b7e484f7cce96f06a8fb3c60874 100644 (file)
--- 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 122816d0953a70502a603255170b9d8c4a385fcb..e757b89af33a6c1138ae5f5f784bf669e44f2b3f 100644 (file)
--- 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 64281909be8b013829005a6317bac753bc0c0d58..de25976c6a7b5c63497dffcb4b49d87d3361ce7d 100644 (file)
--- 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)