summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2004-12-21 04:21:43 +0000
committerfoobar <sniper@php.net>2004-12-21 04:21:43 +0000
commitb8056095c65fc93ec640bed81130071f78e936d1 (patch)
tree2404e3ae0183c310d97b138d3319a1fdc8f2aed0
parent61bf7a23ce184246b520fd5c6544cab950736776 (diff)
downloadphp-git-b8056095c65fc93ec640bed81130071f78e936d1.tar.gz
- Fixed bug #31145 (configure is using -lcpdf instead of -lcpdfm)
-rw-r--r--ext/cpdf/config.m416
1 files changed, 12 insertions, 4 deletions
diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 40d024e64d..b432f6b147 100644
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -58,14 +58,22 @@ if test "$PHP_CPDFLIB" != "no"; then
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