From: Jani Taskinen <jani@php.net>
Date: Tue, 31 Jul 2007 13:02:00 +0000 (+0000)
Subject: MFH: Fix some lib vs $PHP_LIBDIR issues
X-Git-Tag: php-5.2.4RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8af7bc20448bfd005c02d10f736c4dd84e69872d;p=php

MFH: Fix some lib vs $PHP_LIBDIR issues
---

diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index f7265c2bf4..603145ad6c 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -12,7 +12,7 @@ if test "$PHP_INTERBASE" != "no"; then
     IBASE_LIBDIR=/usr/interbase/lib
   else
     IBASE_INCDIR=$PHP_INTERBASE/include
-    IBASE_LIBDIR=$PHP_INTERBASE/lib
+    IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR
   fi
 
   PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 95223cc336..5be3288f30 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -136,7 +136,7 @@ PHP_ARG_WITH(sapdb,,
       PHP_SAPDB=/usr/local
     fi
     PHP_ADD_INCLUDE($PHP_SAPDB/incl)
-    PHP_ADD_LIBPATH($PHP_SAPDB/lib)
+    PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR)
     PHP_ADD_LIBRARY(sqlod)
     ODBC_TYPE=sapdb
     AC_DEFINE(HAVE_SAPDB,1,[ ])
@@ -373,7 +373,7 @@ PHP_ARG_WITH(iodbc,,
     if test "$PHP_IODBC" = "yes"; then
       PHP_IODBC=/usr/local
     fi
-    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/lib)
+    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
     PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
     ODBC_TYPE=iodbc
     ODBC_INCLUDE=-I$PHP_IODBC/include
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
index 80f24c4da6..0df50f9611 100644
--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@ -14,7 +14,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
     FIREBIRD_LIBDIR=/opt/firebird/lib
   else
     FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
-    FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib
+    FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
   fi
 
   PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index e76b6659e2..0a74e0c9be 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -78,10 +78,10 @@ if test "$PHP_PDO_MYSQL" != "no"; then
     else
       PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
     fi
-    if test -r $PDO_MYSQL_DIR/lib/mysql; then
-      PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib/mysql
+    if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
+      PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
     else
-      PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib
+      PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
     fi
 
     if test -r "$PDO_MYSQL_LIB_DIR"; then
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index ef6c5ebe84..3abaf1306a 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -43,7 +43,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
         fi
       done
 
-      for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
+      for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
         if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
           PGSQL_LIBDIR=$i/$j
         fi
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 890c3b5f73..d24d54b122 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -48,8 +48,8 @@ if test "$PHP_SNMP" != "no"; then
         test -f $i/snmp/snmp.h                  && SNMP_INCDIR=$i/snmp
         test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
       done
-      for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
-        test -f $i/lib/libsnmp.a || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
+      for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do
+        test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
       done
     else
       SNMP_INCDIR=$PHP_SNMP/include