CVS update: php3

Date: Saturday May 22, 1999 @ 18:34 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv5521 Modified Files: CREDITS ChangeLog Makefile.in acconfig.h config.h.in configure.in internal_functions.c Log Message: - add bin2hex - add mhash support - some documentation updates Index: php3/CREDITS diff -u php3/CREDITS:1.47 php3/CREDITS:1.48 --- php3/CREDITS:1.47 Mon May 10 07:52:04 1999 +++ php3/CREDITS Sat May 22 18:34:53 1999 @@ -168,6 +168,7 @@ various string and time functions DBA module mcrypt module + mhash module ------------------------------------------------------------------------------ Index: php3/ChangeLog diff -u php3/ChangeLog:1.640 php3/ChangeLog:1.641 --- php3/ChangeLog:1.640 Sat May 22 15:45:54 1999 +++ php3/ChangeLog Sat May 22 18:34:53 1999 @@ -1,6 +1,8 @@ PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Version 3.0.9 +- add bin2hex (Sascha) +- add mhash support (see http://sasweb.de/mhash/ ) (Sascha) May 22 1999, Version 3.0.8 - OCI8 fix for RAW and LONG RAW (Binary data) - sorry currently limited to Index: php3/Makefile.in diff -u php3/Makefile.in:1.309 php3/Makefile.in:1.310 --- php3/Makefile.in:1.309 Fri May 21 00:15:23 1999 +++ php3/Makefile.in Sat May 22 18:34:53 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.309 1999/05/21 04:15:23 steinm Exp $ +# $Id: Makefile.in,v 1.310 1999/05/22 22:34:53 sas Exp $ # prefix = @prefix@ @@ -96,7 +96,7 @@ 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/mcrypt.c functions/dba_db2.c + functions/mcrypt.c functions/dba_db2.c functions/mhash.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) Index: php3/acconfig.h diff -u php3/acconfig.h:1.93 php3/acconfig.h:1.94 --- php3/acconfig.h:1.93 Fri May 21 05:46:32 1999 +++ php3/acconfig.h Sat May 22 18:34:53 1999 @@ -1,3 +1,7 @@ + +/* Define if you have the libmhash library */ +#undef HAVE_LIBMHASH + /* Define if you have the libmcrypt library */ #undef HAVE_LIBMCRYPT Index: php3/config.h.in diff -u php3/config.h.in:1.157 php3/config.h.in:1.158 --- php3/config.h.in:1.157 Fri May 21 05:46:32 1999 +++ php3/config.h.in Sat May 22 18:34:53 1999 @@ -65,6 +65,9 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +/* Define if you have the libmhash library */ +#undef HAVE_LIBMHASH + /* Define if you have the libmcrypt library */ #undef HAVE_LIBMCRYPT Index: php3/configure.in diff -u php3/configure.in:1.370 php3/configure.in:1.371 --- php3/configure.in:1.370 Sat May 22 13:02:38 1999 +++ php3/configure.in Sat May 22 18:34:53 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.370 1999/05/22 17:02:38 sas Exp $ +dnl $Id: configure.in,v 1.371 1999/05/22 22:34:53 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2545,6 +2545,34 @@ AC_MSG_RESULT(yes) PHP_EXTENSION(mcrypt) + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) + +AC_MSG_CHECKING(for mhash support) +AC_ARG_WITH(mhash, +[ --with-mhash[=DIR] Include mhash support. DIR is the mhash + install directory.], +[ + if test "$withval" != "no"; then + for i in /usr/local /usr /opt/mhash $withval; do + if test -f $i/include/mhash.h; then + MHASH_DIR=$i + fi + done + if test "$MHASH_DIR" = ""; then + AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) + fi + INCLUDES="$INCLUDES -I$MHASH_DIR/include" + EXTRA_LIBS="$EXTRA_LIBS -L$MHASH_DIR/lib -lmhash" + + AC_DEFINE(HAVE_LIBMHASH) + + AC_MSG_RESULT(yes) + PHP_EXTENSION(mhash) else AC_MSG_RESULT(no) fi Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.349 php3/internal_functions.c:1.350 --- php3/internal_functions.c:1.349 Thu May 20 15:21:51 1999 +++ php3/internal_functions.c Sat May 22 18:34:53 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.349 1999/05/20 19:21:51 steinm Exp $ */ +/* $Id: internal_functions.c,v 1.350 1999/05/22 22:34:53 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -105,6 +105,7 @@ #include "functions/php3_yp.h" #include "functions/php3_dba.h" #include "functions/php_mcrypt.h" +#include "functions/php_mhash.h" #ifndef WIN32 #include <netinet/in.h> @@ -140,6 +141,7 @@ {"Syslog", syslog_module_ptr}, {"MySQL", mysql_module_ptr}, {"mcrypt", mcrypt_module_ptr}, + {"mhash", mhash_module_ptr}, {"mSQL", msql_module_ptr}, {"PostgresSQL", pgsql_module_ptr}, {"Informix", ifx_module_ptr}, -- 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