CVS update: php3

Date: Sunday December 13, 1998 @ 18:10 Author: nyenyon Update of /repository/php3 In directory asf:/u/temp/cvs-serv2659 Modified Files: Makefile.in acconfig.h config.h.in configure.in internal_functions.c setup Log Message: Added configuration information for system v shared memory. i have also included a setup-derective for semaphores. semaphores are needed for shared memory synchionization. shared memory currently works only under solaris. other ports will follow. Index: php3/Makefile.in diff -c php3/Makefile.in:1.278 php3/Makefile.in:1.279 *** php3/Makefile.in:1.278 Thu Dec 10 13:36:25 1998 --- php3/Makefile.in Sun Dec 13 18:10:47 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.278 1998/12/10 18:36:25 swilliam Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.279 1998/12/13 23:10:47 nyenyon Exp $ # prefix = @prefix@ *************** *** 92,98 **** functions/fdf.c \ functions/snmp.c functions/var.c functions/interbase.c \ functions/quot_print.c functions/cyr_convert.c \ ! functions/sysvsem.c functions/dav.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) --- 92,98 ---- functions/fdf.c \ functions/snmp.c functions/var.c functions/interbase.c \ functions/quot_print.c functions/cyr_convert.c \ ! functions/sysvsem.c functions/dav.c functions/sysvshm.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) *************** *** 641,646 **** --- 641,650 ---- php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \ mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ internal_functions.h modules.h functions/php3_dav.h + functions/sysvshm.o: functions/sysvshm.c php.h php_version.h config.h request_info.h\ + php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \ + mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ + internal_functions.h modules.h functions/php3_sysvshm.h php3_list.h # Local Variables: # tab-width: 4 Index: php3/acconfig.h diff -c php3/acconfig.h:1.70 php3/acconfig.h:1.71 *** php3/acconfig.h:1.70 Fri Dec 4 11:45:03 1998 --- php3/acconfig.h Sun Dec 13 18:10:51 1998 *************** *** 236,241 **** --- 236,246 ---- */ #define HAVE_SEMUN 0 + /* Define if you want System V sahred memory support. + */ + #define HAVE_SYSVSHM 0 + + /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 Index: php3/config.h.in diff -c php3/config.h.in:1.124 php3/config.h.in:1.125 *** php3/config.h.in:1.124 Thu Dec 10 13:36:30 1998 --- php3/config.h.in Sun Dec 13 18:10:51 1998 *************** *** 277,282 **** --- 277,286 ---- */ #define HAVE_SEMUN 0 + /* Define if you want System V shared memory support. + */ + #define HAVE_SYSVSHM 0 + /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 Index: php3/configure.in diff -c php3/configure.in:1.285 php3/configure.in:1.286 *** php3/configure.in:1.285 Fri Dec 11 02:31:17 1998 --- php3/configure.in Sun Dec 13 18:10:51 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.285 1998/12/11 07:31:17 steinm Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.286 1998/12/13 23:10:51 nyenyon Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1553,1558 **** --- 1553,1563 ---- ]) + + + + + AC_MSG_CHECKING(whether to use a configuration file) AC_ARG_WITH(config-file-path, [ --with-config-file-path=PATH Sets the path in which to look for php3.ini *************** *** 1862,1867 **** --- 1867,1889 ---- AC_MSG_RESULT(no) AC_DEFINE(HAVE_SYSVSEM, 0) ]) + + + AC_MSG_CHECKING(whether to enable System V shared memory support) + AC_ARG_WITH(sysvshm, + [ --with-sysvshm Enable the System V shared memory support],[ + if test "$withval" = "yes"; then + AC_DEFINE(HAVE_SYSVSHM, 1) + AC_MSG_RESULT(yes) + else + AC_DEFINE(HAVE_SYSVSHM, 0) + AC_MSG_RESULT(no) + fi + ],[ + AC_DEFINE(HAVE_SYSVSHM, 0) + AC_MSG_RESULT(no) + ]) + dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2" Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.333 php3/internal_functions.c:1.334 *** php3/internal_functions.c:1.333 Fri Dec 4 11:45:03 1998 --- php3/internal_functions.c Sun Dec 13 18:10:55 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.333 1998/12/04 16:45:03 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.334 1998/12/13 23:10:55 nyenyon Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 94,99 **** --- 94,100 ---- #include "functions/php3_pdf.h" #include "functions/php3_fdf.h" #include "functions/php3_sysvsem.h" + #include "functions/php3_sysvshm.h" #include "functions/php3_dav.h" *************** *** 155,160 **** --- 156,162 ---- {"PDF", pdf_module_ptr}, {"FDF", fdf_module_ptr}, {"System V semaphores", sysvsem_module_ptr}, + {"System V shared memory", sysvshm_module_ptr}, {"DAV", phpdav_module_ptr}, {NULL, NULL} }; Index: php3/setup diff -c php3/setup:1.48 php3/setup:1.49 *** php3/setup:1.48 Thu Dec 10 13:36:33 1998 --- php3/setup Sun Dec 13 18:10:56 1998 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.48 1998/12/10 18:36:33 swilliam Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 29,35 ---- # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.49 1998/12/13 23:10:56 nyenyon Exp $ if [ "$1" = "-q" ]; then quiet_mode=on *************** *** 371,376 **** --- 371,383 ---- 'no /usr zlib install' \ ' Whether to use the zlib support to read/write .gz-files.\n Requires zlib version >= 1.0.9!' + + define_option with-sysvshm 'System V shared memory support? ' yesno no \ + ' Whether to use the System V shared memory (currently only solaris).' + + define_option enable-sysvsem 'System V semaphores support? ' yesno no \ + ' Whether to use the System V semaphores (currently only solaris and linux).' + define_option with-config-file-path 'Default config directory?' yesnodir \ 'no /usr/local/lib Configuration file' \ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net