From: foobar <sniper@php.net>
Date: Thu, 7 Jul 2005 23:18:22 +0000 (+0000)
Subject: - Fixed stupid bug in PHP_INSTALL_HEADERS() macro: "foo bar" != foo bar
X-Git-Tag: php-5.1.0b3~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71d28a82cf9571619a7a2ef1ff2e1c75307b6757;p=php

- Fixed stupid bug in PHP_INSTALL_HEADERS() macro: "foo bar" != foo bar
- ext/date/lib/timelib_config.h is also installed now
---

diff --git a/acinclude.m4 b/acinclude.m4
index 8a24f9a8a6..c3a9a0a40f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2366,21 +2366,21 @@ dnl
 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
diff --git a/ext/date/config.m4 b/ext/date/config.m4
index 72f17a6305..253cc22f6b 100644
--- a/ext/date/config.m4
+++ b/ext/date/config.m4
@@ -10,10 +10,10 @@ timelib_sources="lib/dow.c lib/parse_date.c lib/parse_tz.c
 
 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>