cvs: php4 /ext/pdf CREDITS Makefile.in config.m4 pdf.c php_pdf.h

sniper Thu Nov 29 23:46:36 2001 EDT Modified files: /php4/ext/pdf CREDITS Makefile.in config.m4 pdf.c php_pdf.h Log: This is better way to configure. PDFlib 3/4 can be compiled with external libs too..

Index: php4/ext/pdf/CREDITS diff -u php4/ext/pdf/CREDITS:1.1 php4/ext/pdf/CREDITS:1.2 --- php4/ext/pdf/CREDITS:1.1 Mon Nov 20 05:31:30 2000 +++ php4/ext/pdf/CREDITS Thu Nov 29 23:46:35 2001 @@ -1,2 +1,2 @@ PDF -Uwe Steinmann +Uwe Steinmann, Rainer Schaaf Index: php4/ext/pdf/Makefile.in diff -u php4/ext/pdf/Makefile.in:1.8 php4/ext/pdf/Makefile.in:1.9 --- php4/ext/pdf/Makefile.in:1.8 Tue Nov 13 08:59:12 2001 +++ php4/ext/pdf/Makefile.in Thu Nov 29 23:46:35 2001 @@ -1,7 +1,7 @@ LTLIBRARY_NAME = libpdf.la LTLIBRARY_SOURCES = pdf.c -LTLIBRARY_SHARED_NAME = libpdf_php.la +LTLIBRARY_SHARED_NAME = pdf.la LTLIBRARY_SHARED_LIBADD = $(PDFLIB_SHARED_LIBBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.25 php4/ext/pdf/config.m4:1.26 --- php4/ext/pdf/config.m4:1.25 Tue Nov 13 08:59:12 2001 +++ php4/ext/pdf/config.m4 Thu Nov 29 23:46:35 2001 @@ -1,163 +1,123 @@ dnl -dnl $Id: config.m4,v 1.25 2001/11/13 13:59:12 sniper Exp $ +dnl $Id: config.m4,v 1.26 2001/11/30 04:46:35 sniper Exp $ dnl -PHP_ARG_WITH(pdflib3,whether to include PDFlib3 support, -[ --with-pdflib3[=DIR] Include PDFlib3 support. DIR is the pdflib - base install directory, defaults to /usr/local - Set DIR to "shared" to build as dl, or "shared,DIR" - to build as dl and still specify DIR.]) +PHP_ARG_WITH(pdflib,for PDFlib support, +[ --with-pdflib[=DIR] Include PDFlib support.]) -if test "$PHP_PDFLIB3" != "no"; then +if test "$PHP_PDFLIB" != "no"; then - PHP_SUBST(PDFLIB3_SHARED_LIBADD) PHP_EXTENSION(pdf, $ext_shared) + PHP_SUBST(PDFLIB_SHARED_LIBADD) - case $PHP_PDFLIB3 in - yes) - PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, [ - AC_DEFINE(HAVE_PDFLIB3,1,[ ]) - ],[ - AC_MSG_ERROR([pdflib3 extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>]) - ],[ - -ltiff -ljpeg -lpng -lz - ]) + dnl # + dnl # Optional libraries for PDFlib + dnl # + + dnl # libjpeg + + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, + [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)]) + + if test "$PHP_JPEG_DIR" != "no"; then + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, + [ + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libjpeg not found!]) + ],[ + -L$PHP_JPEG_DIR/lib + ]) + else + AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>]) + fi - PHP_ADD_LIBRARY(pdf,, PDFLIB3_SHARED_LIBADD) - PHP_ADD_LIBRARY(tiff,, PDFLIB3_SHARED_LIBADD) - PHP_ADD_LIBRARY(png,, PDFLIB3_SHARED_LIBADD) - PHP_ADD_LIBRARY(jpeg,, PDFLIB3_SHARED_LIBADD) - PHP_ADD_LIBRARY(z,, PDFLIB3_SHARED_LIBADD) - ;; - *) - test -f $PHP_PDFLIB3/include/pdflib.h && PDFLIB3_INCLUDE=$PHP_PDFLIB3/include - if test -n "$PDFLIB3_INCLUDE" ; then - - if test "$PHP_ZLIB_DIR" = "no"; then - AC_MSG_ERROR([PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>]) - fi + dnl # libpng - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB3_SHARED_LIBADD) + PHP_ARG_WITH(png-dir, for the location of libpng, + [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. (OPTIONAL for PDFlib v4)]) - PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, - [ --with-jpeg-dir[=DIR] PDFLIB3: define libjpeg install directory]) - - if test "$PHP_JPEG_DIR" != "no"; then - PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, - [ - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB3_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([libjpeg not found!]) - ],[ - -L$PHP_JPEG_DIR/lib - ]) - else - AC_CHECK_LIB(jpeg,jpeg_read_header, - [ - PHP_ADD_LIBRARY(jpeg,, PDFLIB3_SHARED_LIBADD) - ],[ - AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>) - ]) - fi + if test "$PHP_PNG_DIR" != "no"; then + PHP_CHECK_LIBRARY(png,png_create_info_struct, + [ + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libpng not found!]) + ],[ + -L$PHP_PNG_DIR/lib + ]) + else + AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>]) + fi + + dnl # libtiff + + PHP_ARG_WITH(tiff-dir, for the location of libtiff, + [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)]) + + if test "$PHP_TIFF_DIR" != "no"; then + PHP_CHECK_LIBRARY(tiff,TIFFOpen, + [ + PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libtiff not found!]) + ],[ + -L$PHP_TIFF_DIR/lib + ]) + else + AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>]) + fi + dnl # zlib - PHP_ARG_WITH(png-dir, for the location of libpng, - [ --with-png-dir[=DIR] PDFLIB3: define libpng install directory]) - - if test "$PHP_PNG_DIR" != "no"; then - PHP_CHECK_LIBRARY(png,png_create_info_struct, - [ - PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB3_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([libpng not found!]) - ],[ - -L$PHP_PNG_DIR/lib - ]) - else - AC_CHECK_LIB(png,png_create_info_struct, - [ - PHP_ADD_LIBRARY(png,, PDFLIB3_SHARED_LIBADD) - ],[ - AC_MSG_RESULT(no, try --with-png-dir=<DIR>) - ]) - fi - - - PHP_ARG_WITH(tiff-dir, for the location of libtiff, - [ --with-tiff-dir[=DIR] PDFLIB3: define libtiff install directory]) - - if test "$PHP_TIFF_DIR" != "no"; then - PHP_CHECK_LIBRARY(tiff,TIFFOpen, - [ - PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB3_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([libtiff not found!]) - ],[ - -L$PHP_TIFF_DIR/lib - ]) - else - AC_CHECK_LIB(tiff,TIFFOpen, - [ - PHP_ADD_LIBRARY(tiff,, PDFLIB3_SHARED_LIBADD) - ],[ - AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>) - ]) - fi - - - PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, - [ - AC_DEFINE(HAVE_PDFLIB3,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB3/lib, PDFLIB3_SHARED_LIBADD) - PHP_ADD_INCLUDE($PDFLIB3_INCLUDE) - ],[ - AC_MSG_ERROR([pdflib3 extension requires at least pdflib 3.x.]) - ],[ - -L$PHP_PDFLIB3/lib - ]) - fi - ;; - esac -fi + AC_MSG_CHECKING([for the location of zlib]) + if test "$PHP_ZLIB_DIR" = "no"; then + AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>]) + else + AC_MSG_RESULT([$PHP_ZLIB_DIR]) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) + fi -PHP_ARG_WITH(pdflib,whether to include PDFlib support, -[ --with-pdflib[=DIR] Include PDFlib 4.x support. DIR is the PDFlib - base install directory, defaults to /usr/local - Set DIR to "shared" to build as dl, or "shared,DIR" - to build as dl and still specify DIR.]) -if test "$PHP_PDFLIB" != "no"; then + dnl # + dnl # The main PDFlib configure + dnl # - PHP_EXTENSION(pdf, $ext_shared) - PHP_SUBST(PDFLIB_SHARED_LIBADD) - - case "$PHP_PDFLIB" in + case $PHP_PDFLIB in yes) - AC_CHECK_LIB(pdf, PDF_open_pdi, [ + PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, [ AC_DEFINE(HAVE_PDFLIB,1,[ ]) PHP_ADD_LIBRARY(pdf,, PDFLIB_SHARED_LIBADD) ],[ - AC_MSG_ERROR([PDFlib extension requires at least PDFlib 4.x. To build with PDFlib 3.x you should use --with-pdflib3.]) + AC_MSG_ERROR([ +PDFlib extension requires at least pdflib 3.x. You may also need libtiff, libjpeg, libpng and libz. +Use the options --with-tiff-dir=<DIR>, --with-jpeg-dir=<DIR>, --with-png-dir=<DIR> and --with-zlib-dir=<DIR> +See config.log for more information. +]) + ],[ + -ltiff -ljpeg -lpng -lz ]) - ;; - no) - ;; + ;; *) - test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE="$PHP_PDFLIB/include" - if test -n "$PDFLIB_INCLUDE" ; then - PHP_CHECK_LIBRARY(pdf, PDF_open_pdi, [ - AC_DEFINE(HAVE_PDFLIB,1,[ ]) + if test -f "$PHP_PDFLIB/include/pdflib.h" ; then + + PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, + [ + AC_DEFINE(HAVE_PDFLIB,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) - PHP_ADD_INCLUDE($PDFLIB_INCLUDE) + PHP_ADD_INCLUDE($PHP_PDFLIB/include) ],[ - AC_MSG_ERROR([PDFlib extension requires PDFlib 4.x.]) + AC_MSG_ERROR([ +PDFlib extension requires at least pdflib 3.x. You may also need libtiff, libjpeg, libpng and libz. +Use the options --with-tiff-dir=<DIR>, --with-jpeg-dir=<DIR>, --with-png-dir=<DIR> and --with-zlib-dir=<DIR> +See config.log for more information. +]) ],[ -L$PHP_PDFLIB/lib ]) else - AC_MSG_ERROR([pdflib.h not found under $PHP_PDFLIB/include/]) + AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=<PATH>. PATH should be the install prefix directory.]) fi - ;; + ;; esac - fi Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.104 php4/ext/pdf/pdf.c:1.105 --- php4/ext/pdf/pdf.c:1.104 Thu Nov 8 18:38:37 2001 +++ php4/ext/pdf/pdf.c Thu Nov 29 23:46:35 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.104 2001/11/08 23:38:37 derick Exp $ */ +/* $Id: pdf.c,v 1.105 2001/11/30 04:46:35 sniper Exp $ */ /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ @@ -52,7 +52,7 @@ #endif /* }}} */ -#if HAVE_PDFLIB || HAVE_PDFLIB3 +#if HAVE_PDFLIB #include "php_pdf.h" @@ -347,7 +347,7 @@ #else php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); #endif - php_info_print_table_row(2, "Revision", "$Revision: 1.104 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.105 $" ); php_info_print_table_end(); } Index: php4/ext/pdf/php_pdf.h diff -u php4/ext/pdf/php_pdf.h:1.21 php4/ext/pdf/php_pdf.h:1.22 --- php4/ext/pdf/php_pdf.h:1.21 Thu Nov 8 18:37:33 2001 +++ php4/ext/pdf/php_pdf.h Thu Nov 29 23:46:35 2001 @@ -16,17 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdf.h,v 1.21 2001/11/08 23:37:33 derick Exp $ */ +/* $Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp $ */ #ifndef PHP_PDF_H #define PHP_PDF_H -#if HAVE_PDFLIB || HAVE_PDFLIB3 +#if HAVE_PDFLIB -/* with version 2.20 of pdflib PDF_open_mem isn't available unless - the following define isn't there. -*/ -#define PDF_OPEN_MEM_SUPPORTED #include <pdflib.h> extern zend_module_entry pdf_module_entry;