mirrors/zlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix contrib/minizip compilation in the MinGW environment.

Browse Source
This commit is contained in:
jK 2012-03-26 20:18:13 +02:00 committed by Mark Adler
parent 11f4065ea9
commit ba04838a74
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/minizip/Makefile.am
View File

@ -10,11 +10,17 @@ zlib_top_builddir = $(top_builddir)/../..
AM_CPPFLAGS = -I$(zlib_top_srcdir) AM_CPPFLAGS = -I$(zlib_top_srcdir)
AM_LDFLAGS = -L$(zlib_top_builddir) AM_LDFLAGS = -L$(zlib_top_builddir)
if WIN32
iowin32_src = iowin32.c
iowin32_h = iowin32.h
endif
libminizip_la_SOURCES = \ libminizip_la_SOURCES = \
ioapi.c \ ioapi.c \
mztools.c \ mztools.c \
unzip.c \ unzip.c \
zip.c zip.c \
${iowin32_src}
libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
@ -24,7 +30,8 @@ minizip_include_HEADERS = \
ioapi.h \ ioapi.h \
mztools.h \ mztools.h \
unzip.h \ unzip.h \
zip.h zip.h \
${iowin32_h}
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = minizip.pc pkgconfig_DATA = minizip.pc

10
contrib/minizip/configure.ac
View File

@ -16,6 +16,16 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
case "${host}" in
*-mingw* | mingw*)
WIN32="yes"
;;
*)
;;
esac
AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
AC_SUBST([HAVE_UNISTD_H], [0]) AC_SUBST([HAVE_UNISTD_H], [0])
AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
AC_CONFIG_FILES([Makefile minizip.pc]) AC_CONFIG_FILES([Makefile minizip.pc])