From: Nuno Lopes <nlopess@php.net>
Date: Sat, 23 May 2009 13:52:00 +0000 (+0000)
Subject: fix compilation of pdo_firebird and intl extension with ld --as-needed
X-Git-Tag: php-5.3.0RC3~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79a9229772949b6edf0c171c76cda0c1bd81a855;p=php

fix compilation of pdo_firebird and intl extension with ld --as-needed
---

diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
index 42cc4fc5a1..94704d3adb 100644
--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@ -13,11 +13,13 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
   fi
 
   if test "$PHP_PDO_FIREBIRD" = "yes"; then
-    FIREBIRD_INCDIR=/opt/firebird/include
-    FIREBIRD_LIBDIR=/opt/firebird/lib
+    FIREBIRD_INCDIR=
+    FIREBIRD_LIBDIR=
+    FIREBIRD_LIBDIR_FLAG=
   else
     FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
     FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
+    FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
   fi
 
   PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
@@ -34,13 +36,13 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
       ], [
         AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check config.log for more information.])
       ], [
-        -L$FIREBIRD_LIBDIR
+        $FIREBIRD_LIBDIR_FLAG
       ])
     ], [
-      -L$FIREBIRD_LIBDIR
+      $FIREBIRD_LIBDIR_FLAG
     ])
   ], [
-    -L$FIREBIRD_LIBDIR
+    $FIREBIRD_LIBDIR_FLAG
   ])
  
   PHP_CHECK_PDO_INCLUDES