CVS update: php3

Date: Thursday May 27, 1999 @ 16:20 Author: andrey Update of /repository/php3 In directory php:/tmp/cvs-serv10856 Modified Files: Makefile.in config.h.in configure.in Log Message: Update configuration for PCRE. Index: php3/Makefile.in diff -u php3/Makefile.in:1.312 php3/Makefile.in:1.313 --- php3/Makefile.in:1.312 Thu May 27 11:42:50 1999 +++ php3/Makefile.in Thu May 27 16:20:41 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.312 1999/05/27 15:42:50 andrey Exp $ +# $Id: Makefile.in,v 1.313 1999/05/27 20:20:41 andrey Exp $ # prefix = @prefix@ @@ -101,10 +101,10 @@ FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) -LIBS = @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @EXTRA_LIBS@ @LIBS@ +LIBS = @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @EXTRA_LIBS@ @LIBS@ all: $(BINNAME) -php: $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ +php: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS) libphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ @@ -125,6 +125,9 @@ docs: cd doc; $(MAKE) +pcrelib/libpcre.a: + (cd pcrelib; $(MAKE)) + regex/libregex.a: (cd regex; $(MAKE) lib) @@ -158,6 +161,7 @@ -rm -f test/php.desc test/php.in test/php.out test/php.test -rm -f test/a.tmp test/b.tmp test/test.dbm* (cd dbase; $(MAKE) clean) + (cd pcrelib; $(MAKE) clean) (cd regex; $(MAKE) clean) distclean: clean @@ -165,11 +169,12 @@ -rm -f config.status config.cache config.log -rm -f Makefile Makefile.depend config.h build-defs.h -rm -f libphp3.module libmodphp3-so.a stamp-h + -rm -f pcrelib/*.o pcrelib/*.a -rm -f regex/*.o regex/*.a regex/*.ih -rm -f dbase/*.o dbase/*.a -rm -f doc/checkdoc doc/funcparse doc/version.ent -rm -f do-conf test/test.log extra/gd/bdf2gdfont - -rm -f doc/Makefile regex/Makefile dbase/Makefile + -rm -f doc/Makefile regex/Makefile dbase/Makefile pcrelib/Makefile bench: $(BINNAME) ./$(BINNAME) -c. tests/bench.phtml Index: php3/config.h.in diff -u php3/config.h.in:1.160 php3/config.h.in:1.161 --- php3/config.h.in:1.160 Thu May 27 11:42:50 1999 +++ php3/config.h.in Thu May 27 16:20:41 1999 @@ -74,6 +74,9 @@ /* Define if you want to have PCRE support */ #define HAVE_PCRE 0 +/* Define if you want to use bundled PCRE library */ +#define HAVE_BUNDLED_PCRE 0 + /* This is the default configuration file to read */ #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 Index: php3/configure.in diff -u php3/configure.in:1.374 php3/configure.in:1.375 --- php3/configure.in:1.374 Thu May 27 11:57:30 1999 +++ php3/configure.in Thu May 27 16:20:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.374 1999/05/27 15:57:30 andrey Exp $ +dnl $Id: configure.in,v 1.375 1999/05/27 20:20:41 andrey Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -140,6 +140,9 @@ LIBS="-lpam $LIBS" AC_DEFINE(HAVE_LIBPAM) ], []) +AC_CHECK_LIB(bind, inet_aton, [ + LIBS="$LIBS -lbind" ], []) + dnl Checks for header files. AC_HEADER_STDC @@ -2589,18 +2592,19 @@ AC_MSG_RESULT(no) ;; yes) - EXTRA_LIBS="-lpcre $EXTRA_LIBS" + PCRE_LIB="pcrelib/libpcre.a" AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) ;; *) test -f $withval/pcre.h && PCRE_INCLUDE="-I$withval" - test -f $withval/libpcre.a && PCRE_LIB="-L$withval -lpcre" + test -f $withval/libpcre.a && PCRE_LIB="$withval/libpcre.a" if test -n "$PCRE_INCLUDE" && test -n "$PCRE_LIB" ; then INCLUDES="$PCRE_INCLUDE $INCLUDES" - EXTRA_LIBS="$PCRE_LIB $EXTRA_LIBS" AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 0) AC_MSG_RESULT(yes) else AC_MSG_ERROR(Unable to find pcre.h and libpcre.a in $withval) @@ -2608,8 +2612,12 @@ ;; esac ],[ - AC_MSG_RESULT(no) + PCRE_LIB="pcrelib/libpcre.a" + AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_MSG_RESULT(yes) ]) +AC_SUBST(PCRE_LIB) 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" @@ -2654,7 +2662,7 @@ AC_OUTPUT(Makefile build-defs.h stamp-h libphp3.module doc/Makefile doc/version.ent doc/checkdoc doc/html.dsl doc/print.dsl doc/phpweb.dsl - extra/gd/bdf2gdfont regex/Makefile dbase/Makefile, [ + extra/gd/bdf2gdfont regex/Makefile pcrelib/Makefile dbase/Makefile, [ chmod +x doc/checkdoc extra/gd/bdf2gdfont ], [ -- 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