Commit 706d4733 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move libs/unzip to modules/access/zip/unzip

parent 2ead0773
......@@ -9,7 +9,7 @@
# - libs/* are needed by modules
BASE_SUBDIRS = po compat src bin modules share doc test
EXTRA_SUBDIRS = m4 \
libs/loader libs/srtp libs/unzip
libs/loader libs/srtp
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
SUBDIRS = po compat src
......@@ -19,11 +19,6 @@ endif
if HAVE_GCRYPT
SUBDIRS += libs/srtp
endif
if HAVE_ZLIB
if !HAVE_MINIZIP
SUBDIRS += libs/unzip
endif
endif
if BUILD_VLC
SUBDIRS += bin
endif
......
......@@ -822,14 +822,12 @@ then
MINIZIP_LIBS="-lminizip -lz"
], [
have_minizip=no
MINIZIP_CFLAGS="-I\\\${top_srcdir}/libs/unzip"
MINIZIP_LIBS="\\\${top_builddir}/libs/unzip/libunzip.la"
MINIZIP_CFLAGS="-I\\\${top_srcdir}/modules/access/zip/unzip"
MINIZIP_LIBS="\\\${top_builddir}/modules/access/zip/unzip/libunzip.la"
])
])
VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS])
VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS])
VLC_ADD_PLUGIN([unzip zip])
VLC_ADD_LIBS([skins2],[$MINIZIP_LIBS])
fi
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
......@@ -4263,7 +4261,6 @@ AC_CONFIG_FILES([
doc/Makefile
libs/loader/Makefile
libs/srtp/Makefile
libs/unzip/Makefile
modules/Makefile
m4/Makefile
po/Makefile.in
......@@ -4283,6 +4280,7 @@ AC_CONFIG_FILES([
modules/access/vcdx/Makefile
modules/access/screen/Makefile
modules/access/zip/Makefile
modules/access/zip/unzip/Makefile
modules/access_output/Makefile
modules/audio_filter/Makefile
modules/audio_mixer/Makefile
......
if !HAVE_MINIZIP
SUBDIRS = unzip
endif
DIST_SUBDIRS = unzip
libzip_plugin_la_SOURCES = zip.h zipstream.c zipaccess.c
libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
if HAVE_ZLIB
SOURCES_zip = \
zip.h \
zipstream.c \
zipaccess.c \
$(NULL)
libvlc_LTLIBRARIES += libzip_plugin.la
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment