cvs: /php4 configure.in /php4/ext/pcre php_pcre.c

andrei Tue Dec 7 11:27:13 1999 EDT Modified files: /php4 configure.in /php4/ext/pcre php_pcre.c Log: Need to check for __inet_aton on Solaris. Index: php4/configure.in diff -u php4/configure.in:1.62 php4/configure.in:1.63 --- php4/configure.in:1.62 Tue Dec 7 10:22:49 1999 +++ php4/configure.in Tue Dec 7 11:26:36 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.62 1999/12/07 15:22:49 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.63 1999/12/07 16:26:36 andrei Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -193,7 +193,10 @@ AC_CHECK_LIB(bind, inet_aton, [ AC_ADD_LIBRARY(bind) - AC_DEFINE(HAVE_LIBBIND) ], []) + AC_DEFINE(HAVE_LIBBIND) ], [ + AC_CHECK_LIB(bind, __inet_aton, [ + AC_ADD_LIBRARY(bind) + AC_DEFINE(HAVE_LIBBIND) ], []) ]) AC_CHECK_LIB(resolv, inet_aton) Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.31 php4/ext/pcre/php_pcre.c:1.32 --- php4/ext/pcre/php_pcre.c:1.31 Mon Dec 6 11:41:55 1999 +++ php4/ext/pcre/php_pcre.c Tue Dec 7 11:26:42 1999 @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.31 1999/12/06 16:41:55 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.32 1999/12/07 16:26:42 andrei Exp $ */ /* TODO: - Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time - Make new modifier, similar to /e, that passes matches to - a user-defined function + a user-defined function */ #include "php.h"