CVS update: php3

Date: Sunday April 25, 1999 @ 18:24 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv19110 Modified Files: Makefile.in acconfig.h aclocal.m4 config.h.in configure.in internal_functions.c libphp3.module.in Log Message: - "Backport" of mcrypt module - some changes to make integration of PHP4 modules easier Index: php3/Makefile.in diff -u php3/Makefile.in:1.301 php3/Makefile.in:1.302 --- php3/Makefile.in:1.301 Fri Apr 9 03:04:29 1999 +++ php3/Makefile.in Sun Apr 25 18:24:07 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.301 1999/04/09 07:04:29 sas Exp $ +# $Id: Makefile.in,v 1.302 1999/04/25 22:24:07 sas Exp $ # prefix = @prefix@ @@ -37,7 +37,7 @@ AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ -INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ @DBA_INCLUDE@ +INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ @DBA_INCLUDE@ @INCLUDES@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ @@ -95,11 +95,12 @@ functions/sysvsem.c functions/dav.c functions/sysvshm.c \ functions/gettext.c functions/php3_mckcrypt.c \ functions/yp.c functions/dba.c functions/dba_gdbm.c \ - functions/dba_dbm.c functions/dba_ndbm.c functions/dba_cdb.c + functions/dba_dbm.c functions/dba_ndbm.c functions/dba_cdb.c \ + functions/mcrypt.c 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@ @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@ @LIBS@ +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@ @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) Index: php3/acconfig.h diff -u php3/acconfig.h:1.89 php3/acconfig.h:1.90 --- php3/acconfig.h:1.89 Mon Apr 12 00:41:15 1999 +++ php3/acconfig.h Sun Apr 25 18:24:08 1999 @@ -1,3 +1,6 @@ +/* Define if you have the libmcrypt library */ +#undef HAVE_LIBMCRYPT + /* This is the default configuration file to read */ #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.35 php3/aclocal.m4:1.36 --- php3/aclocal.m4:1.35 Wed Apr 21 05:46:42 1999 +++ php3/aclocal.m4 Sun Apr 25 18:24:08 1999 @@ -1,6 +1,9 @@ -dnl $Id: aclocal.m4,v 1.35 1999/04/21 09:46:42 sas Exp $ +dnl $Id: aclocal.m4,v 1.36 1999/04/25 22:24:08 sas Exp $ dnl dnl This file contains local autoconf functions. + +dnl dummy function for PHP4 compatibility +AC_DEFUN(PHP_EXTENSION,[]) AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) Index: php3/config.h.in diff -u php3/config.h.in:1.150 php3/config.h.in:1.151 --- php3/config.h.in:1.150 Mon Apr 12 00:41:15 1999 +++ php3/config.h.in Sun Apr 25 18:24:08 1999 @@ -65,6 +65,9 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +/* Define if you have the libmcrypt library */ +#undef HAVE_LIBMCRYPT + /* 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.344 php3/configure.in:1.345 --- php3/configure.in:1.344 Thu Apr 22 23:25:55 1999 +++ php3/configure.in Sun Apr 25 18:24:09 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.344 1999/04/23 03:25:55 rasmus Exp $ +dnl $Id: configure.in,v 1.345 1999/04/25 22:24:09 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2392,6 +2392,31 @@ AC_DEFINE(HAVE_DBA, 0) fi +AC_MSG_CHECKING(for mcrypt support) +AC_ARG_WITH(mcrypt, +[ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt + install directory.], +[ + if test "$withval" != "no"; then + for i in /usr/local /usr $withval; do + if test -f $i/include/lcrypt.h; then + MCRYPT_DIR=$i + fi + done + INCLUDES="$INCLUDES -I$MCRYPT_DIR/include" + EXTRA_LIBS="$EXTRA_LIBS -L$MCRYPT_DIR/lib -lmcrypt" + + AC_DEFINE(HAVE_LIBMCRYPT) + + AC_MSG_RESULT(yes) + PHP_EXTENSION(mcrypt) + else + AC_MSG_RESULT(no) + fi +],[ + 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" @@ -2411,7 +2436,9 @@ AC_SUBST(CFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB_EXPORT) - +AC_SUBST(INCLUDES) +AC_SUBST(EXTRA_LIBS) + dnl Create the necessary directories if building using VPATH if test ! -d functions; then mkdir functions Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.347 php3/internal_functions.c:1.348 --- php3/internal_functions.c:1.347 Fri Apr 9 03:04:27 1999 +++ php3/internal_functions.c Sun Apr 25 18:24:09 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.347 1999/04/09 07:04:27 sas Exp $ */ +/* $Id: internal_functions.c,v 1.348 1999/04/25 22:24:09 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -103,6 +103,7 @@ #include "functions/php3_wddx_a.h" #include "functions/php3_yp.h" #include "functions/php3_dba.h" +#include "functions/php_mcrypt.h" #ifndef WIN32 #include <netinet/in.h> @@ -137,6 +138,7 @@ {"Debugger", debugger_module_ptr}, {"Syslog", syslog_module_ptr}, {"MySQL", mysql_module_ptr}, + {"mcrypt", mcrypt_module_ptr}, {"mSQL", msql_module_ptr}, {"PostgresSQL", pgsql_module_ptr}, {"Informix", ifx_module_ptr}, Index: php3/libphp3.module.in diff -u php3/libphp3.module.in:1.24 php3/libphp3.module.in:1.25 --- php3/libphp3.module.in:1.24 Fri Apr 9 04:26:48 1999 +++ php3/libphp3.module.in Sun Apr 25 18:24:09 1999 @@ -1,7 +1,7 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @DBA_LFLAGS@ @DBA_LIBS@" + LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @DBA_LFLAGS@ @DBA_LIBS@ @EXTRA_LIBS@" RULE_HIDE=yes ConfigEnd -- 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