Fix contrib/minizip compilation in the MinGW environment.

diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
index 2ced91367e008b152c570e0a39300699887192aa..d343011ebc3b3fd78d2bc3a29801a083c038cf0c 100644 (file)
--- 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 133b369bcc4621ed2523e88399d55c0f5860c60e..6a9af21c317e81ba986a30da2092c72eb2387611 100644 (file)
--- 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])