cvs: php-src / acinclude.m4 /ext/date config.m4
| From: | Jani Taskinen | Date: | Thu, 07 Jul 2005 23:18:22 +0000 |
| Subject: | cvs: php-src / acinclude.m4 /ext/date config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32785@lists.php.net to get a copy of this message | ||
sniper Thu Jul 7 19:18:22 2005 EDT
Modified files:
/php-src acinclude.m4
/php-src/ext/date config.m4
Log:
- Fixed stupid bug in PHP_INSTALL_HEADERS() macro: "foo bar" != foo bar
- ext/date/lib/timelib_config.h is also installed now
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.326&r2=1.327&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.326 php-src/acinclude.m4:1.327
--- php-src/acinclude.m4:1.326 Thu Jul 7 01:54:42 2005
+++ php-src/acinclude.m4 Thu Jul 7 19:18:21 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.326 2005/07/07 05:54:42 dmitry Exp $
+dnl $Id: acinclude.m4,v 1.327 2005/07/07 23:18:21 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2366,21 +2366,21 @@
dnl PHP header files to be installed
dnl
AC_DEFUN([PHP_INSTALL_HEADERS],[
- if test -z "$2"; then
- for header_file in "$1"; do
+ ifelse([$2],[],[
+ for header_file in $1; do
PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $header_file"
])
done
- else
+ ], [
header_path=$1
- for header_file in "$2"; do
+ for header_file in $2; do
hp_hf="$header_path/$header_file"
PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
- INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $header_path/$header_file"
+ INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $hp_hf"
])
done
- fi
+ ])
])
dnl
http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/date/config.m4
diff -u php-src/ext/date/config.m4:1.9 php-src/ext/date/config.m4:1.10
--- php-src/ext/date/config.m4:1.9 Thu Jun 30 02:40:57 2005
+++ php-src/ext/date/config.m4 Thu Jul 7 19:18:22 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.9 2005/06/30 06:40:57 derick Exp $
+dnl $Id: config.m4,v 1.10 2005/07/07 23:18:22 sniper Exp $
dnl config.m4 for date extension
sinclude(ext/date/lib/timelib.m4)
@@ -10,10 +10,10 @@
PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
-PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h])
+PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h
lib/timelib_config.h])
-cat >> $ext_builddir/lib/timelib_config.h <<EOF
-#if PHP_WIN32
+cat > $ext_builddir/lib/timelib_config.h <<EOF
+#ifdef PHP_WIN32
# include "config.w32.h"
#else
# include <php_config.h>