cvs: php4 /ext/msession README config.m4 msession.c

mlwmohawk Wed Oct 10 20:36:23 2001 EDT Modified files: /php4/ext/msession README config.m4 msession.c Log: Allow msession to build without ext/session Index: php4/ext/msession/README diff -u php4/ext/msession/README:1.2 php4/ext/msession/README:1.3 --- php4/ext/msession/README:1.2 Tue Sep 25 08:12:47 2001 +++ php4/ext/msession/README Wed Oct 10 20:36:23 2001 @@ -8,13 +8,10 @@ Mohawk Software's Phoenix library. Mohawk Software's msession daemon. - Building: -I (regretfully) have not invested the time to make all -this stuff automatic. - In the config.m4 file you will need to specify the include and library directories for Phoenix. The setting in config.m4 is probably wrong. - +You will need phoenix installed and built to compile this +module. Index: php4/ext/msession/config.m4 diff -u php4/ext/msession/config.m4:1.4 php4/ext/msession/config.m4:1.5 --- php4/ext/msession/config.m4:1.4 Mon Oct 1 07:04:54 2001 +++ php4/ext/msession/config.m4 Wed Oct 10 20:36:23 2001 @@ -27,5 +27,9 @@ PHP_SUBST(PHOENIX_LIB) PHP_EXTENSION(msession, $ext_shared) + + if test "$enable_session" != "no"; then + AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) + fi fi Index: php4/ext/msession/msession.c diff -u php4/ext/msession/msession.c:1.5 php4/ext/msession/msession.c:1.6 --- php4/ext/msession/msession.c:1.5 Fri Sep 28 20:53:06 2001 +++ php4/ext/msession/msession.c Wed Oct 10 20:36:23 2001 @@ -42,11 +42,14 @@ #if HAVE_MSESSION +#ifdef HAVE_PHP_SESSION PS_FUNCS(msession); ps_module ps_mod_msession = { PS_MOD(msession) }; +#endif + // #define ERR_DEBUG @@ -123,7 +126,9 @@ g_conn = NULL; g_host = g_defhost; +#ifdef HAVE_PHP_SESSION php_session_register_module(&ps_mod_msession); +#endif return SUCCESS; } @@ -983,6 +988,8 @@ } } +#ifdef HAVE_PHP_SESSION + PS_OPEN_FUNC(msession) { ELOG( "ps_open_msession"); @@ -1031,4 +1038,5 @@ ELOG( "ps_gc_msession"); return SUCCESS; } +#endif /* HAVE_PHP_SESSION */ #endif /* HAVE_MSESSION */