MFH: Always prefer user specified paths over the default /usr /usr/local.

diff --git a/ext/crack/config.m4 b/ext/crack/config.m4
index d88ccb14bf241c4bda74832b79b7ac759862e069..55757ab14c91faeb67cccfd3d4012bfd358873d1 100644 (file)
--- a/ext/crack/config.m4
+++ b/ext/crack/config.m4
@@ -7,11 +7,11 @@ PHP_ARG_WITH(crack, for CRACKlib support,
 
 if test "$PHP_CRACK" != "no"; then
 
-       for i in /usr/local/lib /usr/lib $PHP_CRACK/lib $PHP_CRACK/cracklib; do
+       for i in $PHP_CRACK/lib $PHP_CRACK/cracklib /usr/local/lib /usr/lib; do
                test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i
        done
 
-       for i in /usr/local/include /usr/include $PHP_CRACK/include $PHP_CRACK/cracklib; do
+       for i in $PHP_CRACK/include $PHP_CRACK/cracklib /usr/local/include /usr/include; do
                test -f $i/packer.h && CRACK_INCLUDEDIR=$i
        done
   

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 7057a203f540aac498db139e653b332676a87937..d5320959efba4681b01f809c3b95ae68995226a6 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -50,7 +50,7 @@ dnl
 AC_DEFUN(PHP_GD_JPEG,[
   if test "$PHP_JPEG_DIR" != "no"; then
 
-    for i in /usr /usr/local $PHP_JPEG_DIR; do
+    for i in $PHP_JPEG_DIR /usr /usr/local; do
       test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i
     done
 
@@ -75,7 +75,7 @@ AC_DEFUN(PHP_GD_JPEG,[
 AC_DEFUN(PHP_GD_PNG,[
   if test "$PHP_PNG_DIR" != "no"; then
 
-    for i in /usr /usr/local $PHP_PNG_DIR; do
+    for i in $PHP_PNG_DIR /usr /usr/local; do
       test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i
     done
 
@@ -110,7 +110,7 @@ AC_DEFUN(PHP_GD_PNG,[
 AC_DEFUN(PHP_GD_XPM,[
   if test "$PHP_XPM_DIR" != "no"; then
 
-    for i in /usr /usr/local /usr/X11R6 $PHP_XPM_DIR; do
+    for i in $PHP_XPM_DIR /usr /usr/local /usr/X11R6; do
       test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i
     done
 
@@ -145,7 +145,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
   if test "$PHP_TTF" != "no"; then
     if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
       if test -n "$PHP_TTF" ; then
-        for i in /usr /usr/local $PHP_TTF; do
+        for i in $PHP_TTF /usr /usr/local; do
           if test -f "$i/include/freetype.h" ; then
             TTF_DIR=$i
             unset TTF_INC_DIR
@@ -177,7 +177,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
 AC_DEFUN(PHP_GD_FREETYPE2,[
   if test "$PHP_FREETYPE_DIR" != "no"; then
 
-    for i in /usr /usr/local $PHP_FREETYPE_DIR; do
+    for i in $PHP_FREETYPE_DIR /usr /usr/local; do
       if test -f "$i/include/freetype2/freetype/freetype.h"; then
         FREETYPE2_DIR=$i
         FREETYPE2_INC_DIR=$i/include/freetype2
@@ -201,7 +201,7 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
 AC_DEFUN(PHP_GD_T1LIB,[
   if test "$PHP_T1LIB" != "no"; then
 
-    for i in /usr /usr/local $PHP_T1LIB; do
+    for i in $PHP_T1LIB /usr /usr/local; do
       test -f "$i/include/t1lib.h" && GD_T1_DIR=$i
     done
 

diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index f4a6fc34e97eaac7fcf8c991c20646d5adbcddc0..6cb1dd91c16d96d76610c54ad2cd44e5c166a2ba 100644 (file)
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -6,7 +6,7 @@ PHP_ARG_WITH(gettext,for GNU gettext support,
 [  --with-gettext[=DIR]    Include GNU gettext support.])
 
 if test "$PHP_GETTEXT" != "no"; then
-  for i in /usr /usr/local $PHP_GETTEXT; do
+  for i in $PHP_GETTEXT /usr /usr/local; do
     if test -r $i/include/libintl.h; then
          GETTEXT_DIR=$i
     fi

diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index f996ae978f7887aa77a72890a89dc7507e1a9e35..8548811bb7df2846f9e8abdef15c16f57e8d43a0 100644 (file)
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_WITH(gmp, for GNU MP support,
 
 if test "$PHP_GMP" != "no"; then
 
-  for i in /usr/local /usr $PHP_GMP; do
+  for i in $PHP_GMP /usr/local /usr; do
     if test -f $i/include/gmp.h; then
       GMP_DIR=$i
     fi

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index f992ab8ec3b0981c5c48ff092d9748658fb015ce..146ce8f3d72ea82b3a1c51c87a9b1c7bf28e418d 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -137,7 +137,7 @@ if test "$PHP_IMAP" != "no"; then
     PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
     AC_DEFINE(HAVE_IMAP,1,[ ])
 
-    for i in /usr/local /usr $PHP_IMAP; do
+    for i in $PHP_IMAP /usr/local /usr; do
       IMAP_INC_CHK()
       el[]IMAP_INC_CHK(/include/c-client)
       el[]IMAP_INC_CHK(/include/imap)

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 042833fd554846266416f5fb20838887881340cd..c8604411ebcf5b8cd44dd90eaf669e7ca24d01cb 100644 (file)
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -6,7 +6,7 @@ PHP_ARG_WITH(mcrypt, for mcrypt support,
 [  --with-mcrypt[=DIR]     Include mcrypt support.])
 
 if test "$PHP_MCRYPT" != "no"; then
-  for i in /usr/local /usr $PHP_MCRYPT; do
+  for i in $PHP_MCRYPT /usr/local /usr; do
     if test -f $i/include/mcrypt.h; then
       MCRYPT_DIR=$i
     fi

diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index e53bd28f612773659a99dceb7c57fe4c88c03388..da7286e49fc296a8caab251907d36a9a08314fb8 100644 (file)
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -6,7 +6,7 @@ PHP_ARG_WITH(mhash, for mhash support,
 [  --with-mhash[=DIR]      Include mhash support.])
 
 if test "$PHP_MHASH" != "no"; then
-  for i in /usr/local /usr /opt/mhash $PHP_MHASH; do
+  for i in $PHP_MHASH /usr/local /usr /opt/mhash; do
     if test -f $i/include/mhash.h; then
       MHASH_DIR=$i
     fi

diff --git a/ext/ovrimos/config.m4 b/ext/ovrimos/config.m4
index b424664fb243121bbf708050c4cb5f958201e05c..19482f39cbdcd2591d0dfc7dc767c8051eebff20 100644 (file)
--- a/ext/ovrimos/config.m4
+++ b/ext/ovrimos/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_WITH(ovrimos, for Ovrimos SQL Server support,
                           Ovrimos libsqlcli install directory.])
 
 if test "$PHP_OVRIMOS" != "no"; then
-  for i in /usr/local /usr $PHP_OVRIMOS; do
+  for i in $PHP_OVRIMOS /usr/local /usr; do
     if test -f $i/include/sqlcli.h; then
       OVRIMOS_DIR=$i
     fi

diff --git a/ext/pfpro/config.m4 b/ext/pfpro/config.m4
index 63fc634c424eb9a2ddf3e72d51d34589b601102a..17424aae10c08f9e8366f1ca3b5a26e662f48f32 100644 (file)
--- a/ext/pfpro/config.m4
+++ b/ext/pfpro/config.m4
@@ -9,7 +9,7 @@ if test "$PHP_PFPRO" != "no"; then
   PFPRO_LIB=libpfpro.so
   PFPRO_HDR=pfpro.h
 
-  for i in /usr/local /usr $PHP_PFPRO; do
+  for i in $PHP_PFPRO /usr/local /usr; do
     if test -r $i/$PFPRO_HDR; then
       PFPRO_INC_DIR=$i
     elif test -r $i/include/$PFPRO_HDR; then

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index a22c09dee7b6b2c535d41313c5abe456627476bf..e5c2a057a0395b095d294de5dc861c55cdb2365a 100644 (file)
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_WITH(readline,for readline support,
 [  --with-readline[=DIR]   Include readline support (CLI/CGI only).])
 
 if test "$PHP_READLINE" != "no"; then
-  for i in /usr/local /usr $PHP_READLINE; do
+  for i in $PHP_READLINE /usr/local /usr; do
     if test -f $i/include/readline/readline.h; then
       READLINE_DIR=$i
     fi
@@ -56,7 +56,7 @@ if test "$PHP_READLINE" != "no"; then
 
 elif test "$PHP_LIBEDIT" != "no"; then
 
-  for i in /usr/local /usr $PHP_LIBEDIT; do
+  for i in $PHP_LIBEDIT /usr/local /usr; do
     if test -f $i/include/readline/readline.h; then
       LIBEDIT_DIR=$i
     fi

diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 4e5a4ddd2c1ee66b1397376e9577af88330145dc..9be3040d076c193eeb075b72637e38d1ef34197a 100644 (file)
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -17,7 +17,7 @@ if test "$PHP_SESSION" != "no"; then
 fi
 
 if test "$PHP_MM" != "no"; then
-  for i in /usr/local /usr $PHP_MM; do
+  for i in $PHP_MM /usr/local /usr; do
     if test -f "$i/include/mm.h"; then
       MM_DIR=$i
     fi

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 712e2404708ec034b21f53e624ccc683b56d2c3f..e81d5bc5250c1f502f26eecb4cdb6db71c23da85 100644 (file)
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -22,7 +22,7 @@ if test "$PHP_XMLRPC" != "no"; then
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
   testval=no
-  for i in /usr /usr/local $PHP_EXPAT_DIR $XMLRPC_DIR; do
+  for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr /usr/local; do
     if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
       AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
       PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)

diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4
index bb1f96a6e1ee51bb8c1a885e5b9599bb1328ebe5..721408bb57ddaf61e7182c712083d190b17df69e 100644 (file)
--- a/ext/xslt/config.m4
+++ b/ext/xslt/config.m4
@@ -123,7 +123,7 @@ int main ()
     ])
      
     if test "$PHP_SABLOT_JS" != "no"; then
-      for i in /usr/local /usr $PHP_SABLOT_JS; do
+      for i in $PHP_SABLOT_JS /usr/local /usr; do
         if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then
           PHP_SABLOT_JS_DIR=$i
         fi