]> git.sesse.net Git - vlc/blobdiff - configure.ac
Zip: change path to the library in the buildsystem
[vlc] / configure.ac
index bbfa7142e3367fcdf2f305f88069f5b0c6123365..599927b71f89081fece70b2f4faaa47021eb95d3 100644 (file)
@@ -7,6 +7,8 @@ VERSION_MAJOR="1"
 VERSION_MINOR="0"
 VERSION_REVISION="0"
 VERSION_EXTRA="-git"
+PKGDIR="vlc"
+AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Goldeneye"
@@ -32,6 +34,16 @@ AS_IF([test "x${enable_maintainer_mode}" != "xno"],
        [enable_maintainer_mode="yes"])
 AM_MAINTAINER_MODE
 
+dnl
+dnl Directories
+dnl
+dnl vlcincludedir="\${includedir}/\${PKGDIR}"
+dnl AC_SUBST(vlcincludedir)
+vlcdatadir="\${datadir}/\${PKGDIR}"
+AC_SUBST(vlcdatadir)
+vlclibdir="\${libdir}/\${PKGDIR}"
+AC_SUBST(vlclibdir)
+
 dnl
 dnl  Deprecated options
 dnl  to notify packagers that stuff has changed
@@ -1182,6 +1194,28 @@ if test "${SYS}" != "mingwce"; then
   ALIASES="${ALIASES} rvlc"
 fi
 
+if test "${SYS}" = "mingwce"; then
+  VLC_ADD_PLUGIN([chain])
+  VLC_ADD_PLUGIN([aout_file])
+  VLC_ADD_PLUGIN([linear_resampler])
+  VLC_ADD_PLUGIN([bandlimited_resampler])
+  VLC_ADD_PLUGIN([float32_mixer])
+  VLC_ADD_PLUGIN([spdif_mixer])
+  VLC_ADD_PLUGIN([simple_channel_mixer])
+  VLC_ADD_PLUGIN([headphone_channel_mixer])
+  VLC_ADD_PLUGIN([normvol])
+  VLC_ADD_PLUGIN([converter_float])
+  VLC_ADD_PLUGIN([a52tospdif])
+  VLC_ADD_PLUGIN([dtstospdif])
+  VLC_ADD_PLUGIN([audio_format])
+  VLC_ADD_PLUGIN([i420_yuy2])
+  VLC_ADD_PLUGIN([i422_yuy2])
+  VLC_ADD_PLUGIN([i420_ymga])
+  VLC_ADD_PLUGIN([i422_i420])
+  VLC_ADD_PLUGIN([yuy2_i422])
+  VLC_ADD_PLUGIN([yuy2_i420])
+fi
+
 dnl
 dnl Some plugins aren't useful on some platforms
 dnl
@@ -3205,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,
@@ -5345,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
@@ -5809,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