rjs Mon Sep 13 11:12:25 2004 EDT
Removed files: (Branch: PHP_4_3)
/php-src/ext/pdf CREDITS pdf.c pdf.dsp php_pdf.h
Modified files:
/php-src/ext/pdf config.m4
Log:
removed PDFlib extension from PHP_4_3 branch too (is available in PECL now).
http://cvs.php.net/diff.php/php-src/ext/pdf/config.m4?r1=1.35.2.2&r2=1.35.2.3&ty=u
Index: php-src/ext/pdf/config.m4
diff -u php-src/ext/pdf/config.m4:1.35.2.2 php-src/ext/pdf/config.m4:1.35.2.3
--- php-src/ext/pdf/config.m4:1.35.2.2 Sun Jul 13 23:58:47 2003
+++ php-src/ext/pdf/config.m4 Mon Sep 13 11:12:25 2004
@@ -1,137 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.35.2.2 2003/07/14 03:58:47 sniper Exp $
+dnl $Id: config.m4,v 1.35.2.3 2004/09/13 15:12:25 rjs Exp $
dnl
-PHP_ARG_WITH(pdflib,for PDFlib support,
-[ --with-pdflib[=DIR] Include PDFlib support.])
-
-if test -z "$PHP_JPEG_DIR"; then
- PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
- [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory.
- (OPTIONAL for PDFlib v4)], no, no)
-fi
-
-if test -z "$PHP_PNG_DIR"; then
- PHP_ARG_WITH(png-dir, for the location of libpng,
- [ --with-png-dir[=DIR] PDFLIB: define libpng install directory.
- (OPTIONAL for PDFlib v4)], no, no)
-fi
-
-if test -z "$PHP_ZLIB_DIR"; then
- PHP_ARG_WITH(zlib-dir, for the location of libz,
- [ --with-zlib-dir[=DIR] PDFLIB: define libz install directory.
- (OPTIONAL for PDFlib v4)], no, no)
-fi
-
-PHP_ARG_WITH(tiff-dir, for the location of libtiff,
-[ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory.
- (OPTIONAL for PDFlib v4)], no, no)
+PHP_ARG_WITH(pdflib, whether to include PDFlib support,
+[ --with-pdflib PDFlib support is part of PECL now.])
if test "$PHP_PDFLIB" != "no"; then
-
- PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared)
- PHP_SUBST(PDF_SHARED_LIBADD)
-
- dnl #
- dnl # Optional libraries for PDFlib
- dnl #
-
- dnl # libjpeg
- if test "$PHP_JPEG_DIR" != "no"; then
- PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
- [
- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_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
-
- dnl # libpng
- 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, PDF_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
- if test "$PHP_TIFF_DIR" != "no"; then
- PHP_CHECK_LIBRARY(tiff,TIFFOpen,
- [
- PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_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
- 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, PDF_SHARED_LIBADD)
- fi
-
- dnl #
- dnl # The main PDFlib configure
- dnl #
-
- dnl # MacOSX requires this
- case $host_alias in
- *darwin*)
- PHP_ADD_FRAMEWORK(CoreServices)
- PHP_ADD_FRAMEWORK(ApplicationServices)
- ;;
- esac
-
- case $PHP_PDFLIB in
- yes)
- AC_CHECK_LIB(pdf, PDF_show_boxed, [
- AC_DEFINE(HAVE_PDFLIB,1,[ ])
- PHP_ADD_LIBRARY(pdf,, PDF_SHARED_LIBADD)
- ],[
- 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.
-])
- ])
- ;;
- *)
- 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, PDF_SHARED_LIBADD)
- PHP_ADD_INCLUDE($PHP_PDFLIB/include)
- ],[
- 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 $PDF_SHARED_LIBADD
- ])
- else
- AC_MSG_ERROR([pdflib.h not found! Check the path passed to
--with-pdflib=<PATH>. PATH should be the install prefix directory.])
- fi
- ;;
- esac
+ AC_MSG_ERROR([The PDFlib extension is moved to the PECL repository. Please get it
from http://pecl.php.net/package/pdflib and build it using PEAR.])
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
