cvs: php4 / acinclude.m4
| From: | Sascha Schumann | Date: | Thu, 11 Apr 2002 05:47:05 +0000 |
| Subject: | cvs: php4 / acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11025@lists.php.net to get a copy of this message | ||
sas Thu Apr 11 01:47:05 2002 EDT
Modified files:
/php4 acinclude.m4
Log:
properly reset ac_extra in PHP_NEW_EXTENSION
redirect stderr to /dev/null to silence xargs
Noticed by: Andrei
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.182 php4/acinclude.m4:1.183
--- php4/acinclude.m4:1.182 Mon Apr 8 14:43:34 2002
+++ php4/acinclude.m4 Thu Apr 11 01:47:03 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.182 2002/04/08 18:43:34 sniper Exp $
+dnl $Id: acinclude.m4,v 1.183 2002/04/11 05:47:03 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -33,7 +33,7 @@
> Makefile.fragments
dnl We need to play tricks here to avoid matching the egrep line itself
pattern=define
-egrep $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch
+egrep $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch
2>/dev/null
])
dnl PHP_GEN_GLOBAL_MAKEFILE
@@ -1149,7 +1149,7 @@
ext_builddir=[]PHP_EXT_BUILDDIR($1)
ext_srcdir=[]PHP_EXT_SRCDIR($1)
- ifelse($5,,,[ac_extra=
echo $ac_n "$5$ac_c"|sed
s#@ext_srcdir@#$ext_srcdir#g])
+ ifelse($5,,ac_extra=,[ac_extra=echo $ac_n "$5$ac_c"|sed
s#@ext_srcdir@#$ext_srcdir#g])
if test "$3" != "shared" && test "$3" != "yes"
&& test "$4" != "cli"; then
dnl ---------------------------------------------- Static module