cvs commit
| From: | steinm | Date: | Mon, 05 Jul 1999 11:14:51 +0000 |
| Subject: | cvs commit | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-8100@lists.php.net to get a copy of this message | ||
From: steinm
Date: Mon Jul 5 11:14:51 1999
Modified files:
php3/configure.in
Log message:
- hopefully less problems with pdflib 2.0 configuration
Index: php3/configure.in
diff -u php3/configure.in:1.431 php3/configure.in:1.432
--- php3/configure.in:1.431 Sat Jul 3 12:10:45 1999
+++ php3/configure.in Mon Jul 5 11:14:50 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.431 1999/07/03 16:10:45 sas Exp $
+dnl $Id: configure.in,v 1.432 1999/07/05 15:14:50 steinm Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -1895,6 +1895,21 @@
PDFLIB_LIBS="$ZLIB_LIBS"
LIBS="$LIBS $ZLIB_LIBS"
fi
+
+ AC_MSG_CHECKING(for libjpeg needed by pdflib 2.0)
+ AC_ARG_WITH(jpeg-dir,
+ [ --with-jpeg-dir=DIR jpeg dir],[
+ AC_MSG_RESULT(yes)
+ if test -z $withval; then
+ withval="/usr/local"
+ fi
+ LIBS="$LIBS -L$withval/lib -ljpeg"
+ AC_CHECK_LIB(jpeg,jpeg_read_header, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib
-ljpeg"],[AC_MSG_RESULT(no)],)
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ withval=$old_withval
+
AC_MSG_CHECKING(for libtiff needed by pdflib 2.0)
AC_ARG_WITH(tiff-dir,
[ --with-tiff-dir=DIR tiff dir],[
@@ -1902,8 +1917,8 @@
if test -z $withval; then
withval="/usr/local"
fi
- LIBS="$LIBS -L$withval/lib -ltiff -ljpeg -lgz"
- AC_CHECK_LIB(tiff,TIFFOpen, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ltiff
-ljpeg -lgz"],[AC_MSG_RESULT(no)],)
+ LIBS="$LIBS -L$withval/lib -ltiff"
+ AC_CHECK_LIB(tiff,TIFFOpen, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib
-ltiff"],[AC_MSG_RESULT(no)],)
],[
AC_MSG_RESULT(no)
])
@@ -1911,7 +1926,8 @@
LIBS="$LIBS -L$withval/lib"
AC_CHECK_LIB(pdf, PDF_new, [AC_DEFINE(HAVE_PDFLIB) AC_DEFINE(HAVE_PDFLIB2)
PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
- [AC_MSG_ERROR(pdflib module require at least pdflib 0.6.)])
+ [AC_MSG_ERROR(Check if zlib libjpeg, libtiff has been found.
+If not specify --with-zlib-dir and --with-tiff-dir.)])
LIBS=$old_LIBS
else
AC_MSG_RESULT(no)