sniper Tue Sep 30 22:53:16 2003 EDT
Modified files:
/php-src/ext/cpdf config.m4
/php-src/ext/crack config.m4
/php-src/ext/fbsql config.m4
/php-src/ext/fdf config.m4
/php-src/ext/gd config.m4
/php-src/ext/gettext config.m4
/php-src/ext/gmp config.m4
/php-src/ext/imap config.m4
/php-src/ext/mcrypt config.m4
/php-src/ext/mhash config.m4
/php-src/ext/ovrimos config.m4
/php-src/ext/pfpro config.m4
/php-src/ext/readline config.m4
/php-src/ext/recode config.m4
/php-src/ext/session config.m4
/php-src/ext/xmlrpc config.m4
Log:
- Always look into /usr/local before /usr
- Added breaks to make sure the preferred value is used.
Index: php-src/ext/cpdf/config.m4
diff -u php-src/ext/cpdf/config.m4:1.16 php-src/ext/cpdf/config.m4:1.17
--- php-src/ext/cpdf/config.m4:1.16 Thu Sep 11 11:25:45 2003
+++ php-src/ext/cpdf/config.m4 Tue Sep 30 22:53:02 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.16 2003/09/11 15:25:45 sniper Exp $
+dnl $Id: config.m4,v 1.17 2003/10/01 02:53:02 sniper Exp $
AC_DEFUN(CPDF_JPEG_TEST,[
AC_ARG_WITH(jpeg-dir,
@@ -58,7 +58,7 @@
CPDF_JPEG_TEST
CPDF_TIFF_TEST
- for i in $cpdf_withval /usr /usr/local; do
+ for i in $cpdf_withval /usr/local /usr; do
if test -f "$i/include/cpdflib.h"; then
CPDFLIB_INCLUDE=$i/include
AC_MSG_CHECKING(for cpdflib.h)
Index: php-src/ext/crack/config.m4
diff -u php-src/ext/crack/config.m4:1.9 php-src/ext/crack/config.m4:1.10
--- php-src/ext/crack/config.m4:1.9 Tue Sep 30 18:36:35 2003
+++ php-src/ext/crack/config.m4 Tue Sep 30 22:53:03 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9 2003/09/30 22:36:35 iliaa Exp $
+dnl $Id: config.m4,v 1.10 2003/10/01 02:53:03 sniper Exp $
dnl
PHP_ARG_WITH(crack, for CRACKlib support,
@@ -7,27 +7,26 @@
if test "$PHP_CRACK" != "no"; then
- 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 $PHP_CRACK/include $PHP_CRACK/cracklib /usr/local/include
/usr/include; do
- test -f $i/packer.h && CRACK_INCLUDEDIR=$i
- done
+ 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 &&
break
+ done
+
+ if test -z "$CRACK_LIBDIR"; then
+ AC_MSG_ERROR(Cannot find the cracklib library file)
+ fi
+
+ for i in $PHP_CRACK/include $PHP_CRACK/cracklib /usr/local/include /usr/include; do
+ test -f $i/packer.h && CRACK_INCLUDEDIR=$i && break
+ done
- if test -z "$CRACK_LIBDIR"; then
- AC_MSG_ERROR(Cannot find the cracklib library file)
- fi
-
- if test -z "$CRACK_INCLUDEDIR"; then
- AC_MSG_ERROR(Cannot find a cracklib header file)
- fi
-
- PHP_ADD_INCLUDE($CRACK_INCLUDEDIR)
- PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD)
-
- PHP_NEW_EXTENSION(crack, crack.c, $ext_shared)
- PHP_SUBST(CRACK_SHARED_LIBADD)
- AC_DEFINE(HAVE_CRACK, 1, [ ])
+ if test -z "$CRACK_INCLUDEDIR"; then
+ AC_MSG_ERROR(Cannot find a cracklib header file)
+ fi
+
+ PHP_ADD_INCLUDE($CRACK_INCLUDEDIR)
+ PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD)
+
+ PHP_NEW_EXTENSION(crack, crack.c, $ext_shared)
+ PHP_SUBST(CRACK_SHARED_LIBADD)
+ AC_DEFINE(HAVE_CRACK, 1, [ ])
fi
-
Index: php-src/ext/fbsql/config.m4
diff -u php-src/ext/fbsql/config.m4:1.12 php-src/ext/fbsql/config.m4:1.13
--- php-src/ext/fbsql/config.m4:1.12 Mon Oct 7 07:08:11 2002
+++ php-src/ext/fbsql/config.m4 Tue Sep 30 22:53:04 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.12 2002/10/07 11:08:11 sniper Exp $
+dnl $Id: config.m4,v 1.13 2003/10/01 02:53:04 sniper Exp $
dnl
PHP_ARG_WITH(fbsql, for FrontBase SQL92 (fbsql) support,
@@ -13,7 +13,7 @@
FBSQL_INSTALLATION_DIR=""
if test "$PHP_FBSQL" = "yes"; then
- for i in /Local/Library /usr /usr/local /opt /Library /usr/lib; do
+ for i in /Local/Library /usr/local /usr /opt /Library /usr/lib; do
if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h; then
FBSQL_INSTALLATION_DIR=$i/FrontBase
break
Index: php-src/ext/fdf/config.m4
diff -u php-src/ext/fdf/config.m4:1.23 php-src/ext/fdf/config.m4:1.24
--- php-src/ext/fdf/config.m4:1.23 Tue Aug 5 07:17:01 2003
+++ php-src/ext/fdf/config.m4 Tue Sep 30 22:53:05 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.23 2003/08/05 11:17:01 sniper Exp $
+dnl $Id: config.m4,v 1.24 2003/10/01 02:53:05 sniper Exp $
dnl
PHP_ARG_WITH(fdftk, for FDF support,
@@ -23,7 +23,7 @@
esac
if test "$PHP_FDFTK" = "yes"; then
- PHP_FDFTK="/usr /usr/local ../FDFToolkitForUNIX ext/fdf/FDFToolkitForUNIX
../fdftk ext/fdf/fdftk"
+ PHP_FDFTK="/usr/local /usr ../FDFToolkitForUNIX ext/fdf/FDFToolkitForUNIX
../fdftk ext/fdf/fdftk"
fi
for dir in $PHP_FDFTK; do
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.140 php-src/ext/gd/config.m4:1.141
--- php-src/ext/gd/config.m4:1.140 Tue Sep 30 18:36:33 2003
+++ php-src/ext/gd/config.m4 Tue Sep 30 22:53:06 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.140 2003/09/30 22:36:33 iliaa Exp $
+dnl $Id: config.m4,v 1.141 2003/10/01 02:53:06 sniper Exp $
dnl
dnl
@@ -50,8 +50,8 @@
AC_DEFUN(PHP_GD_JPEG,[
if test "$PHP_JPEG_DIR" != "no"; then
- 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
+ for i in $PHP_JPEG_DIR /usr/local /usr; do
+ test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a &&
GD_JPEG_DIR=$i && break
done
if test -z "$GD_JPEG_DIR"; then
@@ -75,8 +75,8 @@
AC_DEFUN(PHP_GD_PNG,[
if test "$PHP_PNG_DIR" != "no"; then
- 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
+ for i in $PHP_PNG_DIR /usr/local /usr; do
+ test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i
&& break
done
if test -z "$GD_PNG_DIR"; then
@@ -110,8 +110,8 @@
AC_DEFUN(PHP_GD_XPM,[
if test "$PHP_XPM_DIR" != "no"; then
- 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
+ for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
+ test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i
&& break
done
if test -z "$GD_XPM_DIR"; then
@@ -144,9 +144,9 @@
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 $PHP_TTF /usr /usr/local; do
- if test -f "$i/include/freetype.h" ; then
+ if test -n "$PHP_TTF"; then
+ for i in $PHP_TTF /usr/local /usr; do
+ if test -f "$i/include/freetype.h"; then
TTF_DIR=$i
unset TTF_INC_DIR
fi
@@ -158,6 +158,7 @@
TTF_DIR=$i
TTF_INC_DIR=$i/include/freetype1/freetype
fi
+ test -n "$TTF_DIR" && break
done
fi
if test -n "$TTF_DIR" ; then
@@ -178,10 +179,11 @@
AC_DEFUN(PHP_GD_FREETYPE2,[
if test "$PHP_FREETYPE_DIR" != "no"; then
- for i in $PHP_FREETYPE_DIR /usr /usr/local; do
+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
if test -f "$i/include/freetype2/freetype/freetype.h"; then
FREETYPE2_DIR=$i
FREETYPE2_INC_DIR=$i/include/freetype2
+ break
fi
done
@@ -202,8 +204,8 @@
AC_DEFUN(PHP_GD_T1LIB,[
if test "$PHP_T1LIB" != "no"; then
- for i in $PHP_T1LIB /usr /usr/local; do
- test -f "$i/include/t1lib.h" && GD_T1_DIR=$i
+ for i in $PHP_T1LIB /usr/local /usr; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
done
if test -z "$GD_T1_DIR"; then
Index: php-src/ext/gettext/config.m4
diff -u php-src/ext/gettext/config.m4:1.12 php-src/ext/gettext/config.m4:1.13
--- php-src/ext/gettext/config.m4:1.12 Tue Sep 30 18:36:43 2003
+++ php-src/ext/gettext/config.m4 Tue Sep 30 22:53:07 2003
@@ -1,15 +1,13 @@
dnl
-dnl $Id: config.m4,v 1.12 2003/09/30 22:36:43 iliaa Exp $
+dnl $Id: config.m4,v 1.13 2003/10/01 02:53:07 sniper 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 $PHP_GETTEXT /usr /usr/local; do
- if test -r $i/include/libintl.h; then
- GETTEXT_DIR=$i
- fi
+ for i in $PHP_GETTEXT /usr/local /usr; do
+ test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
done
if test -z "$GETTEXT_DIR"; then
Index: php-src/ext/gmp/config.m4
diff -u php-src/ext/gmp/config.m4:1.8 php-src/ext/gmp/config.m4:1.9
--- php-src/ext/gmp/config.m4:1.8 Tue Sep 30 18:36:34 2003
+++ php-src/ext/gmp/config.m4 Tue Sep 30 22:53:08 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8 2003/09/30 22:36:34 iliaa Exp $
+dnl $Id: config.m4,v 1.9 2003/10/01 02:53:08 sniper Exp $
dnl
PHP_ARG_WITH(gmp, for GNU MP support,
@@ -8,18 +8,17 @@
if test "$PHP_GMP" != "no"; then
for i in $PHP_GMP /usr/local /usr; do
- if test -f $i/include/gmp.h; then
- GMP_DIR=$i
- fi
+ test -f $i/include/gmp.h && GMP_DIR=$i && break
done
if test -z "$GMP_DIR"; then
AC_MSG_ERROR(Unable to locate gmp.h)
fi
+
+ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
PHP_ADD_INCLUDE($GMP_DIR/include)
PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared)
- AC_DEFINE(HAVE_GMP, 1, [ ])
PHP_SUBST(GMP_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
+ AC_DEFINE(HAVE_GMP, 1, [ ])
fi
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.58 php-src/ext/imap/config.m4:1.59
--- php-src/ext/imap/config.m4:1.58 Tue Sep 30 18:36:35 2003
+++ php-src/ext/imap/config.m4 Tue Sep 30 22:53:09 2003
@@ -1,23 +1,22 @@
dnl
-dnl $Id: config.m4,v 1.58 2003/09/30 22:36:35 iliaa Exp $
+dnl $Id: config.m4,v 1.59 2003/10/01 02:53:09 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
AC_DEFINE(HAVE_IMAP2000, 1, [ ])
IMAP_DIR=$i
IMAP_INC_DIR=$i$1
+ break
elif test -r "$i$1/rfc822.h"; then
IMAP_DIR=$i;
IMAP_INC_DIR=$i$1
+ break
])
AC_DEFUN(IMAP_LIB_CHK,[
str="$IMAP_DIR/$1/lib$lib.*"
for i in `echo $str`; do
- if test -r $i; then
- IMAP_LIBDIR=$IMAP_DIR/$1
- break 2
- fi
+ test -r $i && IMAP_LIBDIR=$IMAP_DIR/$1 && break 2
done
])
Index: php-src/ext/mcrypt/config.m4
diff -u php-src/ext/mcrypt/config.m4:1.27 php-src/ext/mcrypt/config.m4:1.28
--- php-src/ext/mcrypt/config.m4:1.27 Tue Sep 30 18:36:39 2003
+++ php-src/ext/mcrypt/config.m4 Tue Sep 30 22:53:10 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.27 2003/09/30 22:36:39 iliaa Exp $
+dnl $Id: config.m4,v 1.28 2003/10/01 02:53:10 sniper Exp $
dnl
AC_DEFUN(PHP_MCRYPT_CHECK_VERSION,[
@@ -25,9 +25,7 @@
if test "$PHP_MCRYPT" != "no"; then
for i in $PHP_MCRYPT /usr/local /usr; do
- if test -f $i/include/mcrypt.h; then
- MCRYPT_DIR=$i
- fi
+ test -f $i/include/mcrypt.h && MCRYPT_DIR=$i && break
done
if test -z "$MCRYPT_DIR"; then
Index: php-src/ext/mhash/config.m4
diff -u php-src/ext/mhash/config.m4:1.13 php-src/ext/mhash/config.m4:1.14
--- php-src/ext/mhash/config.m4:1.13 Tue Sep 30 18:36:36 2003
+++ php-src/ext/mhash/config.m4 Tue Sep 30 22:53:11 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.13 2003/09/30 22:36:36 iliaa Exp $
+dnl $Id: config.m4,v 1.14 2003/10/01 02:53:11 sniper Exp $
dnl
PHP_ARG_WITH(mhash, for mhash support,
@@ -7,19 +7,17 @@
if test "$PHP_MHASH" != "no"; then
for i in $PHP_MHASH /usr/local /usr /opt/mhash; do
- if test -f $i/include/mhash.h; then
- MHASH_DIR=$i
- fi
+ test -f $i/include/mhash.h && MHASH_DIR=$i && break
done
if test -z "$MHASH_DIR"; then
AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h)
fi
+
PHP_ADD_INCLUDE($MHASH_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD)
- PHP_SUBST(MHASH_SHARED_LIBADD)
-
- AC_DEFINE(HAVE_LIBMHASH,1,[ ])
PHP_NEW_EXTENSION(mhash, mhash.c, $ext_shared)
+ PHP_SUBST(MHASH_SHARED_LIBADD)
+ AC_DEFINE(HAVE_LIBMHASH,1,[ ])
fi
Index: php-src/ext/ovrimos/config.m4
diff -u php-src/ext/ovrimos/config.m4:1.5 php-src/ext/ovrimos/config.m4:1.6
--- php-src/ext/ovrimos/config.m4:1.5 Tue Sep 30 18:36:41 2003
+++ php-src/ext/ovrimos/config.m4 Tue Sep 30 22:53:11 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.5 2003/09/30 22:36:41 iliaa Exp $
+dnl $Id: config.m4,v 1.6 2003/10/01 02:53:11 sniper Exp $
dnl
PHP_ARG_WITH(ovrimos, for Ovrimos SQL Server support,
@@ -8,9 +8,7 @@
if test "$PHP_OVRIMOS" != "no"; then
for i in $PHP_OVRIMOS /usr/local /usr; do
- if test -f $i/include/sqlcli.h; then
- OVRIMOS_DIR=$i
- fi
+ test -f $i/include/sqlcli.h && OVRIMOS_DIR=$i && break
done
if test -z "$OVRIMOS_DIR"; then
@@ -18,11 +16,11 @@
fi
PHP_ADD_INCLUDE($OVRIMOS_DIR/include)
- PHP_SUBST(OVRIMOS_SHARED_LIBADD)
LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib"
AC_CHECK_LIB(sqlcli, main)
PHP_ADD_LIBRARY_WITH_PATH(sqlcli, $OVRIMOS_DIR/lib, OVRIMOS_SHARED_LIBADD)
- AC_DEFINE(HAVE_LIBSQLCLI,1,[ ])
PHP_NEW_EXTENSION(ovrimos, ovrimos.c, $ext_shared)
+ PHP_SUBST(OVRIMOS_SHARED_LIBADD)
+ AC_DEFINE(HAVE_LIBSQLCLI,1,[ ])
fi
Index: php-src/ext/pfpro/config.m4
diff -u php-src/ext/pfpro/config.m4:1.10 php-src/ext/pfpro/config.m4:1.11
--- php-src/ext/pfpro/config.m4:1.10 Tue Sep 30 18:36:37 2003
+++ php-src/ext/pfpro/config.m4 Tue Sep 30 22:53:12 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.10 2003/09/30 22:36:37 iliaa Exp $
+dnl $Id: config.m4,v 1.11 2003/10/01 02:53:12 sniper Exp $
dnl
PHP_ARG_WITH(pfpro, for Verisign Payflow Pro support,
@@ -25,6 +25,8 @@
elif test -r $i/lib/$PFPRO_LIB; then
PFPRO_LIB_DIR=$i/lib
fi
+
+ test -n "$PFPRO_INC_DIR" && test -n "$PFPRO_LIB_DIR" && break
done
if test -z "$PFPRO_INC_DIR"; then
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.19 php-src/ext/readline/config.m4:1.20
--- php-src/ext/readline/config.m4:1.19 Tue Sep 30 18:36:42 2003
+++ php-src/ext/readline/config.m4 Tue Sep 30 22:53:13 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.19 2003/09/30 22:36:42 iliaa Exp $
+dnl $Id: config.m4,v 1.20 2003/10/01 02:53:13 sniper Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -10,9 +10,7 @@
if test "$PHP_READLINE" != "no"; then
for i in $PHP_READLINE /usr/local /usr; do
- if test -f $i/include/readline/readline.h; then
- READLINE_DIR=$i
- fi
+ test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
done
if test -z "$READLINE_DIR"; then
@@ -49,17 +47,14 @@
-L$READLINE_DIR/lib
])
+ PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
PHP_SUBST(READLINE_SHARED_LIBADD)
-
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
- PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
elif test "$PHP_LIBEDIT" != "no"; then
for i in $PHP_LIBEDIT /usr/local /usr; do
- if test -f $i/include/readline/readline.h; then
- LIBEDIT_DIR=$i
- fi
+ test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
done
if test -z "$LIBEDIT_DIR"; then
@@ -87,8 +82,7 @@
-L$READLINE_DIR/lib
])
+ PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
PHP_SUBST(READLINE_SHARED_LIBADD)
-
AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
- PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
fi
Index: php-src/ext/recode/config.m4
diff -u php-src/ext/recode/config.m4:1.10 php-src/ext/recode/config.m4:1.11
--- php-src/ext/recode/config.m4:1.10 Mon Apr 29 11:40:16 2002
+++ php-src/ext/recode/config.m4 Tue Sep 30 22:53:14 2003
@@ -1,12 +1,12 @@
dnl
-dnl $Id: config.m4,v 1.10 2002/04/29 15:40:16 sniper Exp $
+dnl $Id: config.m4,v 1.11 2003/10/01 02:53:14 sniper Exp $
dnl
PHP_ARG_WITH(recode,for recode support,
[ --with-recode[=DIR] Include recode support.])
if test "$PHP_RECODE" != "no"; then
- RECODE_LIST="$PHP_RECODE /usr /usr/local /opt"
+ RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
for i in $RECODE_LIST; do
if test -f $i/include/recode.h; then
@@ -24,6 +24,7 @@
RECODE_INC=include
RECODE_LIB=lib
fi
+ test -n "$RECODE_DIR" && break
done
if test -z "$RECODE_DIR"; then
Index: php-src/ext/session/config.m4
diff -u php-src/ext/session/config.m4:1.24 php-src/ext/session/config.m4:1.25
--- php-src/ext/session/config.m4:1.24 Tue Sep 30 18:36:38 2003
+++ php-src/ext/session/config.m4 Tue Sep 30 22:53:15 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.24 2003/09/30 22:36:38 iliaa Exp $
+dnl $Id: config.m4,v 1.25 2003/10/01 02:53:15 sniper Exp $
dnl
PHP_ARG_ENABLE(session, whether to enable PHP sessions,
@@ -18,9 +18,7 @@
if test "$PHP_MM" != "no"; then
for i in $PHP_MM /usr/local /usr; do
- if test -f "$i/include/mm.h"; then
- MM_DIR=$i
- fi
+ test -f "$i/include/mm.h" && MM_DIR=$i && break
done
if test -z "$MM_DIR" ; then
Index: php-src/ext/xmlrpc/config.m4
diff -u php-src/ext/xmlrpc/config.m4:1.20 php-src/ext/xmlrpc/config.m4:1.21
--- php-src/ext/xmlrpc/config.m4:1.20 Tue Sep 30 18:36:40 2003
+++ php-src/ext/xmlrpc/config.m4 Tue Sep 30 22:53:15 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.20 2003/09/30 22:36:40 iliaa Exp $
+dnl $Id: config.m4,v 1.21 2003/10/01 02:53:15 sniper Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -22,12 +22,13 @@
AC_DEFINE(HAVE_XMLRPC,1,[ ])
testval=no
- for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr /usr/local; do
+ for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; 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)
PHP_ADD_INCLUDE($i/include)
testval=yes
+ break
fi
done
@@ -76,6 +77,7 @@
if test -r $i/include/xmlrpc.h; then
XMLRPC_DIR=$i/include
AC_MSG_RESULT(found in $i)
+ break
fi
done
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
