From: foobar <sniper@php.net>
Date: Tue, 21 Dec 2004 04:21:43 +0000 (+0000)
Subject: - Fixed bug #31145 (configure is using -lcpdf instead of -lcpdfm)
X-Git-Tag: RELEASE_0_2~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8056095c65fc93ec640bed81130071f78e936d1;p=php

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

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