diff options
| author | Karl Berry <karl@freefriends.org> | 2019-02-19 22:23:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-02-19 22:23:52 +0000 |
| commit | 197fbea9e34baff3e1ddcb1027546da93b40180d (patch) | |
| tree | 80e47ec846df5a716b94e9f50c449b6887a9a1f0 /Build/source/m4 | |
| parent | b6d09658cf05a62a303cf3a1bf5876c6e48a2e08 (diff) | |
mingw64 from luigi
git-svn-id: svn://tug.org/texlive/trunk@50065 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
| -rw-r--r-- | Build/source/m4/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/m4/kpse-win32.m4 | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index e5f5d9f0d50..b4589fdc733 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2019-02-18 Luigi Scarso <luigi.scarso@gmail.com> + + * kpse-win32.m4 (KPSE_COND_WIN32_WRAP): if w64 and mingw, + use different wrapper. + 2019-01-11 Karl Berry <karl@freefriends.org> * kpse-luajit-flags.m4 (KPSE_LUAJIT_FLAGS): try LIBLUAJIT_LDEXTRA, diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4 index 8893ceb68c0..cdee44e2ec7 100644 --- a/Build/source/m4/kpse-win32.m4 +++ b/Build/source/m4/kpse-win32.m4 @@ -1,5 +1,7 @@ +# $Id$ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +# Copyright 2016-2019 Karl Berry <tex-live@tug.org> +# Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -51,7 +53,9 @@ AC_CACHE_CHECK([for WIN64], [kpse_cv_have_win64=yes], [kpse_cv_have_win64=no])]) AS_CASE([$kpse_cv_have_win64], - [yes], [WIN_WRAPPER=w64_wrapper], + [yes], [AS_IF([test "x$kpse_cv_have_win32=xmingw"], + [WIN_WRAPPER=w64_mingw_wrapper], + [WIN_WRAPPER=w64_wrapper])], [WIN_WRAPPER=w32_wrapper]) AC_SUBST([WIN_WRAPPER]) AM_CONDITIONAL([WIN32_WRAP], |