Getting Zeus-Support in place - i can already see phpinfo()!

diff --git a/sapi/isapi/Makefile.am b/sapi/isapi/Makefile.am
index f4083bc7f2e282fc9806038907b4eeede5a65674..804486ac9df7270a20781483b93305523ca29885 100644 (file)
--- a/sapi/isapi/Makefile.am
+++ b/sapi/isapi/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES=libphpsapi_isapi.a
-libphpsapi_isapi_a_SOURCES=php4isapi.c
+noinst_LTLIBRARIES=libphpsapi_isapi.la
+libphpsapi_isapi_la_SOURCES=php4isapi.c
+

diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index 2f9e8f4249ecc0ff7a2ed059a5d910e4bfe57526..9f87f41c2a8df7cfa0e0e39371f23a0dbd88f954 100644 (file)
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -1,30 +1,28 @@
 dnl ## $Id$ -*- sh -*-
 
-dnl AC_MSG_CHECKING(for Zeus ISAPI support)
-dnl AC_ARG_WITH(zeus,
-dnl [  --with-zeus=DIR         Build PHP as an ISAPI module for use with Zeus.],
-dnl [
-dnl    if test "$withval" != "no"; then
-dnl            AC_MSG_RESULT(yes)
-dnl            if test "${enable_thread_safety}" != "yes"; then
-dnl                    AC_MSG_ERROR(You must specify --enable-thread-safety to build as an ISAPI module)
-dnl            fi
-dnl            if test "$withval" = "yes"; then
-dnl                    zeuspath=/usr/local/zeus # the default
-dnl            fi
-dnl            if ! test -f "$zeuspath/web/include/httpext.h"; then
-dnl                    AC_MSG_ERROR(Unable to find httpext.h in $zeuspath/web/include)
-dnl            fi
-dnl            AC_DEFINE(WITH_ZEUS)
-dnl            AC_ADD_INCLUDE($zeuspath/web/include)
-dnl            PHP_SAPI=isapi
-dnl            PHP_BUILD_SHARED
-dnl    else
-dnl            AC_MSG_RESULT(no)
-dnl    fi
-dnl ],[
-dnl    AC_MSG_RESULT(no)
-dnl ])
+RESULT=no
+AC_MSG_CHECKING(for Zeus ISAPI support)
+AC_ARG_WITH(zeus,
+[  --with-zeus=DIR         Build PHP as an ISAPI module for use with Zeus.],
+[
+       enable_thread_safety=yes
+       passthru="$passthru --enable-thread-safety"
+       if test "$withval" = "yes"; then
+               ZEUSPATH=/usr/local/zeus # the default
+       else
+               ZEUSPATH=$withval
+       fi
+       if ! test -f "$ZEUSPATH/web/include/httpext.h"; then
+               AC_MSG_ERROR(Unable to find httpext.h in $ZEUSPATH/web/include)
+       fi
+       AC_DEFINE(WITH_ZEUS)
+       AC_ADD_INCLUDE($ZEUSPATH/web/include)
+       PHP_SAPI=isapi
+       PHP_BUILD_SHARED
+       INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $ZEUSPATH/web/bin/"
+       RESULT=yes
+])
+AC_MSG_RESULT($RESULT)
 
 dnl ## Local Variables:
 dnl ## tab-width: 4

diff --git a/sapi/isapi/php.sym b/sapi/isapi/php.sym
new file mode 100644 (file)
index 0000000..3d13938
--- /dev/null
+++ b/sapi/isapi/php.sym
@@ -0,0 +1,4 @@
+GetFilterVersion
+HttpFilterProc
+GetExtensionVersion
+HttpExtensionProc