Zip: change path to the library in the buildsystem

diff --git a/Makefile.am b/Makefile.am
index 1ed65f28d1926cd81fc7b90a8c9950f496f1a785..33dc7ef85f252e22b59251e135b249c47f2e6ecc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 BASE_SUBDIRS = po src bin modules share doc test
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
-       libs/loader libs/srtp \
+       libs/loader libs/srtp libs/unzip \
        projects/mozilla projects/activex
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
@@ -20,6 +20,9 @@ endif
 if HAVE_LIBGCRYPT
 SUBDIRS += libs/srtp
 endif
+if HAVE_ZLIB
+SUBDIRS += libs/unzip
+endif
 if BUILD_VLC
 SUBDIRS += bin
 endif

diff --git a/configure.ac b/configure.ac
index 3f956165366bebb60836783609486a57c8086e07..599927b71f89081fece70b2f4faaa47021eb95d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3239,6 +3239,8 @@ 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,
@@ -5379,6 +5381,18 @@ then
   AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
 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])
+fi
+
+
 dnl
 dnl  Endianness check
 dnl
@@ -5843,6 +5857,7 @@ AC_CONFIG_FILES([
   extras/package/ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile
+  libs/unzip/Makefile
   modules/Makefile
   projects/mozilla/Makefile
   m4/Makefile

diff --git a/libs/unzip/Makefile.am b/libs/unzip/Makefile.am
new file mode 100644 (file)
index 0000000..3d7e252
--- /dev/null
+++ b/libs/unzip/Makefile.am
@@ -0,0 +1,16 @@
+# Makefile to build the unzip library files
+#
+# By Jean-Philippe André <jpeg@videolan.org>
+# $Id$
+#
+# All other files in this directory (and subdirectories) are copyrighted
+# by their respective owner(s).
+#
+
+noinst_LTLIBRARIES = libunzip.la
+
+noinst_HEADERS = unzip.h crypt.h ioapi.h
+
+libunzip_la_SOURCES = unzip.c ioapi.c
+libunzip_la_LIBADD = -lz
+

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index 934f73f735f4282341e759f5968fcca2d22c6f5a..b975e1a13a07db32c903003d7adbaec8d6958cb0 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -183,12 +183,7 @@ SOURCES_skins2 = \
        vars/time.cpp \
        vars/time.hpp \
        vars/volume.cpp \
-       vars/volume.hpp \
-    unzip/crypt.h \
-       unzip/ioapi.c \
-       unzip/ioapi.h \
-       unzip/unzip.c \
-       unzip/unzip.h
+       vars/volume.hpp
 
 if HAVE_WIN32
 SOURCES_skins2 += \