Index: Modules/_ctypes/libffi/configure =================================================================== --- Modules/_ctypes/libffi/configure (revision 77415) +++ Modules/_ctypes/libffi/configure (working copy) @@ -1612,15 +1612,15 @@ ac_top_srcdir=$ac_top_builddir_sub ac_abs_top_srcdir=$ac_pwd ;; [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; + ac_srcdir="$srcdir$ac_dir_suffix" + ac_top_srcdir="$srcdir" + ac_abs_top_srcdir="$srcdir" ;; *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + ac_srcdir="$ac_top_build_prefix$srcdir$ac_dir_suffix" + ac_top_srcdir="$ac_top_build_prefix$srcdir" + ac_abs_top_srcdir="$ac_pwd/$srcdir" ;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +ac_abs_srcdir="$ac_abs_top_srcdir$ac_dir_suffix" cd "$ac_dir" || { ac_status=$?; continue; } # Check for guested configure. @@ -2169,7 +2169,7 @@ program_prefix=${target_alias}- target_alias=${target_alias-$host_alias} -. ${srcdir}/configure.host +. "${srcdir}/configure.host" am__api_version='1.10' @@ -2264,10 +2264,10 @@ # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2314,7 +2314,7 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +test x"${MISSING+set}" = xset || MISSING="\${SHELL} \"$am_aux_dir/missing\"" # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -2458,7 +2458,7 @@ # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured - if test -f $srcdir/config.status; then + if test -f "$srcdir/config.status"; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } @@ -20351,7 +20351,7 @@ fi - if test -d $srcdir/testsuite; then + if test -d "$srcdir/testsuite"; then TESTSUBDIR_TRUE= TESTSUBDIR_FALSE='#' else @@ -23870,7 +23870,8 @@ case $ac_mode in :L) ac_source=$1;; :[FH]) - ac_file_inputs= + # Use an array, to deal with space in paths + ac_file_inputs=() for ac_f do case $ac_f in @@ -23887,7 +23888,7 @@ echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - ac_file_inputs="$ac_file_inputs $ac_f" + ac_file_inputs+=("$ac_f") done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -23995,15 +23996,15 @@ ac_top_srcdir=$ac_top_builddir_sub ac_abs_top_srcdir=$ac_pwd ;; [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; + ac_srcdir="$srcdir$ac_dir_suffix" + ac_top_srcdir="$srcdir" + ac_abs_top_srcdir="$srcdir" ;; *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + ac_srcdir="$ac_top_build_prefix$srcdir$ac_dir_suffix" + ac_top_srcdir="$ac_top_build_prefix$srcdir" + ac_abs_top_srcdir="$ac_pwd/$srcdir" ;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +ac_abs_srcdir="$ac_abs_top_srcdir$ac_dir_suffix" case $ac_mode in @@ -24037,7 +24038,7 @@ /@infodir@/p /@localedir@/p /@mandir@/p -' $ac_file_inputs` in +' "${ac_file_inputs[@]}"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 @@ -24076,7 +24077,7 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" "${ac_file_inputs[@]}" | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -24146,7 +24147,7 @@ # Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" # Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" # et cetera. -ac_in='$ac_file_inputs' +ac_in='"${ac_file_inputs[@]}"' ac_out='"$tmp/out1"' ac_nxt='"$tmp/out2"' @@ -24240,8 +24241,8 @@ # Try a relative symlink, then a hard link, then a copy. case $srcdir in - [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;; - *) ac_rel_source=$ac_top_build_prefix$srcdir/$ac_source ;; + [\\/$]* | ?:[\\/]* ) ac_rel_source="$srcdir/$ac_source" ;; + *) ac_rel_source="$ac_top_build_prefix$srcdir/$ac_source" ;; esac ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || ln "$srcdir/$ac_source" "$ac_file" 2>/dev/null ||