[CFLAGS="${CFLAGS_save} -fomit-frame-pointer"
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test "${ac_cv_c_omit_frame_pointer}" != "no"; then
+ if test "${SYS}" != "darwin"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
+ else
+ dnl On darwin we explicitely disable it.
+ CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fno-omit-frame-pointer"
+ fi
fi
dnl Check for Darwin plugin linking flags
VLC_ADD_PLUGIN([blendbench])
VLC_ADD_PLUGIN([blend])
VLC_ADD_PLUGIN([scale])
-VLC_ADD_PLUGIN([image])
VLC_ADD_PLUGIN([vmem])
VLC_ADD_PLUGIN([logo])
VLC_ADD_PLUGIN([magnify])
VLC_ADD_PLUGIN([audioscrobbler])
])
-dnl
-dnl Musicbrainz plugin
-dnl
-AC_ARG_ENABLE(musicbrainz,
- [ --enable-musicbrainz MusicBrainz support (default disabled) ])
- AS_IF([test "${enable_musicbrainz}" = "yes"],[
- PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
- [ VLC_ADD_PLUGIN([musicbrainz])
- VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS])
- VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ],
- [AC_MSG_WARN(MusicBrainz library not found)])
- ])
-
-
dnl
dnl Taglibplugin
dnl
dnl
AC_ARG_ENABLE(dvbpsi,
[ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)])
+have_dvbpsi=no
if test "${enable_dvbpsi}" != "no"
then
AC_ARG_WITH(dvbpsi,
if test "${enable_sout}" != "no"; then
VLC_ADD_PLUGIN([mux_ts])
fi
- VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi]) ],
+ VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi])
+ have_dvbpsi=yes],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#if defined( HAVE_STDINT_H )
# include <stdint.h>
fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src])
VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a])
+ have_dvbpsi=yes
else
dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no)
fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
-
+ have_dvbpsi=yes
],[
if test -n "${enable_dvbpsi}"
then
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
fi
- AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
+ if test "${enable_alsa}" != "no"
+ then
+ AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
+ fi
+
if test "${have_v4l2_alsa}" = "true"
then
CFLAGS="${CFLAGS_save}"
if test "${enable_dvb}" != "no"
then
- AC_ARG_WITH(dvb,
- [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
- if test "${with_dvb}" != "no" -a -n "${with_dvb}"
- then
- VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
- fi
- CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include"
- AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
- VLC_ADD_PLUGIN([dvb])
- ],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)])
- CPPFLAGS="${CPPFLAGS_save}"
+ AS_IF([test "${have_dvbpsi}" = "yes" ],[
+ AC_ARG_WITH(dvb,
+ [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
+ if test "${with_dvb}" != "no" -a -n "${with_dvb}"
+ then
+ VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
+ fi
+ CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include"
+ AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
+ VLC_ADD_PLUGIN([dvb])
+ ],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)])
+ CPPFLAGS="${CPPFLAGS_save}"
+ ],[
+ AC_MSG_WARN([the dvb access module requires libdvbpsi])
+ ])
fi
dnl
dnl skins2 module
dnl
AC_ARG_ENABLE(libtar,
- [ --enable-libtar support for skins2 (default enabled)])
+ [ --enable-libtar libtar support for skins2 (default enabled)])
AS_IF([test "${enable_libtar}" != "no"],[
AC_CHECK_HEADERS(libtar.h, [
dnl schroedinger decoder plugin (for dirac format video)
dnl
AC_ARG_ENABLE(schroedinger,
-[ --disable-schroedinger high performance dirac codec (default enabled)])
+[ --disable-schroedinger high performance dirac codec (default enabled)])
if test "${enable_schroedinger}" != "no"; then
PKG_CHECK_MODULES(SCHROEDINGER,[schroedinger-1.0 >= 1.0], [
VLC_ADD_PLUGIN([schroedinger])
libzvbi (default enabled)]))
AC_ARG_ENABLE(telx,
AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with
- zvbi) (default disabled)]))
+ zvbi) (default enabled if zvbi is absent)]))
AS_IF( [test "${enable_zvbi}" != "no"],[
- AS_IF( [test "${enable_telx}" = "yes"],[
- AC_MSG_ERROR([The zvbi and telx modules are uncompatibles. Disable the other if you enable one.])
- ],[
PKG_CHECK_MODULES(ZVBI,
zvbi-0.2 >= 0.2.25,
[
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGIN([zvbi])
AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
+ AS_IF( [test "${enable_telx}" = "yes"],[
+ AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
+ Using zvbi.])
+ ])
],[
AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
- enable_telx="yes"
])
])
- ])
-AS_IF( [test "${enable_telx}" = "yes"],[
+AS_IF( [test "${enable_telx}" != "no" ],[
VLC_ADD_PLUGIN([telx])
])
dnl libass subtitle rendering module
dnl
AC_ARG_ENABLE(libass,
- [ --enable-libass Subtitle support using libass (default disabled)])
+ [ --enable-libass Subtitle support using libass (default disabled)])
AS_IF( [test "${enable_libass}" = "yes"], [
PKG_CHECK_MODULES(LIBASS, libass >= 0.9.5,
[
[ --enable-freetype freetype support (default enabled)])
AC_ARG_ENABLE(fribidi,
[ --enable-fribidi fribidi support (default enabled)])
+AC_ARG_ENABLE(fontconfig,
+ [ --enable-fontconfig, fontconfig support (default enabled)])
if test "${enable_freetype}" != "no"
then
PKG_CHECK_MODULES(FREETYPE, freetype2,[
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype],[-liconv])
fi
- AC_CHECK_HEADERS(fontconfig/fontconfig.h,
- [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
- VLC_ADD_LIBS([freetype],[-lfontconfig])])
- AC_CHECK_HEADERS(Carbon/Carbon.h,
- [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
+ if test "${enable_fontconfig}" != "no"
+ then
+ AC_CHECK_HEADERS(fontconfig/fontconfig.h,
+ [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
+ VLC_ADD_LIBS([freetype],[-lfontconfig])])
+ AC_CHECK_HEADERS(Carbon/Carbon.h,
+ [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
+ fi
],[
have_freetype=no
AS_IF([ test "${enable_freetype}" = "yes"],[
[ --enable-ggi GGI support (default disabled)])
if test "${enable_ggi}" = "yes"
then
- VLC_ADD_PLUGIN([ggi])
- VLC_ADD_LIBS([ggi],[-lggi])
- AC_ARG_WITH(ggi,
- [ --with-ggi=PATH path to libggi],
- [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
- then
- VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
- VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
- fi ])
+ AC_CHECK_HEADER([ggi/ggi.h],[
+ VLC_ADD_PLUGIN([ggi])
+ VLC_ADD_LIBS([ggi],[-lggi])
+ AC_ARG_WITH(ggi,
+ [ --with-ggi=PATH path to libggi],
+ [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
+ then
+ VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
+ VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
+ fi ])
+ ],[
+ AC_MSG_ERROR([LibGGI development files can't be found])
+ ])
fi
dnl
(default disabled)]))
AC_ARG_WITH(mozilla-sdk-path,
[ --with-mozilla-sdk-path=PATH path to mozilla sdk])
+AC_ARG_WITH(mozilla-pkg,
+ [ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.])
AC_LANG_PUSH(C++)
if test "${enable_mozilla}" = "yes"
then
found=1
else
if test -n "$PKG_CONFIG"; then
- for i in seamonkey iceape xulrunner firefox iceweasel mozilla; do
- echo "Trying to find $i .pc files" >&5
- i="${i}-xpcom ${i}-plugin"
+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+ echo "Trying to find $i.pc files" >&5
if $PKG_CONFIG --exists --print-errors "$i" 2>&5
then
- echo "Using $i .pc files." >&5
- echo "Using $i .pc files." >&6
+ echo "Using $i.pc files." >&5
+ echo "Using $i.pc files." >&6
found=1
MOZILLA_CFLAGS=$( $PKG_CONFIG --cflags "$i" )
MOZILLA_LIBS=$( $PKG_CONFIG --libs "$i" )
AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1
- AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
fi
MOZILLA_REQUIRED_HEADERS=
mozilla=:
- AC_EGREP_CPP(yes,
- [#include <mozilla-config.h>
- #ifdef MOZ_X11
- yes
- #endif],
- [AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
- VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
- ])
- VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
- VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS}])
+ AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"],[
+ VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX -DOJI])
+ AS_IF([ test "${SYS}" != "darwin"],[
+ PKG_CHECK_MODULES(XPM, [xpm xt],[
+ VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
+ ],[
+ AC_MSG_ERROR([Please install the libXpm and libXt development files.])
+ ])
+ ])
+ ])
+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
+ VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS} ${XPM_LIBS}])
VLC_ADD_PLUGIN([mozilla])
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
MOZILLA_CONFIG=
modules/demux/asf/Makefile
modules/demux/avformat/Makefile
modules/demux/avi/Makefile
+ modules/demux/mkv/Makefile
modules/demux/mp4/Makefile
modules/demux/mpeg/Makefile
modules/demux/playlist/Makefile
projects / vlc / blobdiff