From ba04838a74202955f7b8dfb66af5345bf5eaeb00 Mon Sep 17 00:00:00 2001 From: jK Date: Mon, 26 Mar 2012 20:18:13 +0200 Subject: [PATCH] Fix contrib/minizip compilation in the MinGW environment. --- contrib/minizip/Makefile.am | 11 +++++++++-- contrib/minizip/configure.ac | 10 ++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am index 2ced91367..d343011eb 100644 --- a/contrib/minizip/Makefile.am +++ b/contrib/minizip/Makefile.am @@ -10,11 +10,17 @@ zlib_top_builddir = $(top_builddir)/../.. AM_CPPFLAGS = -I$(zlib_top_srcdir) AM_LDFLAGS = -L$(zlib_top_builddir) +if WIN32 +iowin32_src = iowin32.c +iowin32_h = iowin32.h +endif + libminizip_la_SOURCES = \ ioapi.c \ mztools.c \ unzip.c \ - zip.c + zip.c \ + ${iowin32_src} libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz @@ -24,7 +30,8 @@ minizip_include_HEADERS = \ ioapi.h \ mztools.h \ unzip.h \ - zip.h + zip.h \ + ${iowin32_h} pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = minizip.pc diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac index 133b369bc..6a9af21c3 100644 --- a/contrib/minizip/configure.ac +++ b/contrib/minizip/configure.ac @@ -16,6 +16,16 @@ else AC_MSG_RESULT([no]) fi +case "${host}" in + *-mingw* | mingw*) + WIN32="yes" + ;; + *) + ;; +esac +AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) + + AC_SUBST([HAVE_UNISTD_H], [0]) AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) AC_CONFIG_FILES([Makefile minizip.pc])