])
LIBS="$LIBS_save"
AS_IF([test -n "$SOCKET_LIBS"], [
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
])
AC_SUBST(SOCKET_LIBS)
[Paths where to find .pc not at the default location])
PKG_PROG_PKG_CONFIG()
-dnl On some OS we need static linking
+dnl On some OS we need static linking
AS_IF([test -n "${PKG_CONFIG}" ],[
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" ],[
PKG_CONFIG="${PKG_CONFIG} --static"
then
VLC_ADD_LIBS([access_http mp4 skins2 sap mkv unzip zip],[-lz])
PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
- AC_CHECK_HEADERS([unzip.h], [
+ AC_CHECK_HEADERS([unzip.h], [
have_minizip=yes
MINIZIP_LIBS="-lminizip -lz"
], [
[ --enable-growl growl notification plugin (default disabled)],,
[enable_growl=no])
AS_IF([test "${enable_growl}" != "no"], [
- VLC_ADD_PLUGIN([growl_udp])
AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [
VLC_ADD_PLUGIN([growl])
VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation])
AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
lternatively you can use --disable-live555 to disable the liveMedia plugin.])
],[
- AC_MSG_RESULT([yes])
- ])
+ AC_MSG_RESULT([yes])
+ ])
])
VLC_ADD_PLUGIN([live555])
AC_MSG_RESULT(no)
if test "${enable_live555}" = "yes"; then
AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
- fi
+ fi
fi
fi
fi
[navigate VCD with libvcdinfo (default disabled)])])
if test "${enable_vcdx}" = "yes"
then
- PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72],
- [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])],
- [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])])
- PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
- [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])],
- [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])])
+ PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72],
+ [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])],
+ [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])])
+ PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
+ [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])],
+ [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])])
VLC_ADD_PLUGIN([vcdx])
fi
dnl
dnl SIDPlay plugin
dnl
-PKG_WITH_MODULES([SID], [libsidplay2],
- AC_LANG_PUSH(C++)
- oldCPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SID_CFLAGS"
- AC_CHECK_HEADER([sidplay/builders/resid.h], [
- VLC_ADD_PLUGIN([sid])
- VLC_ADD_CFLAGS([sid], [$SID_CFLAGS])
- VLC_ADD_LIBS([sid], [$SID_LIBS] [-lresid-builder])
- ], [
- AS_IF([test "x${enable_sid}" = "xyes"],
- [AC_MSG_ERROR(Library libresid-builder needed for sid was not found)],
- [AC_MSG_WARN(Library libresid-builder needed for sid was not found)]
- )
- ])
- CPPFLAGS="$oldCPPFLAGS"
- AC_LANG_POP(C++),
- AS_IF([test "x${enable_sid}" = "xyes"],
- [AC_MSG_ERROR(Library libsidplay2 needed for sid was not found)],
- [AC_MSG_WARN(Library libsidplay2 needed for sid was not found)]
- ),
- [C64 sid demux support], [auto])
+AC_ARG_ENABLE(sid,
+ [AS_HELP_STRING([--enable-sid],[C64 sid demux support (default auto)])])
+AS_IF([test "${enable_sid}" != "no"], [
+ PKG_CHECK_MODULES(SID, [libsidplay2], [
+ AC_LANG_PUSH(C++)
+ oldCPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SID_CFLAGS"
+ AC_CHECK_HEADER([sidplay/builders/resid.h], [
+ VLC_ADD_PLUGIN([sid])
+ VLC_ADD_CFLAGS([sid], [$SID_CFLAGS])
+ VLC_ADD_LIBS([sid], [$SID_LIBS] [-lresid-builder])
+ ], [
+ AS_IF([test "x${enable_sid}" = "xyes"],
+ [AC_MSG_ERROR(Library libresid-builder needed for sid was not found)],
+ [AC_MSG_WARN(Library libresid-builder needed for sid was not found)]
+ )
+ ])
+ CPPFLAGS="$oldCPPFLAGS"
+ AC_LANG_POP(C++)
+ ], [
+ AS_IF([test "x${enable_sid}" = "xyes"],
+ [AC_MSG_ERROR(Library libsidplay2 needed for sid was not found)],
+ [AC_MSG_WARN(Library libsidplay2 needed for sid was not found)]
+ )
+ ])
+])
dnl
VLC_ADD_LIBS([omxil], [$LIBDL])
fi
+dnl
+dnl iomx codec plugin
+dnl
+AC_ARG_ENABLE(iomx,
+ [ --enable-iomx iomx codec module (default disabled)])
+if test "${enable_iomx}" = "yes"
+then
+ CPPFLAGS_save="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${srcdir}/modules/codec/omxil" # For the OMX headers
+ AC_LANG_PUSH([C++])
+ AC_CHECK_HEADER(media/stagefright/OMXClient.h, [
+ VLC_ADD_PLUGIN([iomx])
+ VLC_ADD_CXXFLAGS([iomx], [-fno-exceptions -fno-rtti])
+ VLC_ADD_LIBS([iomx], [-lstagefright -lmedia -lutils -lbinder])
+ ], [
+ AC_MSG_ERROR("Could not find IOMX headers")
+ ])
+ AC_LANG_POP([C++])
+ CPPFLAGS="${CPPFLAGS_save}"
+fi
+
dnl
dnl CrystalHD codec plugin
dnl
AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
echo "VAAPI acceleration activated"
],[
- AS_IF([test "${enable_libva}" = "yes"],
- [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+ AS_IF([test "${enable_libva}" = "yes"],
+ [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
[AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
])
VLC_RESTORE_FLAGS
],[
- AS_IF([test "${enable_libva}" = "yes"],
+ AS_IF([test "${enable_libva}" = "yes"],
[AC_MSG_ERROR([Could not find required libva.])],
[AC_MSG_WARN([libva not found ])])
])
AS_IF([test "${enable_dxva2}" != "no"], [
if test "${SYS}" = "mingw32"; then
AS_IF([test "x${have_avcodec}" = "xyes"], [
- AC_CHECK_HEADERS(dxva2api.h,
+ AC_CHECK_HEADERS(dxva2api.h,
[
AC_CHECK_HEADERS(libavcodec/dxva2.h, [
VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid])
AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
echo "DxVA2 acceleration activated"
],[
- AS_IF([test "${enable_dxva2}" = "yes"],
- [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+ AS_IF([test "${enable_dxva2}" = "yes"],
+ [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
[AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
])
],[
- AS_IF([test "${enable_dxva2}" = "yes"],
+ AS_IF([test "${enable_dxva2}" = "yes"],
[AC_MSG_ERROR([Could not find required dxva2api.h])],
[AC_MSG_WARN([dxva2api.h not found])])
])
AC_ARG_ENABLE(swscale,
AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion
- (default enabled)]))
+ (default enabled)]))
if test "${enable_swscale}" != "no"
then
PKG_CHECK_MODULES(SWSCALE,[libswscale],
dnl
dnl kate decoder plugin
dnl
-AC_ARG_ENABLE(kate,
-[ --enable-kate kate codec (default enabled)])
-AS_IF([test "${enable_kate}" != "no"], [
- PKG_CHECK_MODULES(KATE,[kate >= 0.1.5], [
- VLC_ADD_PLUGIN([kate])
- VLC_ADD_CFLAGS([kate],[$KATE_CFLAGS])
- VLC_ADD_LIBS([kate],[$KATE_LIBS]) ],[
- AC_CHECK_HEADERS(kate/kate.h, [
- AC_CHECK_LIB(kate, kate_decode_init, [
- VLC_ADD_PLUGIN([kate])
- VLC_ADD_LIBS([kate],[-lkate -logg]) ],[
- AS_IF([test "x${enable_kate}" != "x"], [
- AC_MSG_ERROR([libkate doesn't appear to be installed on your system.
- You also need to check that you have a libogg posterior to the 1.0 release.])
- ])
- ], [-lkate -logg])
- ],[
- AS_IF([test "x${enable_kate}" != "x"], [
- AC_MSG_ERROR([libkate headers do not appear to be installed on your system.
- You also need to check that you have a libogg posterior to the 1.0 release.])
- ])
- ])
- ])
-])
-
+PKG_ENABLE_MODULES_VLC([KATE], [], [kate >= 0.3.0], [kate codec], [auto])
dnl
dnl tiger rendering for kate decoder plugin
dnl
AC_ARG_ENABLE(tiger,
-[ --enable-tiger Tiger rendering library for Kate streams (default enabled)])
+[ --enable-tiger Tiger rendering library for Kate streams (default auto)])
AS_IF([test "${enable_tiger}" != "no"], [
PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])
])
-
dnl
dnl Video plugins
dnl
AS_IF([test "${SYS}" = "mingw32"], [
VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
- VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32])
+ VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32])
], [test "${SYS}" = "darwin"], [
VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
], [
AC_MSG_ERROR([Skins2 interface requires FreeType, libxpm, libxext and libxinerama])
])
+ enable_skins2="no"
+ ], [
+ VLC_ADD_PLUGIN([skins2])
+ ALIASES="${ALIASES} svlc"
])
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
])
AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
])
AS_IF([test "${enable_qt4}" != "no"], [
- PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
+ PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.6.0], [
VLC_ADD_PLUGIN([qt4])
VLC_ADD_LIBS([qt4],[${QT4_LIBS}])
VLC_ADD_CXXFLAGS([qt4],[${QT4_CFLAGS}])
loader=false
AC_ARG_ENABLE(loader,
AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms
- (default disabled)]))
+ (default disabled)]))
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo])
projects / vlc / blobdiff