Re: Whitespace in `${srcdir}' during `configure'

[Glenn Morris <rgm@gnu.org>]

Please test this backport of Paul's 2014-06-10 change:

*** configure.ac	2014-10-22 13:10:41 +0000
--- configure.ac	2014-11-10 19:31:16 +0000
***************
*** 24,46 ****
  AC_PREREQ(2.65)
  AC_INIT(emacs, 24.4.51)
  
- dnl We get MINGW64 with MSYS2
- if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
- then
-   . $srcdir/nt/mingw-cfg.site
- 
-   case $srcdir in
-     /* | ?:*)
-       # srcdir is an absolute path.  In this case, force the format
-       # "/c/foo/bar", to simplify later conversions to native Windows
-       # format ("c:/foo/bar")
-       srcdir=`cd "${srcdir}" && pwd -W`
-       # 'eval' pacifies strict POSIX non-MinGW shells (Bug#18612).
-       eval 'srcdir="/${srcdir:0:1}${srcdir:2}"'
-       ;;
-   esac
- fi
- 
  dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
  dnl and then quoted again for a C string.  Separate options with spaces.
  dnl Add some environment variables, if they were passed via the environment
--- 24,29 ----
***************
*** 102,107 ****
--- 85,112 ----
  dnl Fairly arbitrary, older versions might work too.
  AM_INIT_AUTOMAKE(1.11)
  
+ dnl Canonicalize the configuration name.
+ AC_CANONICAL_HOST
+ canonical=$host
+ configuration=${host_alias-${build_alias-$host}}
+ 
+ dnl We get MINGW64 with MSYS2, MINGW32 with MSYS.
+ case $canonical in
+  *-mingw*)
+   . $srcdir/nt/mingw-cfg.site
+ 
+   case $srcdir in
+     /* | ?:*)
+       # srcdir is an absolute path.  In this case, force the format
+       # "/c/foo/bar", to simplify later conversions to native Windows
+       # format ("c:/foo/bar").
+       srcdir=`cd "${srcdir}" && pwd -W`
+       # 'eval' pacifies strict POSIX non-MinGW shells (Bug#18612).
+       eval 'srcdir="/${srcdir:0:1}${srcdir:2}"'
+       ;;
+   esac;;
+ esac
+ 
  dnl Support for --program-prefix, --program-suffix and
  dnl --program-transform-name options
  AC_ARG_PROGRAM
***************
*** 452,463 ****
  		[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
  [ac_enable_gtk_deprecation_warnings="${enableval}"],[])
  
- ### Canonicalize the configuration name.
- 
- AC_CANONICAL_HOST
- canonical=$host
- configuration=${host_alias-${build_alias-$host}}
- 
  dnl This used to use changequote, but, apart from `changequote is evil'
  dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
  dnl the great gob of text.  Thus it's not processed for possible expansion.
--- 457,462 ----