[Emacs-diffs] trunk r117303: Rely on AC_CANONICAL_HOST to detect whether we're using mingw.

[Paul Eggert]

------------------------------------------------------------
revno: 117303
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-06-10 12:43:13 -0700
message:
  Rely on AC_CANONICAL_HOST to detect whether we're using mingw.
  
  See the thread containing:
  http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00206.html
  * configure.ac (AC_CANONICAL_HOST): Invoke this as early as we
  can, which is just after AM_INIT_AUTOMAKE.  Then check for mingw
  just after that.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-06-10 02:15:49 +0000
+++ b/ChangeLog 2014-06-10 19:43:13 +0000
@@ -1,3 +1,12 @@
+2014-06-10  Paul Eggert  <address@hidden>
+
+       Rely on AC_CANONICAL_HOST to detect whether we're using mingw.
+       See the thread containing:
+       http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00206.html
+       * configure.ac (AC_CANONICAL_HOST): Invoke this as early as we
+       can, which is just after AM_INIT_AUTOMAKE.  Then check for mingw
+       just after that.
+
 2014-06-10  Glenn Morris  <address@hidden>
 
        * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL):

=== modified file 'configure.ac'
--- a/configure.ac      2014-06-10 02:11:38 +0000
+++ b/configure.ac      2014-06-10 19:43:13 +0000
@@ -25,22 +25,6 @@
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
 AC_INIT(GNU Emacs, 24.4.50, address@hidden)
 
-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`
-      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
@@ -146,6 +130,27 @@
 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.
+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`
+      srcdir="/${srcdir:0:1}${srcdir:2}"
+      ;;
+  esac;;
+esac
+
 dnl Support for --program-prefix, --program-suffix and
 dnl --program-transform-name options
 AC_ARG_PROGRAM
@@ -489,12 +494,6 @@
                [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.