CVS update: php3

Date: Sunday January 31, 1999 @ 9:47 Author: sas Update of /repository/php3 In directory asf:/u/temp/cvs-serv16733 Modified Files: configure.in acconfig.h config.h.in Makefile.in Added Files: compat.c compat.h Log Message: Add fcntl emulator for flock Not sure, why config.h.in is not .cvsignore - it's a _generated_ file Index: php3/configure.in diff -c php3/configure.in:1.309 php3/configure.in:1.310 *** php3/configure.in:1.309 Fri Jan 29 17:35:55 1999 --- php3/configure.in Sun Jan 31 09:46:54 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.309 1999/01/29 22:35:55 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.310 1999/01/31 14:46:54 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 164,169 **** --- 164,187 ---- dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM AC_STRUCT_TIMEZONE + + AC_CACHE_CHECK(for struct flock,php_struct_flock, + AC_TRY_COMPILE([ + #include <unistd.h> + #include <fcntl.h> + ], + [struct flock x;], + [ + php_struct_flock=yes + ],[ + php_struct_flock=no + ]) + ) + if test "$php_struct_flock" = "yes" ; then + AC_DEFINE(HAVE_STRUCT_FLOCK, 1) + else + AC_DEFINE(HAVE_STRUCT_FLOCK, 0) + fi dnl Check for members of the stat structure AC_STRUCT_ST_BLKSIZE Index: php3/acconfig.h diff -c php3/acconfig.h:1.78 php3/acconfig.h:1.79 *** php3/acconfig.h:1.78 Tue Jan 26 17:17:52 1999 --- php3/acconfig.h Sun Jan 31 09:47:10 1999 *************** *** 26,31 **** --- 26,34 ---- /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */ #define HAVE_DIRENT_H 0 + /* Define if you have struct flock */ + #define HAVE_STRUCT_FLOCK 0 + /* Define if you have the resolv library (-lresolv). */ #define HAVE_LIBRESOLV 0 Index: php3/config.h.in diff -c php3/config.h.in:1.136 php3/config.h.in:1.137 *** php3/config.h.in:1.136 Fri Jan 29 17:35:55 1999 --- php3/config.h.in Sun Jan 31 09:47:10 1999 *************** *** 89,94 **** --- 89,97 ---- #undef PHP3_MD5_CRYPT #undef PHP3_BLOWFISH_CRYPT + /* Define if you have struct flock */ + #define HAVE_STRUCT_FLOCK 0 + /* Define if you have the resolv library (-lresolv). */ #define HAVE_LIBRESOLV 0 Index: php3/Makefile.in diff -c php3/Makefile.in:1.285 php3/Makefile.in:1.286 *** php3/Makefile.in:1.285 Tue Jan 26 17:17:52 1999 --- php3/Makefile.in Sun Jan 31 09:47:11 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.285 1999/01/26 22:17:52 timothy Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.286 1999/01/31 14:47:11 sas Exp $ # prefix = @prefix@ *************** *** 58,70 **** snprintf.c php3_sprintf.c alloc.c list.c highlight.c debugger.c \ configuration-parser.tab.c configuration-scanner.c \ request_info.c safe_mode.c fopen-wrappers.c constants.c \ ! php3_realpath.c alloca.c OBJS = language-parser.tab.o language-scanner.o main.o php3_hash.o operators.o \ variables.o token_cache.o stack.o internal_functions.o \ snprintf.o php3_sprintf.o alloc.o list.o highlight.o debugger.o \ configuration-parser.tab.o configuration-scanner.o \ request_info.o safe_mode.o fopen-wrappers.o constants.o \ ! php3_realpath.o alloca.o @LIBOBJS@ FUNCTIONS_SOURCE = functions/adabasd.c functions/aspell.c functions/apache.c functions/fhttpd.c \ functions/basic_functions.c \ --- 58,70 ---- snprintf.c php3_sprintf.c alloc.c list.c highlight.c debugger.c \ configuration-parser.tab.c configuration-scanner.c \ request_info.c safe_mode.c fopen-wrappers.c constants.c \ ! php3_realpath.c alloca.c compat.c OBJS = language-parser.tab.o language-scanner.o main.o php3_hash.o operators.o \ variables.o token_cache.o stack.o internal_functions.o \ snprintf.o php3_sprintf.o alloc.o list.o highlight.o debugger.o \ configuration-parser.tab.o configuration-scanner.o \ request_info.o safe_mode.o fopen-wrappers.o constants.o \ ! php3_realpath.o alloca.o compat.o @LIBOBJS@ FUNCTIONS_SOURCE = functions/adabasd.c functions/aspell.c functions/apache.c functions/fhttpd.c \ functions/basic_functions.c \ -- 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