sniper Mon Dec 20 23:21:43 2004 EDT
Modified files:
/php-src/ext/cpdf config.m4
Log:
- Fixed bug #31145 (configure is using -lcpdf instead of -lcpdfm)
http://cvs.php.net/diff.php/php-src/ext/cpdf/config.m4?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/cpdf/config.m4
diff -u php-src/ext/cpdf/config.m4:1.21 php-src/ext/cpdf/config.m4:1.22
--- php-src/ext/cpdf/config.m4:1.21 Wed Nov 3 09:32:49 2004
+++ php-src/ext/cpdf/config.m4 Mon Dec 20 23:21:43 2004
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.21 2004/11/03 14:32:49 jorton Exp $
+dnl $Id: config.m4,v 1.22 2004/12/21 04:21:43 sniper Exp $
AC_DEFUN(CPDF_JPEG_TEST,[
AC_ARG_WITH(jpeg-dir,
@@ -58,14 +58,22 @@
CPDFLIB_INCLUDE=$i/include
PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
- PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
- PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
- AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
+ cpdf_libname=cpdf
], [
- AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
+ PHP_CHECK_LIBRARY(cpdfm, cpdf_open, [
+ cpdf_libname=cpdfm
+ ], [
+ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
+ ], [
+ -L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD
+ ])
], [
-L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD
])
+
+ PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/$PHP_LIBDIR,
CPDF_SHARED_LIBADD)
+ PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
+ AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
break
fi
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
