cvs: /php3/functions php3_recode.h recode.c /php3 ChangeLog Makefile.in config.h.in configure.in internal_functions.c

kk Sun Nov 21 18:06:32 1999 EDT Added files: /php3/functions php3_recode.h recode.c Modified files: /php3 ChangeLog Makefile.in config.h.in configure.in internal_functions.c Log: Added initial version of GNU recode support. Limitations and ideas: - configure.in needs better $withval evaluation. Sascha? - recode_file(string request, FILE in, FILE out) function would be handy. - See comment in recode.c:php3_recode_string(): How do I handle RETURN_STRING(r, x) properly? - How do I handle #define THREAD_SAFE correctly? - My librecode (Suse 6.2) defines a symbol char *program_name, which I satisfy #ifdef HAVE_BROKEN_RECODE. No configure.in support for this, currently. Sascha? Index: php3/ChangeLog diff -u php3/ChangeLog:1.794 php3/ChangeLog:1.795 --- php3/ChangeLog:1.794 Mon Nov 15 06:45:37 1999 +++ php3/ChangeLog Sun Nov 21 18:06:30 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| Nov 15, 1999, Version 3.0.13 +- added sketchy support for GNU recode 3.5 (Kristian) - Added tmpfile() function (Stig) - fixed trim(), chop(), ltrim(), etc. to remove NULL characters as well. (Colin Viebrock) @@ -47,7 +48,7 @@ - OCI8 doesn't use define callbacks any longer. (Thies) - Safe-Mode fix for oci8 savefile() function. (Thies) - Added ldap_get_values_len function (Stig Venaas) -- Added more functions to posix module. +- Added more functions to posix module (Kristian). - Close loophole that allowed virtual() to be used on a PHP file without an error (Ken Coar) - Add versioning support for shared library (Sascha) Index: php3/Makefile.in diff -u php3/Makefile.in:1.355 php3/Makefile.in:1.356 --- php3/Makefile.in:1.355 Sat Nov 13 10:41:05 1999 +++ php3/Makefile.in Sun Nov 21 18:06:30 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.355 1999/11/13 15:41:05 kk Exp $ +# $Id: Makefile.in,v 1.356 1999/11/21 23:06:30 kk Exp $ # prefix = @prefix@ @@ -103,7 +103,7 @@ functions/dba_dbm.c functions/dba_ndbm.c functions/dba_cdb.c \ functions/mcrypt.c functions/dba_db2.c functions/mhash.c \ functions/pcre.c functions/posix.c functions/parsedate.c \ - functions/lcg.c + functions/lcg.c functions/recode.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) Index: php3/config.h.in diff -u php3/config.h.in:1.199 php3/config.h.in:1.200 --- php3/config.h.in:1.199 Sat Nov 20 21:52:15 1999 +++ php3/config.h.in Sun Nov 21 18:06:30 1999 @@ -408,7 +408,11 @@ #define HAVE_LIBFREETYPE 0 #define FREETYPE_4BIT_ANTIALIAS_HACK 0 +/* enable POSIX support? */ #define HAVE_POSIX 0 + +/* enable RECODE support? */ +#define HAVE_RECODE 0 /* The number of bytes in a int. */ #undef SIZEOF_INT Index: php3/configure.in diff -u php3/configure.in:1.475 php3/configure.in:1.476 --- php3/configure.in:1.475 Sun Nov 21 11:33:11 1999 +++ php3/configure.in Sun Nov 21 18:06:30 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.475 1999/11/21 16:33:11 sr Exp $ +dnl $Id: configure.in,v 1.476 1999/11/21 23:06:30 kk Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2891,6 +2891,21 @@ ],[ AC_DEFINE(HAVE_POSIX, 1) AC_MSG_RESULT(yes) +]) + +AC_MSG_CHECKING(whether to include GNU recode support) +AC_ARG_WITH(recode, +[ --without-recode Don't include GNU recode functions],[ + if test "$withval" = "yes"; then + AC_DEFINE(HAVE_RECODE, 1) + AC_ADD_LIBRARY(recode) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[ + AC_DEFINE(HAVE_RECODE, 0) + AC_MSG_RESULT(no) ]) AC_MSG_CHECKING(whether to enable dmalloc support) Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.360 php3/internal_functions.c:1.361 --- php3/internal_functions.c:1.360 Mon Sep 20 11:39:06 1999 +++ php3/internal_functions.c Sun Nov 21 18:06:30 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.360 1999/09/20 15:39:06 askalski Exp $ */ +/* $Id: internal_functions.c,v 1.361 1999/11/21 23:06:30 kk Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -111,6 +111,7 @@ #include "functions/php_mhash.h" #include "functions/php3_pcre.h" #include "functions/php3_posix.h" +#include "functions/php3_recode.h" #include "functions/php_lcg.h" #ifndef WIN32 @@ -196,6 +197,7 @@ {"ImageMagick", magick_module_ptr}, {"PCRE", pcre_module_ptr}, {"Posix", posix_module_ptr}, + {"Recode", recode_module_ptr}, {"LCG", phpext_lcg_ptr}, {NULL, NULL} };