Permalink
Browse files

Fix contrib/minizip compilation in the MinGW environment.

  • Loading branch information...
1 parent 11f4065 commit ba04838a74202955f7b8dfb66af5345bf5eaeb00 @jk3064 jk3064 committed with Mar 26, 2012
Showing with 19 additions and 2 deletions.
  1. +9 −2 contrib/minizip/Makefile.am
  2. +10 −0 contrib/minizip/configure.ac
@@ -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
@@ -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])

0 comments on commit ba04838

Please sign in to comment.