mirror of
https://github.com/php/php-src.git
synced 2024-11-29 12:53:37 +08:00
added new configure option --with-pdflib3
Therefore --with-pdflib will only work with PDFlib 4.x from now on, if one wants to build PHP with PDFlib V3.x he has to use the new option --with-pdflib3. This makes configuration of PDFlib much easier, as no additional libraries are needed anymore. This is possible, because PDFlib has built in libraries for tiff/jpg/zlib since V4.
This commit is contained in:
Rainer Schaaf
parent
e4ebe9f1ff
commit
06111162cf
@ -2,50 +2,50 @@ dnl
|
||||
dnl $Id$
|
||||
dnl
|
||||
|
||||
PHP_ARG_WITH(pdflib,whether to include PDFlib support,
|
||||
[ --with-pdflib[=DIR] Include PDFlib support. DIR is the pdflib
|
||||
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.])
|
||||
|
||||
if test "$PHP_PDFLIB" != "no"; then
|
||||
if test "$PHP_PDFLIB3" != "no"; then
|
||||
|
||||
PHP_SUBST(PDFLIB_SHARED_LIBADD)
|
||||
PHP_SUBST(PDFLIB3_SHARED_LIBADD)
|
||||
PHP_EXTENSION(pdf, $ext_shared)
|
||||
|
||||
case $PHP_PDFLIB in
|
||||
case $PHP_PDFLIB3 in
|
||||
yes)
|
||||
AC_CHECK_LIB(pdf, PDF_show_boxed, [
|
||||
AC_DEFINE(HAVE_PDFLIB,1,[ ])
|
||||
AC_DEFINE(HAVE_PDFLIB3,1,[ ])
|
||||
],[
|
||||
AC_MSG_ERROR([pdflib 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>])
|
||||
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
|
||||
])
|
||||
|
||||
PHP_ADD_LIBRARY(pdf,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(z,, PDFLIB_SHARED_LIBADD)
|
||||
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_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE=$PHP_PDFLIB/include
|
||||
if test -n "$PDFLIB_INCLUDE" ; then
|
||||
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
|
||||
|
||||
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB3_SHARED_LIBADD)
|
||||
|
||||
PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
|
||||
[ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory])
|
||||
[ --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, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB3_SHARED_LIBADD)
|
||||
],[
|
||||
AC_MSG_ERROR([libjpeg not found!])
|
||||
],[
|
||||
@ -54,7 +54,7 @@ if test "$PHP_PDFLIB" != "no"; then
|
||||
else
|
||||
AC_CHECK_LIB(jpeg,jpeg_read_header,
|
||||
[
|
||||
PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(jpeg,, PDFLIB3_SHARED_LIBADD)
|
||||
],[
|
||||
AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)
|
||||
])
|
||||
@ -62,12 +62,12 @@ if test "$PHP_PDFLIB" != "no"; then
|
||||
|
||||
|
||||
PHP_ARG_WITH(png-dir, for the location of libpng,
|
||||
[ --with-png-dir[=DIR] PDFLIB: define libpng install directory])
|
||||
[ --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, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB3_SHARED_LIBADD)
|
||||
],[
|
||||
AC_MSG_ERROR([libpng not found!])
|
||||
],[
|
||||
@ -76,7 +76,7 @@ if test "$PHP_PDFLIB" != "no"; then
|
||||
else
|
||||
AC_CHECK_LIB(png,png_create_info_struct,
|
||||
[
|
||||
PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(png,, PDFLIB3_SHARED_LIBADD)
|
||||
],[
|
||||
AC_MSG_RESULT(no, try --with-png-dir=<DIR>)
|
||||
])
|
||||
@ -84,12 +84,12 @@ if test "$PHP_PDFLIB" != "no"; then
|
||||
|
||||
|
||||
PHP_ARG_WITH(tiff-dir, for the location of libtiff,
|
||||
[ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory])
|
||||
[ --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, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB3_SHARED_LIBADD)
|
||||
],[
|
||||
AC_MSG_ERROR([libtiff not found!])
|
||||
],[
|
||||
@ -98,7 +98,7 @@ if test "$PHP_PDFLIB" != "no"; then
|
||||
else
|
||||
AC_CHECK_LIB(tiff,TIFFOpen,
|
||||
[
|
||||
PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(tiff,, PDFLIB3_SHARED_LIBADD)
|
||||
],[
|
||||
AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)
|
||||
])
|
||||
@ -107,15 +107,56 @@ if test "$PHP_PDFLIB" != "no"; 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)
|
||||
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([pdflib extension requires at least pdflib 3.x.])
|
||||
AC_MSG_ERROR([pdflib3 extension requires at least pdflib 3.x.])
|
||||
],[
|
||||
-L$PHP_PDFLIB/lib
|
||||
-L$PHP_PDFLIB3/lib
|
||||
])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
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
|
||||
case "$PHP_PDFLIB" in
|
||||
yes)
|
||||
PHP_EXTENSION(pdf, $ext_shared)
|
||||
AC_CHECK_LIB(pdf, PDF_open_pdi, [
|
||||
AC_DEFINE(HAVE_PDFLIB,1,[ ])
|
||||
],[
|
||||
AC_MSG_ERROR([PDFlib extension requires at least PDFlib 4.x. To build wit
|
||||
h PDFlib 3.x you should use --with-pdflib3.])
|
||||
])
|
||||
AC_SUBST(PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY(pdf, PDFLIB_SHARED_LIBADD)
|
||||
;;
|
||||
no)
|
||||
;;
|
||||
*)
|
||||
test -f $withval/include/pdflib.h && PDFLIB_INCLUDE="$withval/include"
|
||||
if test -n "$PDFLIB_INCLUDE" ; then
|
||||
PHP_EXTENSION(pdf, $ext_shared)
|
||||
old_LIBS=$LIBS
|
||||
LIBS="$LIBS -L$withval/lib"
|
||||
AC_CHECK_LIB(pdf, PDF_open_pdi, [
|
||||
AC_DEFINE(HAVE_PDFLIB,1,[ ])
|
||||
PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"
|
||||
],[
|
||||
AC_MSG_ERROR([PDFlib extension requires PDFlib 4.x.])
|
||||
])
|
||||
LIBS=$old_LIBS
|
||||
AC_SUBST(PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD)
|
||||
PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
|
||||
fi ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user