cvs: /php4 Makefile.in configure.in.in php.h

ssb Wed Sep 15 05:35:20 1999 EDT Modified files: /php4 Makefile.in configure.in.in php.h Log: Clean up the strlcat/strlcpy checks. Index: php4/Makefile.in diff -u php4/Makefile.in:1.56 php4/Makefile.in:1.57 --- php4/Makefile.in:1.56 Tue Sep 14 15:12:57 1999 +++ php4/Makefile.in Wed Sep 15 05:35:19 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.56 1999/09/14 19:12:57 andi Exp $ +# $Id: Makefile.in,v 1.57 1999/09/15 09:35:19 ssb Exp $ # prefix = @prefix@ @@ -72,12 +72,8 @@ 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 strlcpy.c strlcat.c -OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ - configuration-parser.o configuration-scanner.o request_info.o \ - safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ - php_ini.o SAPI.o cgi_main.o rfc1867.o dlist.o strlcpy.o strlcat.o - + php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c +OBJS = $(SOURCE:.c=.o) PHPLIBS = -Llibzend -lzend -Lext -lphpext LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@ Index: php4/configure.in.in diff -u php4/configure.in.in:1.77 php4/configure.in.in:1.78 --- php4/configure.in.in:1.77 Tue Sep 14 15:12:57 1999 +++ php4/configure.in.in Wed Sep 15 05:35:20 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.77 1999/09/14 19:12:57 andi Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.78 1999/09/15 09:35:20 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -314,7 +314,8 @@ dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt rint setitimer unsetenv strftime setsockopt tzset shutdown inet_aton statvfs statfs mmap strlcat strlcpy) +AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt rint setitimer unsetenv strftime setsockopt tzset shutdown inet_aton statvfs statfs mmap) +AC_REPLACE_FUNCS(strlcat strlcpy) AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA dnl## OLDLIBS=$LIBS; LIBS="" Index: php4/php.h diff -u php4/php.h:1.33 php4/php.h:1.34 --- php4/php.h:1.33 Tue Sep 14 15:12:57 1999 +++ php4/php.h Wed Sep 15 05:35:20 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.33 1999/09/14 19:12:57 andi Exp $ */ +/* $Id: php.h,v 1.34 1999/09/15 09:35:20 ssb Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -95,11 +95,11 @@ #include <alloca.h> #endif -#if !HAVE_STRLCPY +#ifndef HAVE_STRLCPY size_t strlcpy(char *dst, const char *src, size_t siz); #endif -#if !HAVE_STRLCAT +#ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz); #endif