fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
-dnl Check for hal
-PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto])
-
-dnl Check for mtp
-PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto])
-
dnl Check for dbus
AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)])
])
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
-dnl Check for libshout
-PKG_ENABLE_MODULES_VLC([shout], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
-
dnl Lua modules
AC_ARG_ENABLE(lua,
AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface
PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
fi
+if test "${enable_sout}" != "no"; then
+dnl Check for libshout
+PKG_ENABLE_MODULES_VLC([shout], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
+fi
+
dnl
dnl matroska demux plugin
dnl
dnl
dnl twolame encoder plugin
dnl
-AC_ARG_ENABLE(twolame,
-[ --enable-twolame twolame codec (default disabled)])
-if test "${enable_twolame}" = "yes"
-then
- AC_ARG_WITH(twolame-tree,
- [ --with-twolame-tree=PATH twolame tree for static linking])
- if test -n "${with_twolame_tree}"
- then
- AC_MSG_CHECKING(for libtwolame.a in ${with_twolame_tree})
- real_twolame_tree="`cd ${with_twolame_tree} 2>/dev/null && pwd`"
- if test -z "${real_twolame_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_twolame_tree}])
- fi
- if test -f "${real_twolame_tree}/libtwolame/.libs/libtwolame.a"
- then
- dnl Use a custom twolame
- AC_MSG_RESULT(${real_twolame_tree}/libtwolame/.libs/libtwolame.a)
- VLC_ADD_PLUGIN([twolame])
- VLC_ADD_LIBS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a])
- VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/libtwolame -DLIBTWOLAME_STATIC])
- else
- dnl The given libtwolame wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_twolame_tree}/libtwolame/.libs/libtwolame.a, make sure you compiled libtwolame in ${with_twolame_tree}])
- fi
- else
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_twolame} -DLIBTWOLAME_STATIC"
- LDFLAGS="${LDFLAGS_save} ${LIBS_twolame}"
- AC_CHECK_HEADERS(twolame.h, ,
- [ AC_MSG_ERROR([Cannot find development header for libtwolame...]) ])
- AC_CHECK_LIB(twolame, twolame_init, [
- VLC_ADD_PLUGIN([twolame])
- VLC_ADD_CPPFLAGS([twolame],[-DLIBTWOLAME_STATIC])
- VLC_ADD_LIBS([twolame],[-ltwolame]) ],
- [ AC_MSG_ERROR([Cannot find libtwolame library...]) ])
- LDFLAGS="${LDFLAGS_save}"
- CPPFLAGS="${CPPFLAGS_save}"
- fi
-fi
+PKG_ENABLE_MODULES_VLC([twolame], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC])
dnl
dnl QuickTime plugin
AC_ARG_ENABLE(libass,
[ --enable-libass Subtitle support using libass (default disabled)])
AS_IF( [test "${enable_libass}" = "yes"], [
- PKG_CHECK_MODULES(LIBASS, libass >= 0.9.5,
+ PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6,
[
VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
])
])
-dnl
-dnl Check for the Xinerama extension
-dnl
-AC_ARG_ENABLE(xinerama,
- [ --enable-xinerama Xinerama support (default enabled)],, [
- enable_xinerama="$enable_xvideo"
-])
-AS_IF([test "$enable_xinerama" != "no"], [
- ac_cv_have_xinerama="no"
- CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
- AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
- AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[
- VLC_ADD_LIBS([xvideo],[-lXinerama_pic])
- VLC_ADD_LIBS([x11],[-lXinerama_pic])
- VLC_ADD_LIBS([glx],[-lXinerama_pic])
- VLC_ADD_LIBS([xvmc],[-lXinerama_pic])
- ac_cv_have_xinerama="yes"
- ],[
- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
- VLC_ADD_LIBS([xvideo],[-lXinerama])
- VLC_ADD_LIBS([x11],[-lXinerama])
- VLC_ADD_LIBS([glx],[-lXinerama])
- VLC_ADD_LIBS([xvmc],[-lXinerama])
- ac_cv_have_xinerama="yes"
- ])
- ])
- ])
- if test "${ac_cv_have_xinerama}" = "yes"; then
- AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed])
- fi
-
-dnl
-dnl Check for XF86VidMode extension
-dnl
- ac_cv_have_xf86vidmode="no"
- AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[
- AC_CHECK_LIB(Xxf86vm_pic, XF86VidModeGetViewPort,[
- VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic])
- VLC_ADD_LIBS([x11],[-lXxf86vm_pic])
- VLC_ADD_LIBS([glx],[-lXxf86vm_pic])
- VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic])
- ac_cv_have_xf86vidmode="yes"
- ],[
- AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[
- VLC_ADD_LIBS([xvideo],[-lXxf86vm])
- VLC_ADD_LIBS([x11],[-lXxf86vm])
- VLC_ADD_LIBS([glx],[-lXxf86vm])
- VLC_ADD_LIBS([xvmc],[-lXxf86vm])
- ac_cv_have_xf86vidmode="yes"
- ])
- ])
- ],[true],
-[#ifdef HAVE_X11_XLIB_H
-# include <X11/Xlib.h>
-#endif]
- )
- AS_IF([test "${ac_cv_have_xf86vidmode}" = "yes"],
- [AC_DEFINE(HAVE_XF86VIDMODE, 1, [Define this if you have libXxf86vm installed])
- ])
- CFLAGS="${CFLAGS_save}"
-])
-
dnl End of Xlib tests
CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_PLUGIN([freetype])
have_freetype=yes
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
- VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([skins2],[-lxml2])
- VLC_ADD_LIBS([freetype],[-liconv])
+ VLC_ADD_LIBS([freetype],[-liconv -lz])
fi
+ VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${enable_fontconfig}" != "no"
then
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
fi
+
+ dnl fribidi support
+ if test "${enable_fribidi}" != "no"
+ then
+ PKG_CHECK_MODULES(FRIBIDI, fribidi, [
+ VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
+ VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
+ ])
+ fi
+
],[
have_freetype=no
AS_IF([ test "${enable_freetype}" = "yes"],[
])
])
- dnl fribidi support
- if test "${enable_fribidi}" != "no"
- then
- PKG_CHECK_MODULES(FRIBIDI, fribidi, [
- VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
- VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
- ])
- fi
fi
dnl
dnl
dnl Bonjour services discovery
-dnl
PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto])
+dnl
+dnl HAL services discovery
+PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto])
+
+dnl
+dnl MTP devices services discovery
+PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto])
+
dnl
dnl Lirc plugin
dnl
-PKG_ENABLE_MODULES_VLC([lirc], [], [liblircclient0], [lirc support], [auto])
+AC_ARG_ENABLE(lirc,
+ [ --enable-lirc lirc support (default disabled)])
+if test "${enable_lirc}" = "yes"
+then
+ AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false")
+ if test "${have_lirc}" = "true"
+ then
+ VLC_ADD_PLUGIN([lirc])
+ VLC_ADD_LIBS([lirc],[-llirc_client])
+ fi
+fi
AC_ARG_WITH(,[Misc options:])