cvs: php-src / acinclude.m4 /ext/dba config.m4 /ext/mcrypt config.m4
| From: | Jani Taskinen | Date: | Sat, 22 Jan 2005 01:31:54 +0000 |
| Subject: | cvs: php-src / acinclude.m4 /ext/dba config.m4 /ext/mcrypt config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30071@lists.php.net to get a copy of this message | ||
sniper Fri Jan 21 20:31:54 2005 EDT
Modified files:
/php-src acinclude.m4
/php-src/ext/dba config.m4
/php-src/ext/mcrypt config.m4
Log:
- Typofix + removed unnecessary unsets caused by it
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.288&r2=1.289&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.288 php-src/acinclude.m4:1.289
--- php-src/acinclude.m4:1.288 Wed Jan 19 12:35:55 2005
+++ php-src/acinclude.m4 Fri Jan 21 20:31:53 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.288 2005/01/19 17:35:55 sniper Exp $
+dnl $Id: acinclude.m4,v 1.289 2005/01/22 01:31:53 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1573,7 +1573,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.63&r2=1.64&ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.63 php-src/ext/dba/config.m4:1.64
--- php-src/ext/dba/config.m4:1.63 Thu Dec 30 02:08:36 2004
+++ php-src/ext/dba/config.m4 Fri Jan 21 20:31:54 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.63 2004/12/30 07:08:36 sniper Exp $
+dnl $Id: config.m4,v 1.64 2005/01/22 01:31:54 sniper Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -116,7 +116,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.29&r2=1.30&ty=u
Index: php-src/ext/mcrypt/config.m4
diff -u php-src/ext/mcrypt/config.m4:1.29 php-src/ext/mcrypt/config.m4:1.30
--- php-src/ext/mcrypt/config.m4:1.29 Thu Dec 30 02:08:36 2004
+++ php-src/ext/mcrypt/config.m4 Fri Jan 21 20:31:54 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.29 2004/12/30 07:08:36 sniper Exp $
+dnl $Id: config.m4,v 1.30 2005/01/22 01:31:54 sniper Exp $
dnl
AC_DEFUN([PHP_MCRYPT_CHECK_VERSION],[
@@ -39,8 +39,6 @@
PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
],[
- unset found
- unset ac_cv_lib_mcrypt_mcrypt_module_open
PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
[
AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])