cvs: /php4 acinclude.m4 configure.in genif.sh /php4/ext/session config.m4

sas Sat Mar 25 18:47:30 2000 EDT Modified files: /php4 acinclude.m4 configure.in genif.sh /php4/ext/session config.m4 Log: Revamp session's config.m4 and reenable support for mm. The shared memory module works now successfully again under Apache and other web servers. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.67 php4/acinclude.m4:1.68 --- php4/acinclude.m4:1.67 Sat Mar 11 14:05:40 2000 +++ php4/acinclude.m4 Sat Mar 25 18:46:59 2000 @@ -1,6 +1,10 @@ -dnl $Id: acinclude.m4,v 1.67 2000/03/11 22:05:40 kk Exp $ +dnl $Id: acinclude.m4,v 1.68 2000/03/26 02:46:59 sas Exp $ dnl dnl This file contains local autoconf functions. + +AC_DEFUN(PHP_MODULE_PTR,[ + EXTRA_MODULE_PTRS="$EXTRA_MODULE_PTRS $1," +]) AC_DEFUN(PHP_CONFIG_NICE,[ rm -f $1 Index: php4/configure.in diff -u php4/configure.in:1.104 php4/configure.in:1.105 --- php4/configure.in:1.104 Sat Mar 18 09:58:09 2000 +++ php4/configure.in Sat Mar 25 18:46:59 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.104 2000/03/18 17:58:09 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.105 2000/03/26 02:46:59 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -829,7 +829,7 @@ echo "creating internal_functions.c" extensions=\grep '^s.@EXT_STATIC@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\ mv -f internal_functions.c internal_functions.c.old 2>/dev/null - sh $srcdir/genif.sh $srcdir/internal_functions.c.in $srcdir \$extensions > internal_functions.c + sh $srcdir/genif.sh $srcdir/internal_functions.c.in $srcdir $EXTRA_MODULE_PTRS \$extensions > internal_functions.c if cmp internal_functions.c.old internal_functions.c > /dev/null 2>&1; then echo "internal_functions.c is unchanged" mv internal_functions.c.old internal_functions.c Index: php4/genif.sh diff -u php4/genif.sh:1.7 php4/genif.sh:1.8 --- php4/genif.sh:1.7 Fri Sep 3 10:46:39 1999 +++ php4/genif.sh Sat Mar 25 18:46:59 2000 @@ -1,19 +1,21 @@ #! /bin/sh -# $Id: genif.sh,v 1.7 1999/09/03 17:46:39 sas Exp $ +# $Id: genif.sh,v 1.8 2000/03/26 02:46:59 sas Exp $ # replacement for genif.pl infile="$1" shift srcdir="$1" shift +extra_module_ptrs="$1" +shift if test "$infile" = "" -o "$srcdir" = ""; then echo "please supply infile and srcdir" exit 1 fi -module_ptrs="" +module_ptrs="$extra_module_ptrs" includes="" olddir=pwd Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.5 php4/ext/session/config.m4:1.6 --- php4/ext/session/config.m4:1.5 Wed Dec 29 18:59:20 1999 +++ php4/ext/session/config.m4 Sat Mar 25 18:47:00 2000 @@ -1,42 +1,53 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 02:59:20 sas Exp $ -dnl config.m4 for extension session -dnl don't forget to call PHP_EXTENSION(session) +dnl $Id: config.m4,v 1.6 2000/03/26 02:47:00 sas Exp $ -RESULT=no AC_MSG_CHECKING(for mm support) AC_ARG_WITH(mm, -[ --with-mm[=DIR] Include mm support], -[ - if test "$withval" != "no"; then - for i in /usr/local /usr $withval; do - if test -f "$i/include/mm.h"; then - MM_DIR="$i" - fi - done - - if test -z "$MM_DIR" ; then - AC_MSG_ERROR(cannot find mm library) - fi - - AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib) - AC_ADD_INCLUDE($MM_DIR/include) - AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) - RESULT=yes - PHP_EXTENSION(ps_mm) - fi +[ --with-mm[=DIR] Include mm support for session storage],[ + PHP_MM=$withval +],[ + PHP_MM=no ]) -AC_MSG_RESULT($RESULT) +AC_MSG_RESULT($PHP_MM) -RESULT=no +AC_MSG_CHECKING(whether to enable session support) +AC_ARG_ENABLE(session, +[ --disable-session Disable session support],[ + PHP_SESSION=$enableval +],[ + PHP_SESSION=yes +]) +AC_MSG_RESULT($PHP_SESSION) + AC_MSG_CHECKING(whether to enable transparent session id propagation) AC_ARG_ENABLE(trans-sid, -[ --enable-trans-sid Enable transparent session id propagation], -[ - if test "$enableval" = "yes" ; then - AC_DEFINE(TRANS_SID, 1, [Whether you want transparent session id propagation]) - RESULT=yes - fi +[ --enable-trans-sid Enable transparent session id propagation],[ + PHP_TRANS_SID=$enableval +],[ + PHP_TRANS_SID=no ]) -AC_MSG_RESULT($RESULT) +AC_MSG_RESULT($PHP_TRANS_SID) + +if test "$PHP_MM" != "no"; then + for i in /usr/local /usr $PHP_MM; do + if test -f "$i/include/mm.h"; then + MM_DIR="$i" + fi + done + + if test -z "$MM_DIR" ; then + AC_MSG_ERROR(cannot find mm library) + fi + + AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib) + AC_ADD_INCLUDE($MM_DIR/include) + AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) + PHP_MODULE_PTR(phpext_ps_mm_ptr) +fi + +if test "$PHP_TRANS_SID" = "yes"; then + AC_DEFINE(TRANS_SID, 1, [Whether you want transparent session id propagation]) +fi -PHP_EXTENSION(session) +if test "$PHP_SESSION" = "yes"; then + PHP_EXTENSION(session) +fi