cvs: /php4/sapi/isapi php.sym /php4/sapi/isapi Makefile.am config.m4
| From: | Thies C. Arntzen | Date: | Tue, 23 Nov 1999 11:23:16 +0000 |
| Subject: | cvs: /php4/sapi/isapi php.sym /php4/sapi/isapi Makefile.am config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6737@lists.php.net to get a copy of this message | ||
thies Tue Nov 23 06:23:16 1999 EDT
Added files:
/php4/sapi/isapi php.sym
Modified files:
/php4/sapi/isapi Makefile.am config.m4
Log:
Getting Zeus-Support in place - i can already see phpinfo()!
Index: php4/sapi/isapi/Makefile.am
diff -u php4/sapi/isapi/Makefile.am:1.2 php4/sapi/isapi/Makefile.am:1.3
--- php4/sapi/isapi/Makefile.am:1.2 Sat Nov 13 07:40:51 1999
+++ php4/sapi/isapi/Makefile.am Tue Nov 23 06:22:45 1999
@@ -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
+
Index: php4/sapi/isapi/config.m4
diff -u php4/sapi/isapi/config.m4:1.4 php4/sapi/isapi/config.m4:1.5
--- php4/sapi/isapi/config.m4:1.4 Thu Oct 7 17:04:26 1999
+++ php4/sapi/isapi/config.m4 Tue Nov 23 06:22:45 1999
@@ -1,30 +1,28 @@
-dnl ## $Id: config.m4,v 1.4 1999/10/07 21:04:26 sas Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.5 1999/11/23 11:22:45 thies Exp $ -*- 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