Commit fb643f6b authored by Marius Gerbershagen's avatar Marius Gerbershagen
Browse files

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.
parent 442b4124
...@@ -197,7 +197,7 @@ case "${srcdir}" in ...@@ -197,7 +197,7 @@ case "${srcdir}" in
/* | ?:/* ) ;; /* | ?:/* ) ;;
* ) srcdir="`(cd ${srcdir}; ${PWDCMD})`"; * ) srcdir="`(cd ${srcdir}; ${PWDCMD})`";
esac 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_srcdir=`(cd ${srcdir}; pwd -W)`
true_builddir=`pwd -W` true_builddir=`pwd -W`
else else
......
...@@ -737,7 +737,6 @@ infodir ...@@ -737,7 +737,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
...@@ -863,7 +862,6 @@ datadir='${datarootdir}' ...@@ -863,7 +862,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
...@@ -1116,15 +1114,6 @@ do ...@@ -1116,15 +1114,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; 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) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
...@@ -1262,7 +1251,7 @@ fi ...@@ -1262,7 +1251,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
...@@ -1415,7 +1404,6 @@ Fine tuning of the installation directories: ...@@ -1415,7 +1404,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
...@@ -4772,7 +4760,7 @@ case "${srcdir}" in ...@@ -4772,7 +4760,7 @@ case "${srcdir}" in
/* | ?:/* ) ;; /* | ?:/* ) ;;
* ) srcdir="`(cd ${srcdir}; ${PWDCMD})`"; * ) srcdir="`(cd ${srcdir}; ${PWDCMD})`";
esac 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_srcdir=`(cd ${srcdir}; pwd -W)`
true_builddir=`pwd -W` true_builddir=`pwd -W`
else else
...@@ -8865,8 +8853,6 @@ main () ...@@ -8865,8 +8853,6 @@ main ()
if (*(data + i) != *(data3 + i)) if (*(data + i) != *(data3 + i))
return 14; return 14;
close (fd); close (fd);
free (data);
free (data3);
return 0; return 0;
} }
_ACEOF _ACEOF
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment