sniper Fri Jan 21 20:37:12 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src acinclude.m4
/php-src/ext/dba config.m4
/php-src/ext/mcrypt config.m4
Log:
MFH: - Typofix + removed unnecessary unsets caused by it
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.46&r2=1.218.2.47&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.46 php-src/acinclude.m4:1.218.2.47
--- php-src/acinclude.m4:1.218.2.46 Wed Jan 19 12:36:21 2005
+++ php-src/acinclude.m4 Fri Jan 21 20:37:12 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.46 2005/01/19 17:36:21 sniper Exp $ -*-
autoconf -*-
+dnl $Id: acinclude.m4,v 1.218.2.47 2005/01/22 01:37:12 sniper Exp $ -*-
autoconf -*-
dnl
dnl This file contains local autoconf functions.
@@ -1579,7 +1579,7 @@
],[
LDFLAGS=$save_old_LDFLAGS
ext_shared=$save_ext_shared
- unset ac_cv_func_$1
+ unset ac_cv_lib_$1[]_$2
$4
])dnl
])
http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.29.2.27&r2=1.29.2.28&ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.29.2.27 php-src/ext/dba/config.m4:1.29.2.28
--- php-src/ext/dba/config.m4:1.29.2.27 Thu Dec 30 02:02:16 2004
+++ php-src/ext/dba/config.m4 Fri Jan 21 20:37:12 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.29.2.27 2004/12/30 07:02:16 sniper Exp $
+dnl $Id: config.m4,v 1.29.2.28 2005/01/22 01:37:12 sniper Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -81,7 +81,6 @@
done
if test -n "$THIS_INCLUDE"; then
- unset ac_cv_lib_gdbm_gdbm_open
PHP_CHECK_LIBRARY(gdbm, gdbm_open, [
AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_GDBM, 1, [ ])
http://cvs.php.net/diff.php/php-src/ext/mcrypt/config.m4?r1=1.24.4.3&r2=1.24.4.4&ty=u
Index: php-src/ext/mcrypt/config.m4
diff -u php-src/ext/mcrypt/config.m4:1.24.4.3
php-src/ext/mcrypt/config.m4:1.24.4.4
--- php-src/ext/mcrypt/config.m4:1.24.4.3 Tue Sep 30 22:54:00 2003
+++ php-src/ext/mcrypt/config.m4 Fri Jan 21 20:37:12 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.24.4.3 2003/10/01 02:54:00 sniper Exp $
+dnl $Id: config.m4,v 1.24.4.4 2005/01/22 01:37:12 sniper Exp $
dnl
PHP_ARG_WITH(mcrypt, for mcrypt support,
@@ -23,12 +23,10 @@
[
AC_DEFINE(HAVE_MCRYPT_GENERIC_DEINIT,1,[ ])
],[],[
- -L$MCRYPT_DIR/lib
+ -L$MCRYPT_DIR/lib -lltdl
])
],[
- unset found
- unset ac_cv_lib_mcrypt_mcrypt_module_open
PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
[
AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
@@ -48,7 +46,9 @@
],[
-L$MCRYPT_DIR/lib
])
- ],[])
+ ],[
+ -L$MCRYPT_DIR/lib
+ ])
],[
-L$MCRYPT_DIR/lib -lltdl
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
