[vlc-commits] zip: fix build without zlib

Rémi Denis-Courmont git at videolan.org
Thu Aug 2 23:41:15 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  2 23:26:38 2012 +0300| [8ae2a756a92cd1a68852d2e0a79b6fad340f0fbc] | committer: Rémi Denis-Courmont

zip: fix build without zlib

minizip should not and cannot be compiled without zlib.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8ae2a756a92cd1a68852d2e0a79b6fad340f0fbc
---

 modules/access/zip/Modules.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/access/zip/Modules.am b/modules/access/zip/Modules.am
index ee008ef..1b1f167 100644
--- a/modules/access/zip/Modules.am
+++ b/modules/access/zip/Modules.am
@@ -1,6 +1,3 @@
-if !HAVE_MINIZIP
-SUBDIRS = unzip
-endif
 DIST_SUBDIRS = unzip
 
 libzip_plugin_la_SOURCES = zip.h zipstream.c zipaccess.c
@@ -8,5 +5,8 @@ libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
 libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
 
 if HAVE_ZLIB
+if !HAVE_MINIZIP
+SUBDIRS = unzip
+endif
 libvlc_LTLIBRARIES += libzip_plugin.la
 endif



More information about the vlc-commits mailing list