CVS update: php3

Date: Friday January 15, 1999 @ 13:38 Author: alex Update of /repository/php3 In directory asf:/u/temp/cvs-serv17026 Modified Files: Makefile.in acconfig.h config.h.in configure.in internal_functions.c libphp3.module.in Log Message: Added initial version of the GNU gettext module. Index: php3/Makefile.in diff -c php3/Makefile.in:1.283 php3/Makefile.in:1.284 *** php3/Makefile.in:1.283 Mon Jan 11 01:11:10 1999 --- php3/Makefile.in Fri Jan 15 13:38:34 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.283 1999/01/11 06:11:10 musone Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.284 1999/01/15 18:38:34 alex Exp $ # prefix = @prefix@ *************** *** 37,43 **** 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@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ --- 37,43 ---- 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@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 92,102 **** functions/fdf.c functions/wddx.c \ functions/snmp.c functions/var.c functions/interbase.c \ functions/quot_print.c functions/cyr_convert.c \ ! functions/sysvsem.c functions/dav.c functions/sysvshm.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @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@ @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@ @LIBS@ all: $(BINNAME) --- 92,103 ---- functions/fdf.c functions/wddx.c \ functions/snmp.c functions/var.c functions/interbase.c \ functions/quot_print.c functions/cyr_convert.c \ ! functions/sysvsem.c functions/dav.c functions/sysvshm.c \ ! functions/gettext.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @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@ @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_LIBS@ @LIBS@ all: $(BINNAME) *************** *** 430,435 **** --- 431,441 ---- mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ internal_functions.h modules.h php3_list.h functions/head.h \ functions/php3_gd.h + functions/gettext.o: functions/gettext.c php.h php_version.h config.h request_info.h \ + php3_hash.h alloc.h safe_mode.h fopen-wrappers.h mod_php3.h \ + stack.h operators.h token_cache.h variables.h constants.h \ + internal_functions.h modules.h php3_list.h functions/head.h \ + functions/php3_gettext.h functions/head.o: functions/head.c php.h php_version.h config.h request_info.h \ php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \ mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ Index: php3/acconfig.h diff -c php3/acconfig.h:1.76 php3/acconfig.h:1.77 *** php3/acconfig.h:1.76 Mon Jan 11 01:11:10 1999 --- php3/acconfig.h Fri Jan 15 13:38:34 1999 *************** *** 32,37 **** --- 32,40 ---- /* Define if you have the gd library (-lgd). */ #define HAVE_LIBGD 0 + /* Define if you have the GNU gettext library (-lintl). */ + #define HAVE_LIBINTL 0 + /* Define if you have the zlib library */ #define HAVE_ZLIB 0 Index: php3/config.h.in diff -c php3/config.h.in:1.133 php3/config.h.in:1.134 *** php3/config.h.in:1.133 Fri Jan 15 05:55:16 1999 --- php3/config.h.in Fri Jan 15 13:38:34 1999 *************** *** 95,100 **** --- 95,103 ---- /* Define if you have the gd library (-lgd). */ #define HAVE_LIBGD 0 + /* Define if you have the GNU gettext library (-lintl). */ + #define HAVE_LIBINTL 0 + /* Define if you have the zlib library */ #define HAVE_ZLIB 0 Index: php3/configure.in diff -c php3/configure.in:1.304 php3/configure.in:1.305 *** php3/configure.in:1.304 Fri Jan 15 05:55:16 1999 --- php3/configure.in Fri Jan 15 13:38:34 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.304 1999/01/15 10:55:16 thies Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.305 1999/01/15 18:38:34 alex Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 624,630 **** AC_CHECK_LIB(ttf, TT_Open_Face) fi ! AC_MSG_CHECKING(for Oracle support) AC_ARG_WITH(oracle, --- 624,660 ---- AC_CHECK_LIB(ttf, TT_Open_Face) fi ! AC_MSG_CHECKING(whether to include GNU gettext support) ! AC_ARG_WITH(gettext, ! [ --with-gettext[=DIR] Include GNU gettext support. DIR is the gettext ! intall directory, defaults to /usr/local], ! [ ! if test "$withval" != "no"; then ! if test "$withval" = "yes"; then ! GETTEXT_INCDIR=/usr/local/include ! test -f /usr/local/include/libintl.h && GETTEXT_INCDIR=/usr/local/include/ ! GETTEXT_LIBDIR=/usr/local/lib ! else ! GETTEXT_INCDIR=$withval/include ! test -f $withval/include/libintl.h && GETTEXT_INCDIR=$withval/include ! GETTEXT_LIBDIR=$withval/lib ! fi ! GETTEXT_INCLUDE=-I$GETTEXT_INCDIR ! GETTEXT_LFLAGS=-L$GETTEXT_LIBDIR ! GETTEXT_LIBS="-lintl" ! ! AC_DEFINE(HAVE_LIBINTL) ! ! AC_MSG_RESULT(yes) ! else ! AC_MSG_RESULT(no) ! fi ! ],[ ! AC_MSG_RESULT(no) ! ]) ! AC_SUBST(GETTEXT_LIBS) ! AC_SUBST(GETTEXT_LFLAGS) ! AC_SUBST(GETTEXT_INCLUDE) AC_MSG_CHECKING(for Oracle support) AC_ARG_WITH(oracle, Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.337 php3/internal_functions.c:1.338 *** php3/internal_functions.c:1.337 Mon Jan 11 01:11:10 1999 --- php3/internal_functions.c Fri Jan 15 13:38:35 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.337 1999/01/11 06:11:10 musone Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.338 1999/01/15 18:38:35 alex Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 97,102 **** --- 97,103 ---- #include "functions/php3_sysvsem.h" #include "functions/php3_sysvshm.h" #include "functions/php3_dav.h" + #include "functions/php3_gettext.h" #include "functions/php3_wddx.h" extern php3_ini_structure php3_ini; *************** *** 120,125 **** --- 121,127 ---- {"Directory", php3_dir_module_ptr}, {"File statting", php3_filestat_module_ptr}, {"File handling", php3_file_module_ptr}, + {"GNU gettext", php3_gettext_module_ptr}, {"HTTP Header", php3_header_module_ptr}, {"Sendmail", mail_module_ptr}, {"Debugger", debugger_module_ptr}, Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.17 php3/libphp3.module.in:1.18 *** php3/libphp3.module.in:1.17 Mon Jan 11 01:11:10 1999 --- php3/libphp3.module.in Fri Jan 15 13:38:35 1999 *************** *** 1,7 **** Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @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@ @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@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd --- 1,7 ---- Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @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@ @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_LIBS@ @LIBS@ $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