summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-10 11:51:16 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-10 11:51:16 +0000
commite9df03618ebbcdf76692fe47d544e93ba0167d80 (patch)
tree41bcda5546d0395e9c4d7d26b25d497c137c275b
parent1c10dcb19acce6c92495df3521ec8462699bfb61 (diff)
libs/zziplib: Build fix for MinGW (from Luigi)
git-svn-id: svn://tug.org/texlive/trunk@34565 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/zziplib/ChangeLog5
-rwxr-xr-xBuild/source/libs/zziplib/configure14
-rw-r--r--Build/source/libs/zziplib/configure.ac11
3 files changed, 22 insertions, 8 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog
index 4c2af6059fb..c64a7e39bb8 100644
--- a/Build/source/libs/zziplib/ChangeLog
+++ b/Build/source/libs/zziplib/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Bug fix for MinGW: do not use mmap.
+ Mail from Luigi Scarso <luigi.scarso@gmail.com>
+
2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop ACLOCAL_AMFLAGS.
diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure
index 4f1d2972498..bd3f30e5a2a 100755
--- a/Build/source/libs/zziplib/configure
+++ b/Build/source/libs/zziplib/configure
@@ -5728,10 +5728,18 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether can use mmap for file scanning" >&5
$as_echo_n "checking whether can use mmap for file scanning... " >&6; }
enable_mmap='no (just a bit slower)'
-test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h"
+case $host_os in #(
+ mingw*) :
+ ;; #(
+ *) :
+ test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h"
test "x$ac_cv_header_sys_mman_h" = xyes && enable_mmap="yes, sys/mman.h"
-case "$enable_mmap" in
- yes*) ZZIPLIB_DEFINES='-D_USE_MMAP';;
+case $enable_mmap in #(
+ yes*) :
+ ZZIPLIB_DEFINES='-D_USE_MMAP' ;; #(
+ *) :
+ ;;
+esac ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mmap" >&5
$as_echo "$enable_mmap" >&6; }
diff --git a/Build/source/libs/zziplib/configure.ac b/Build/source/libs/zziplib/configure.ac
index 98ff5c7fb40..52cebfedd7d 100644
--- a/Build/source/libs/zziplib/configure.ac
+++ b/Build/source/libs/zziplib/configure.ac
@@ -37,11 +37,13 @@ AC_CHECK_HEADERS([fnmatch.h])
# ---------------------------------------------------------------
AC_MSG_CHECKING([whether can use mmap for file scanning])
enable_mmap='no (just a bit slower)'
+AS_CASE([$host_os],
+ [mingw*], [],
+ [dnl
test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h"
test "x$ac_cv_header_sys_mman_h" = xyes && enable_mmap="yes, sys/mman.h"
-case "$enable_mmap" in
- yes*) ZZIPLIB_DEFINES='-D_USE_MMAP';;
-esac
+AS_CASE([$enable_mmap],
+ [yes*], [ZZIPLIB_DEFINES='-D_USE_MMAP'])])
AC_MSG_RESULT([$enable_mmap])
AC_SUBST([ZZIPLIB_DEFINES])
@@ -79,8 +81,7 @@ KPSE_RESTORE_FLAGS
echo timestamp >config.force
fi
-ZZIPLIB_TREE=zziplib-[]zziplib_version
-AC_SUBST([ZZIPLIB_TREE])
+AC_SUBST([ZZIPLIB_TREE], [zziplib-]zziplib_version)
# -----------------------------------------------------------------------
AC_MSG_RESULT([creating include/zzip/_msvc.in via zzip/_msvc.sed of config.h.in])