This changes the default directory of the lib, so I don't think it's suitable for a bugfix-only branch. Anyway, noone complained about this problem (except myself), although it has been around forever.

Nuno

----- Original Message -----
And PHP_5_2 ..?


Nuno Lopes kirjoitti:
nlopess Sat May 23 13:52:53 2009 UTC

  Modified files:              /php-src/ext/pdo_firebird config.m4 Log:
MFB: fix compilation of pdo_firebird and intl extension with ld --as-needed

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.11 php-src/ext/pdo_firebird/config.m4:1.12
--- php-src/ext/pdo_firebird/config.m4:1.11 Fri Jul 25 13:38:40 2008
+++ php-src/ext/pdo_firebird/config.m4 Sat May 23 13:52:53 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.11 2008/07/25 13:38:40 jani Exp $
+dnl $Id: config.m4,v 1.12 2009/05/23 13:52:53 nlopess Exp $
 dnl
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
@@ -13,11 +13,13 @@
   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 @@
       ], [
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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to