CVS update: php3

Date: Monday October 19, 1998 @ 13:19 Author: steinm Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv25590 Modified Files: Makefile.in config.h.in configure.in internal_functions.c setup Log Message: New module to generate pdf using pdflib 0.4 from Th. Merz Index: php3/Makefile.in diff -c php3/Makefile.in:1.266 php3/Makefile.in:1.267 *** php3/Makefile.in:1.266 Sat Oct 10 06:56:35 1998 --- php3/Makefile.in Mon Oct 19 13:19:03 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.266 1998/10/10 10:56:35 zeev Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.267 1998/10/19 17:19:03 steinm 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@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_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@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 78,84 **** functions/md5.c functions/microtime.c functions/mime.c \ functions/msql.c functions/mysql.c \ functions/oracle.c functions/oci8.c functions/pack.c \ ! functions/pageinfo.c functions/pgsql.c \ functions/post.c functions/rand.c functions/reg.c \ functions/solid.c functions/soundex.c \ functions/string.c functions/syslog.c functions/type.c \ --- 78,84 ---- functions/md5.c functions/microtime.c functions/mime.c \ functions/msql.c functions/mysql.c \ functions/oracle.c functions/oci8.c functions/pack.c \ ! functions/pageinfo.c functions/pgsql.c \ functions/post.c functions/rand.c functions/reg.c \ functions/solid.c functions/soundex.c \ functions/string.c functions/syslog.c functions/type.c \ *************** *** 88,99 **** functions/unified_odbc.c functions/ldap.c functions/browscap.c \ functions/velocis.c functions/gdttf.c functions/gdcache.c \ functions/zlib.c functions/COM.c functions/ifx.c \ ! functions/hw.c functions/hg_comm.c functions/dlist.c \ functions/snmp.c functions/var.c functions/interbase.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@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @LIBS@ all: $(BINNAME) --- 88,99 ---- functions/unified_odbc.c functions/ldap.c functions/browscap.c \ functions/velocis.c functions/gdttf.c functions/gdcache.c \ functions/zlib.c functions/COM.c functions/ifx.c \ ! functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \ functions/snmp.c functions/var.c functions/interbase.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@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @LIBS@ all: $(BINNAME) Index: php3/config.h.in diff -c php3/config.h.in:1.117 php3/config.h.in:1.118 *** php3/config.h.in:1.117 Tue Oct 6 09:51:38 1998 --- php3/config.h.in Mon Oct 19 13:19:04 1998 *************** *** 98,103 **** --- 98,106 ---- /* Define if you have the zlib library */ #define HAVE_ZLIB 0 + /* Define if you have the zlib library */ + #define HAVE_PDFLIB 0 + /* Define if you have the gd version 1.3 library (-lgd). */ #define HAVE_LIBGD13 0 Index: php3/configure.in diff -c php3/configure.in:1.264 php3/configure.in:1.265 *** php3/configure.in:1.264 Mon Oct 12 04:06:26 1998 --- php3/configure.in Mon Oct 19 13:19:04 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.264 1998/10/12 08:06:26 ssb Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.265 1998/10/19 17:19:04 steinm Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1291,1296 **** --- 1291,1326 ---- ]) AC_SUBST(ZLIB_LIBS) AC_SUBST(ZLIB_INCLUDE) + + + AC_MSG_CHECKING(whether to include pdflib support) + AC_ARG_WITH(pdflib, + [ --with-pdflib[=DIR] Include pdflib support (tested with 0.4). + DIR is the pdflib install directory, + defaults to /usr/local.], + [ + case "$withval" in + no) + AC_MSG_RESULT(no) ;; + yes) + AC_MSG_RESULT(yes) + AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-lpdf"], + [AC_MSG_ERROR(pdflib module requires pdflib 0.4)]) ;; + *) + test -f $withval/include/pdf.h && PDFLIB_INCLUDE="-I$withval/include" + if test -n "$PDFLIB_INCLUDE" ; then + AC_MSG_RESULT(yes) + AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-L$withval/lib -lpdf"], + [AC_MSG_ERROR(pdflib module requires pdflib 0.4.)]) + else + AC_MSG_RESULT(no) + fi ;; + esac + ],[ + AC_MSG_RESULT(no) + ]) + AC_SUBST(PDFLIB_LIBS) + AC_SUBST(PDFLIB_INCLUDE) AC_MSG_CHECKING(whether to include the bundled dbase library) Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.328 php3/internal_functions.c:1.329 *** php3/internal_functions.c:1.328 Tue Oct 6 09:51:39 1998 --- php3/internal_functions.c Mon Oct 19 13:19:04 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.328 1998/10/06 13:51:39 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.329 1998/10/19 17:19:04 steinm Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 90,95 **** --- 90,96 ---- #include "functions/php3_zlib.h" #include "functions/php3_COM.h" #include "functions/php3_interbase.h" + #include "functions/php3_pdf.h" extern php3_ini_structure php3_ini; *************** *** 146,151 **** --- 147,153 ---- {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, {"InterBase", php3_ibase_module_ptr}, + {"PDF", pdf_module_ptr}, {NULL, NULL} }; Index: php3/setup diff -c php3/setup:1.44 php3/setup:1.45 *** php3/setup:1.44 Tue Sep 22 11:57:22 1998 --- php3/setup Mon Oct 19 13:19:05 1998 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.44 1998/09/22 15:57:22 steinm Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 29,35 ---- # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.45 1998/10/19 17:19:05 steinm Exp $ if [ "$1" = "-q" ]; then quiet_mode=on *************** *** 348,353 **** --- 348,358 ---- define_option with-filepro 'filePro support? ' yesno no \ ' Whether to use the bundled filePro library. Read-access only.' + + define_option with-pdflib 'pdflib 0.4 support? ' yesnodir \ + 'no /usr/local pdflib install' \ + ' Whether to use the pdflib support to write .pdf-files.\n + Tested for version 0.4!' define_option with-zlib 'zlib (>= 1.0.9) support? ' yesnodir \ 'no /usr zlib install' \ -- 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