sniper Wed Nov 13 19:20:21 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pdf config.m4
Log:
Fixed bug: #20414, shared build did not work
Index: php4/ext/pdf/config.m4
diff -u php4/ext/pdf/config.m4:1.35 php4/ext/pdf/config.m4:1.35.2.1
--- php4/ext/pdf/config.m4:1.35 Sun Oct 20 22:46:13 2002
+++ php4/ext/pdf/config.m4 Wed Nov 13 19:20:21 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.35 2002/10/21 02:46:13 sniper Exp $
+dnl $Id: config.m4,v 1.35.2.1 2002/11/14 00:20:21 sniper Exp $
dnl
PHP_ARG_WITH(pdflib,for PDFlib support,
@@ -30,7 +30,7 @@
if test "$PHP_PDFLIB" != "no"; then
PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared)
- PHP_SUBST(PDFLIB_SHARED_LIBADD)
+ PHP_SUBST(PDF_SHARED_LIBADD)
dnl #
dnl # Optional libraries for PDFlib
@@ -40,7 +40,7 @@
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, PDF_SHARED_LIBADD)
],[
AC_MSG_ERROR([libjpeg not found!])
],[
@@ -54,7 +54,7 @@
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, PDF_SHARED_LIBADD)
],[
AC_MSG_ERROR([libpng not found!])
],[
@@ -68,7 +68,7 @@
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, PDF_SHARED_LIBADD)
],[
AC_MSG_ERROR([libtiff not found!])
],[
@@ -84,7 +84,7 @@
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)
+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD)
fi
dnl #
@@ -95,7 +95,7 @@
yes)
AC_CHECK_LIB(pdf, PDF_show_boxed, [
AC_DEFINE(HAVE_PDFLIB,1,[ ])
- PHP_ADD_LIBRARY(pdf,, PDFLIB_SHARED_LIBADD)
+ 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.
@@ -110,7 +110,7 @@
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_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD)
PHP_ADD_INCLUDE($PHP_PDFLIB/include)
],[
AC_MSG_ERROR([
@@ -119,7 +119,7 @@
See config.log for more information.
])
],[
- -L$PHP_PDFLIB/lib $PDFLIB_SHARED_LIBADD
+ -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.])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
