]> granicus.if.org Git - php/commitdiff
fix compilation of pdo_firebird and intl extension with ld --as-needed
authorNuno Lopes <nlopess@php.net>
Sat, 23 May 2009 13:52:00 +0000 (13:52 +0000)
committerNuno Lopes <nlopess@php.net>
Sat, 23 May 2009 13:52:00 +0000 (13:52 +0000)
ext/pdo_firebird/config.m4

index 42cc4fc5a1335adefed9bc1f09e53699800f8730..94704d3adb192a826912a7d15b7d86eccc59eb62 100644 (file)
@@ -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