diff options
| author | foobar <sniper@php.net> | 2001-05-20 23:00:44 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-05-20 23:00:44 +0000 |
| commit | 4e545c1d736521dc07bb9e22906f88b3f538a97d (patch) | |
| tree | 40c003f71635a381236005bd8e0069e2e047bc0a /ext/pdf | |
| parent | ae503d3a142c18a3f9734c3c9b55470796ba0b3a (diff) | |
| download | php-git-4e545c1d736521dc07bb9e22906f88b3f538a97d.tar.gz | |
A few modifications to make the ZLIB checks work better.
Diffstat (limited to 'ext/pdf')
| -rw-r--r-- | ext/pdf/config.m4 | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4 index ebf13b6afc..b73e896219 100644 --- a/ext/pdf/config.m4 +++ b/ext/pdf/config.m4 @@ -33,26 +33,16 @@ if test "$PHP_PDFLIB" != "no"; then test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE=$PHP_PDFLIB/include if test -n "$PDFLIB_INCLUDE" ; then - if test "$PHP_ZLIB" = "no"; then - AC_MSG_CHECKING([for zlib (needed by pdflib)]) - - AC_CHECK_LIB(z,deflate, - [ - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) - ],[ - AC_MSG_ERROR(libz.(a|so) not found! Try with --with-zlib-dir=<DIR>) - ],[ - -L$PHP_ZLIB_DIR/lib - ]) - else - echo "checking for libz needed by pdflib... already zlib support" + 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_ARG_WITH(jpeg-dir, for the location of libjpeg, [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory]) - if test "$PHP_JPEG_DIR" != "no" -a "$PHP_JPEG_DIR"; then + if test "$PHP_JPEG_DIR" != "no"; then AC_CHECK_LIB(jpeg,jpeg_read_header, [ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) @@ -62,15 +52,19 @@ if test "$PHP_PDFLIB" != "no"; then -L$PHP_JPEG_DIR/lib ]) else - AC_CHECK_LIB(jpeg,jpeg_read_header,[ ],[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)]) - PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) + AC_CHECK_LIB(jpeg,jpeg_read_header, + [ + PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>) + ]) fi PHP_ARG_WITH(png-dir, for the location of libpng, [ --with-png-dir[=DIR] PDFLIB: define libpng install directory]) - if test "$PHP_PNG_DIR" != "no" -a "$PHP_PNG_DIR"; then + if test "$PHP_PNG_DIR" != "no"; then AC_CHECK_LIB(png,png_create_info_struct, [ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) @@ -80,15 +74,19 @@ if test "$PHP_PDFLIB" != "no"; then -L$PHP_PNG_DIR/lib ]) else - AC_CHECK_LIB(png,png_create_info_struct,[ ],[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)]) - PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD) + AC_CHECK_LIB(png,png_create_info_struct, + [ + PHP_ADD_LIBRARY(png,, PDFLIB_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] PDFLIB: define libtiff install directory]) - if test "$PHP_TIFF_DIR" != "no" -a "$PHP_TIFF_DIR"; then + if test "$PHP_TIFF_DIR" != "no"; then AC_CHECK_LIB(tiff,TIFFOpen, [ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) @@ -98,8 +96,12 @@ if test "$PHP_PDFLIB" != "no"; then -L$PHP_TIFF_DIR/lib ]) else - AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)],) - PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) + AC_CHECK_LIB(tiff,TIFFOpen, + [ + PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>) + ]) fi |