From fb643f6b0fc93e4d53bafa21dcdb1c8091941d7d Mon Sep 17 00:00:00 2001
From: Marius Gerbershagen <marius.gerbershagen@gmail.com>
Date: Sat, 7 Jul 2018 21:59:35 +0200
Subject: [PATCH] buildsystem: fix building for mingw64

    mingw64 also defines __MINGW32__ and sets the host system type to
    be x86_64-w64-mingw32, so we only need to change the way we detect this
    in aclocal.m4.
---
 src/aclocal.m4 |  2 +-
 src/configure  | 18 ++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 82bce9eca..0865c39b5 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -197,7 +197,7 @@ case "${srcdir}" in
   /* | ?:/* ) ;;
   *  ) srcdir="`(cd ${srcdir}; ${PWDCMD})`";
 esac
-if uname -a | grep -i 'mingw32' > /dev/null; then
+if uname -a | grep -i 'mingw' > /dev/null; then
   true_srcdir=`(cd ${srcdir}; pwd -W)`
   true_builddir=`pwd -W`
 else
diff --git a/src/configure b/src/configure
index be1d07b61..fea602c39 100755
--- a/src/configure
+++ b/src/configure
@@ -737,7 +737,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -863,7 +862,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1116,15 +1114,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1262,7 +1251,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1415,7 +1404,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -4772,7 +4760,7 @@ case "${srcdir}" in
   /* | ?:/* ) ;;
   *  ) srcdir="`(cd ${srcdir}; ${PWDCMD})`";
 esac
-if uname -a | grep -i 'mingw32' > /dev/null; then
+if uname -a | grep -i 'mingw' > /dev/null; then
   true_srcdir=`(cd ${srcdir}; pwd -W)`
   true_builddir=`pwd -W`
 else
@@ -8865,8 +8853,6 @@ main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
-  free (data);
-  free (data3);
   return 0;
 }
 _ACEOF