Commit a2b72dbb authored by Jean-Philippe Andre's avatar Jean-Philippe Andre

Zip: change path to the library in the buildsystem

parent 09904761
......@@ -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
......
......@@ -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
......
# 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
......@@ -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 += \
......
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