Revert "ZIP Module - Use the system minizip when available"

This reverts commit 35fa551f95211e9ca4b9b52eb7a73de6b9c94484.

Conflicts:

	configure.ac

diff --git a/Makefile.am b/Makefile.am
index e3a87d269d7a1926ed9db6d31ce93a30483b914d..b60031d7d1c3deb841c28e5900873084fd648f5f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,8 @@ if HAVE_LIBGCRYPT
 SUBDIRS += libs/srtp
 endif
 if HAVE_ZLIB
-if !HAVE_MINIZIP
 SUBDIRS += libs/unzip
 endif
-endif
 if BUILD_VLC
 SUBDIRS += bin
 endif

diff --git a/configure.ac b/configure.ac
index a6d95b278ef96ffdd5f3d34b382db7a3c3381d35..0cbf6af18d1b68bb949259cbda828b90f5df9445 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -550,6 +550,9 @@ AC_CHECK_FUNCS(send,,[
   ])
 ])
 
+AC_CHECK_HEADERS(zlib.h, [
+  VLC_ADD_LIBS([access_http],[-lz])
+])
 
 dnl Check for socklen_t
 AH_TEMPLATE(socklen_t, [Define to `int' if <sys/socket.h> does not define.])
@@ -874,33 +877,6 @@ AC_ARG_VAR(PKG_CONFIG_PATH,
           [Paths where to find .pc not at the default location])
 PKG_PROG_PKG_CONFIG()
 
-dnl
-dnl Check for zlib.h and -lz along with system -lminizip if available
-dnl
-AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
-AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
-if test "${have_zlib}" = "yes"
-then
-  VLC_ADD_LIBS([access_http gme mp4 skins2 sap mkv unzip zip],[-lz])
-  PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
-    AC_CHECK_HEADERS([unzip.h], [
-      have_minizip=yes
-      MINIZIP_LIBS="-lminizip -lz"
-    ], [
-      have_minizip=no
-      MINIZIP_CFLAGS="-I\$(top_builddir)/libs/unzip"
-      MINIZIP_LIBS="\$(top_builddir)/libs/unzip/libunzip.la"
-    ])
-  ])
-  AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
-  VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
-  VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS])
-  VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS])
-  VLC_ADD_PLUGIN([unzip])
-  VLC_ADD_PLUGIN([zip])
-fi
-
-
 dnl Check for hal
 AC_ARG_ENABLE(hal,
   [  --enable-hal            Linux HAL services discovery (default enabled)])
@@ -3001,10 +2977,10 @@ AC_ARG_ENABLE( id3tag,
 [  --disable-id3tag        id3tag metadata reader plugin (default disabled)])
 AS_IF([test "${enable_id3tag}" = "yes"], [
   AC_CHECK_HEADERS(id3tag.h, [
-    if test "${have_zlib}" = "yes"
+    AC_CHECK_HEADERS(zlib.h, [
       VLC_ADD_LIBS([id3tag],[-lid3tag -lz])
       VLC_ADD_PLUGIN([id3tag])
-    fi
+    ])
   ])
 ])
 
@@ -3281,6 +3257,15 @@ if test "${enable_realrtsp}" = "yes"; then
   VLC_ADD_PLUGIN([access_realrtsp])
 fi
 
+dnl
+dnl MP4 module
+dnl
+AC_CHECK_HEADERS(zlib.h, [
+  VLC_ADD_LIBS([mp4 skins2 sap mkv gme],[-lz])
+  VLC_ADD_CPPFLAGS([skins2],[-I../../../@top_srcdir@/libs/unzip])
+  VLC_ADD_LIBS([skins2],[../../../libs/unzip/libunzip.la])
+] )
+
 AC_ARG_ENABLE(libsysfs,
   [  --enable-libsysfs       Get user key from firewire connected iPod via libsysfs (default enabled)])
 
@@ -5426,6 +5411,21 @@ then
 fi
 
 
+dnl
+dnl ZIP files demuxer
+dnl
+AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
+AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
+if test "${have_zlib}" = "yes"
+then
+  VLC_ADD_PLUGIN([unzip])
+  VLC_ADD_LIBS([zip],[-lz])
+  VLC_ADD_PLUGIN([zip])
+  VLC_ADD_CFLAGS([zip],[-I../../../@top_srcdir@/libs/unzip])
+  VLC_ADD_LIBS([zip],[../../../libs/unzip/libunzip.la])
+fi
+
+
 dnl
 dnl  Endianness check
 dnl

diff --git a/modules/access/zip/Modules.am b/modules/access/zip/Modules.am
index b8b1f9ac0f89851943c17838a9a527f719ad7713..303c29f2066cf2c3a96232e5523f852a089f6a69 100644 (file)
--- a/modules/access/zip/Modules.am
+++ b/modules/access/zip/Modules.am
@@ -1,6 +1,5 @@
 if HAVE_ZLIB
 SOURCES_zip = \
-       zip.h \
        zipstream.c \
        zipaccess.c \
        $(NULL)