iliaa Tue Sep 30 18:36:44 2003 EDT
Modified files:
/php-src/ext/gd config.m4
/php-src/ext/gmp config.m4
/php-src/ext/imap config.m4
/php-src/ext/crack config.m4
/php-src/ext/mhash config.m4
/php-src/ext/pfpro config.m4
/php-src/ext/session config.m4
/php-src/ext/mcrypt config.m4
/php-src/ext/xmlrpc config.m4
/php-src/ext/ovrimos config.m4
/php-src/ext/readline config.m4
/php-src/ext/gettext config.m4
Log:
Always prefer user specified paths over the default /usr /usr/local.
This may fix compilation problems with on systems with multiple copies of
the same library.
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.139 php-src/ext/gd/config.m4:1.140
--- php-src/ext/gd/config.m4:1.139 Sat Sep 27 16:53:50 2003
+++ php-src/ext/gd/config.m4 Tue Sep 30 18:36:33 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.139 2003/09/27 20:53:50 sniper Exp $
+dnl $Id: config.m4,v 1.140 2003/09/30 22:36:33 iliaa Exp $
dnl
dnl
@@ -50,7 +50,7 @@
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_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_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 @@
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
@@ -178,7 +178,7 @@
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
@@ -202,7 +202,7 @@
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
Index: php-src/ext/gmp/config.m4
diff -u php-src/ext/gmp/config.m4:1.7 php-src/ext/gmp/config.m4:1.8
--- php-src/ext/gmp/config.m4:1.7 Thu Jun 20 20:15:48 2002
+++ php-src/ext/gmp/config.m4 Tue Sep 30 18:36:34 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.7 2002/06/21 00:15:48 sniper Exp $
+dnl $Id: config.m4,v 1.8 2003/09/30 22:36:34 iliaa Exp $
dnl
PHP_ARG_WITH(gmp, for GNU MP support,
@@ -7,7 +7,7 @@
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
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.57 php-src/ext/imap/config.m4:1.58
--- php-src/ext/imap/config.m4:1.57 Sat May 10 13:14:47 2003
+++ php-src/ext/imap/config.m4 Tue Sep 30 18:36:35 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.57 2003/05/10 17:14:47 rasmus Exp $
+dnl $Id: config.m4,v 1.58 2003/09/30 22:36:35 iliaa Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -137,7 +137,7 @@
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)
Index: php-src/ext/crack/config.m4
diff -u php-src/ext/crack/config.m4:1.8 php-src/ext/crack/config.m4:1.9
--- php-src/ext/crack/config.m4:1.8 Tue Mar 12 11:11:33 2002
+++ php-src/ext/crack/config.m4 Tue Sep 30 18:36:35 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8 2002/03/12 16:11:33 sas Exp $
+dnl $Id: config.m4,v 1.9 2003/09/30 22:36:35 iliaa Exp $
dnl
PHP_ARG_WITH(crack, for CRACKlib support,
@@ -7,11 +7,11 @@
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
Index: php-src/ext/mhash/config.m4
diff -u php-src/ext/mhash/config.m4:1.12 php-src/ext/mhash/config.m4:1.13
--- php-src/ext/mhash/config.m4:1.12 Tue Mar 12 11:24:28 2002
+++ php-src/ext/mhash/config.m4 Tue Sep 30 18:36:36 2003
@@ -1,12 +1,12 @@
dnl
-dnl $Id: config.m4,v 1.12 2002/03/12 16:24:28 sas Exp $
+dnl $Id: config.m4,v 1.13 2003/09/30 22:36:36 iliaa Exp $
dnl
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
Index: php-src/ext/pfpro/config.m4
diff -u php-src/ext/pfpro/config.m4:1.9 php-src/ext/pfpro/config.m4:1.10
--- php-src/ext/pfpro/config.m4:1.9 Wed Oct 9 20:24:25 2002
+++ php-src/ext/pfpro/config.m4 Tue Sep 30 18:36:37 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9 2002/10/10 00:24:25 sniper Exp $
+dnl $Id: config.m4,v 1.10 2003/09/30 22:36:37 iliaa Exp $
dnl
PHP_ARG_WITH(pfpro, for Verisign Payflow Pro support,
@@ -9,7 +9,7 @@
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
Index: php-src/ext/session/config.m4
diff -u php-src/ext/session/config.m4:1.23 php-src/ext/session/config.m4:1.24
--- php-src/ext/session/config.m4:1.23 Wed Oct 2 02:05:16 2002
+++ php-src/ext/session/config.m4 Tue Sep 30 18:36:38 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.23 2002/10/02 06:05:16 sas Exp $
+dnl $Id: config.m4,v 1.24 2003/09/30 22:36:38 iliaa Exp $
dnl
PHP_ARG_ENABLE(session, whether to enable PHP sessions,
@@ -17,7 +17,7 @@
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
Index: php-src/ext/mcrypt/config.m4
diff -u php-src/ext/mcrypt/config.m4:1.26 php-src/ext/mcrypt/config.m4:1.27
--- php-src/ext/mcrypt/config.m4:1.26 Fri Jan 31 18:01:36 2003
+++ php-src/ext/mcrypt/config.m4 Tue Sep 30 18:36:39 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2003/01/31 23:01:36 msopacua Exp $
+dnl $Id: config.m4,v 1.27 2003/09/30 22:36:39 iliaa Exp $
dnl
AC_DEFUN(PHP_MCRYPT_CHECK_VERSION,[
@@ -24,7 +24,7 @@
[ --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
Index: php-src/ext/xmlrpc/config.m4
diff -u php-src/ext/xmlrpc/config.m4:1.19 php-src/ext/xmlrpc/config.m4:1.20
--- php-src/ext/xmlrpc/config.m4:1.19 Mon May 19 11:33:19 2003
+++ php-src/ext/xmlrpc/config.m4 Tue Sep 30 18:36:40 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.19 2003/05/19 15:33:19 sniper Exp $
+dnl $Id: config.m4,v 1.20 2003/09/30 22:36:40 iliaa Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -22,7 +22,7 @@
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)
Index: php-src/ext/ovrimos/config.m4
diff -u php-src/ext/ovrimos/config.m4:1.4 php-src/ext/ovrimos/config.m4:1.5
--- php-src/ext/ovrimos/config.m4:1.4 Tue Mar 12 11:28:38 2002
+++ php-src/ext/ovrimos/config.m4 Tue Sep 30 18:36:41 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.4 2002/03/12 16:28:38 sas Exp $
+dnl $Id: config.m4,v 1.5 2003/09/30 22:36:41 iliaa Exp $
dnl
PHP_ARG_WITH(ovrimos, for Ovrimos SQL Server support,
@@ -7,7 +7,7 @@
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
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.18 php-src/ext/readline/config.m4:1.19
--- php-src/ext/readline/config.m4:1.18 Mon Feb 10 22:24:30 2003
+++ php-src/ext/readline/config.m4 Tue Sep 30 18:36:42 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.18 2003/02/11 03:24:30 sniper Exp $
+dnl $Id: config.m4,v 1.19 2003/09/30 22:36:42 iliaa Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -9,7 +9,7 @@
[ --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 @@
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
Index: php-src/ext/gettext/config.m4
diff -u php-src/ext/gettext/config.m4:1.11 php-src/ext/gettext/config.m4:1.12
--- php-src/ext/gettext/config.m4:1.11 Tue Mar 12 11:19:14 2002
+++ php-src/ext/gettext/config.m4 Tue Sep 30 18:36:43 2003
@@ -1,12 +1,12 @@
dnl
-dnl $Id: config.m4,v 1.11 2002/03/12 16:19:14 sas Exp $
+dnl $Id: config.m4,v 1.12 2003/09/30 22:36:43 iliaa Exp $
dnl
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
