summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorFabrice Popineau <fabrice.popineau@supelec.fr>2014-01-11 15:36:06 +0200
committerEli Zaretskii <eliz@gnu.org>2014-01-11 15:36:06 +0200
commite05d3a05bfe8bb14e6f9246d76c7c9134eb101a1 (patch)
treea464c39b791b8b8beb9dc1d61730bbd91754aa33 /configure.ac
parentaf05bef2d1985fb9bd8485f3084f3bfe282a911f (diff)
downloademacs-e05d3a05bfe8bb14e6f9246d76c7c9134eb101a1.tar.gz
Fix minor build problems related to MinGW64.
configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is "MINGW64" as well. nt/inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64. src/unexw32.c (_start) [__MINGW64__]: Define to __start.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index b3d28d1d720..8443d168c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,8 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.65)
AC_INIT(emacs, 24.3.50)
-if test "x$MSYSTEM" = "xMINGW32"
+dnl We get MINGW64 with MSYS2
+if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
then
. $srcdir/nt/mingw-cfg.site