cvs: /php4 aolserver.c /php4 Makefile.in acconfig.h.in configure.in.in

sas Fri Sep 24 20:32:25 1999 EDT Added files: /php4 aolserver.c Modified files: /php4 Makefile.in acconfig.h.in configure.in.in Log: Initial AOLserver support. Note that the current way of creating the shared library works only with GNU utilities. Some features have to be added yet (i.e. POST and cookie support). Index: php4/Makefile.in diff -u php4/Makefile.in:1.62 php4/Makefile.in:1.63 --- php4/Makefile.in:1.62 Thu Sep 23 16:27:17 1999 +++ php4/Makefile.in Fri Sep 24 20:32:25 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.62 1999/09/23 20:27:17 sas Exp $ +# $Id: Makefile.in,v 1.63 1999/09/25 00:32:25 sas Exp $ # prefix = @prefix@ @@ -73,7 +73,9 @@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ - php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c php_content_types.c + php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c php_content_types.c \ + aolserver.c + OBJS = $(SOURCE:.c=.o) $(LIBOBJS) PHPLIBS = -Llibzend -lzend -Lext -lphpext LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@ @@ -113,6 +115,9 @@ -@test -f ./mod_php4.c || test -h ./mod_php4.c || $(LN_S) $(srcdir)/mod_php4.c ./mod_php4.c $(APXS) $(INCLUDE) -c -o libphp4.so @VERSION_SCRIPT@ @RPATHS@ ./mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP) +php4_aol.so: libmodphp4-so.a + g++ $(LDFLAGS) aolserver.o -rdynamic -shared -o $@ libmodphp4-so.a $(LIBS) @TSRM_LIB@ + regex/libregex.a: (cd regex; $(MAKE) lib) Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.21 php4/acconfig.h.in:1.22 --- php4/acconfig.h.in:1.21 Sun Jul 25 08:57:50 1999 +++ php4/acconfig.h.in Fri Sep 24 20:32:25 1999 @@ -4,6 +4,8 @@ #undef PACKAGE #undef VERSION +#undef HAVE_AOLSERVER + #undef HAVE_STRUCT_FLOCK #undef HAVE_TM_GMTOFF Index: php4/configure.in.in diff -u php4/configure.in.in:1.89 php4/configure.in.in:1.90 --- php4/configure.in.in:1.89 Fri Sep 24 11:34:06 1999 +++ php4/configure.in.in Fri Sep 24 20:32:25 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.89 1999/09/24 15:34:06 ssb Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.90 1999/09/25 00:32:25 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -621,6 +621,27 @@ AC_SUBST(PHP_LIBS) fi fi + +RESULT=no +AC_MSG_CHECKING(for AOLserver support) +AC_ARG_WITH(aolserver, +[ --with-aolserver=DIR], +[ + if test ! -d $withval ; then + AC_MSG_ERROR(You did not specify a directory) + fi + if test "$enable_thread_safety" != "yes"; then + AC_MSG_ERROR(AOLserver must be compiled using --enable-thread-safety) + fi + NS_DIR=$withval + AC_ADD_INCLUDE($NS_DIR/include) + AC_DEFINE(HAVE_AOLSERVER) + BINNAME=php4_aol.so + INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $BINNAME $NS_DIR/root/bin/$BINNAME" + CFLAGS="$CFLAGS -rdynamic" + RESULT=yes +]) +AC_MSG_RESULT($RESULT) AC_MSG_CHECKING(whether to use bundled regex library) AC_ARG_WITH(system-regex,