* lib/autoconf/general.m4 (AC_SITE_LOAD): Rewrite the

for loop over config.site files using `set', to allow
directory names containing IFS characters.

diff --git a/ChangeLog b/ChangeLog
index 8b6134097a0f03aea4f7c04bc0817a920a2a5360..c26d3f7037e77563e22e488549385adc704d6716 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-02  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/autoconf/general.m4 (AC_SITE_LOAD): Rewrite the
+       for loop over config.site files using `set', to allow
+       directory names containing IFS characters.
+
 2005-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/autoconf/general.m4 (_AC_INIT_DIRCHECK): Remove the tests for

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 3f333eaec8f469ca6651b6d938d34e35159048eb..bf4a818856cf71b2767eb13ab08ba1abb5d37df6 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1738,14 +1738,17 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPLE], [])
 # Look for site or system specific initialization scripts.
 m4_define([AC_SITE_LOAD],
 [# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+       "$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     AC_MSG_NOTICE([loading site script $ac_site_file])
     sed 's/^/| /' "$ac_site_file" >&AS_MESSAGE_LOG_FD