--- /home/acs/cvsroot/xemacs-21.4/configure	2006-12-07 22:12:30.000000000 -0500
+++ ./configure	2007-05-03 22:32:02.000000000 -0400
@@ -878,7 +878,7 @@
 
 
 absolute_pwd="`pwd`";
-if test -n "$PWD" -a "`cd $PWD && pwd`" = "$absolute_pwd"
+if test -n "$PWD" -a "`cd "$PWD" && pwd`" = "$absolute_pwd"
 then blddir="$PWD"
 else blddir="$absolute_pwd"; if test -d "/net"; then
   if test -d "/tmp_mnt/net"; then tdir="tmp_mnt/net"; else tdir="tmp_mnt"; fi
@@ -898,8 +898,8 @@
 fi ;;
 esac
 
-if test `pwd` != `sh -c cd $srcdir && pwd`  \
-   && test -f "$srcdir/src/config.h"; then
+if test "`pwd`" != "`sh -c cd $srcdir && pwd`"  \
+   && test -f "'$srcdir/src/config.h'"; then
   (echo "$progname: WARNING: The directory tree \`$srcdir' is being used"
    echo "   as a build directory right now; it has been configured in its own"
    echo "   right.  To configure in another directory as well, you MUST"
@@ -1118,7 +1118,7 @@
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
 echo "configure:1120: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
-canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
+canonical=`${CONFIG_SHELL-/bin/sh} "$srcdir"/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
 canonical=`echo "$canonical" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
 echo "$ac_t""$configuration" 1>&6
@@ -3392,13 +3392,13 @@
 fi
 
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir="$ac_dir"
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir="$ac_dir"
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
   fi
@@ -15923,12 +15923,12 @@
   esac
   
 T=""
-for W in $SUBDIR_MAKEFILES $dir/Makefile $dir/GNUmakefile; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+for W in $SUBDIR_MAKEFILES "$dir"/Makefile "$dir"/GNUmakefile; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 SUBDIR_MAKEFILES="$T"
 
   
 T=""
-for W in $internal_makefile_list $dir/Makefile.in; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+for W in $internal_makefile_list "$dir"/Makefile.in; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 internal_makefile_list="$T"
 
 done
@@ -16802,7 +16802,7 @@
   esac
 done
 
-ac_given_srcdir=$srcdir
+ac_given_srcdir="$srcdir"
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "$ac_output_files src/config.h lwlib/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -17004,7 +17004,7 @@
   case "$ac_given_srcdir" in
   .)  srcdir=.
       if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+      else top_srcdir="`echo $ac_dots|sed 's%/$%%'`"; fi ;;
   /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
   *) # Relative path.
     srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
@@ -17024,14 +17024,22 @@
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  # Yuck - acs - 2007-05-03
+  # Replaced this fine hack:
+# ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  # with the following 6 blecherous lines:
+  ac_file_input1=$ac_file_in
+  ac_file_input2=/dev/null
+  if echo $ac_file_in | grep -q : ; then
+    ac_file_input1=`echo $ac_file_in|sed -e "s%^\(.*\):.*%$ac_given_srcdir/\1%"`
+    ac_file_input2=`echo $ac_file_in|sed -e "s%.*:%$ac_given_srcdir/%"`
+  fi
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
 s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+" "$ac_file_input1" "$ac_file_input2" | (eval "$ac_sed_cmds") > "$ac_file"
 fi; done
 rm -f conftest.s*
 
@@ -17068,12 +17076,11 @@
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
-
   echo creating $ac_file
 
   rm -f conftest.frag conftest.in conftest.out
   ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
+  cat "$ac_file_inputs" > conftest.in
 
 EOF
 
@@ -17172,7 +17179,7 @@
 
 
     echo creating $dir/Makefile
-$CPP -I. -I${top_srcdir}/src  junk.c \
+$CPP -I. -I"${top_srcdir}"/src  junk.c \
   | sed -e 's/^\#.*//'		\
 	-e 's/^[ 	][ 	]*$//'\
 	-e 's/^ /	/'		\
@@ -17186,7 +17193,7 @@
     mv -f Makefile.new Makefile
 
     echo creating $dir/GNUmakefile
-$CPP -I. -I${top_srcdir}/src -DUSE_GNU_MAKE junk.c \
+$CPP -I. -I"${top_srcdir}"/src -DUSE_GNU_MAKE junk.c \
   | sed -e 's/^\#.*//'		\
 	-e 's/^[ 	][ 	]*$//'\
 	-e 's/^ /	/'		\