- Fixed bug #31145 (configure is using -lcpdf instead of -lcpdfm)

diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 40d024e64d8515c14818ff9350c6611cd32b9e0f..b432f6b1470f890262111131c6f8037806eb9bbc 100644 (file)
--- 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