AM_INIT_AUTOMAKE(tar-ustar)
AM_CONFIG_HEADER(config.h)
+# Disable with "./configure --disable-silent-rules" or "make V=1"
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+
dnl Too many people are not aware of maintainer mode:
dnl If you want to use it, you definitely know what you are doing, so
dnl you can specify "--disable-maintainer-mode". But if you want the default
echo " Assuming --enable-vcdx"
enable_caca="yes"
echo " Assuming --enable-caca"
- enable_goom="yes"
- echo " Assuming --enable-goom"
enable_ncurses="yes"
echo " Assuming --enable-ncurses"
enable_twolame="yes"
echo " Assuming --enable-twolame"
enable_realrtsp="yes"
echo " Assuming --enable-realrtsp"
- enable_update_check="yes"
- echo " Assuming --enable-update-check"
enable_libass="yes"
echo " Assuming --enable-libass"
enable_asademux="yes"
[#ifdef WIN32
yes
#endif],
- SYS=mingw32, SYS=cygwin)
+ SYS=mingw32, AC_MSG_ERROR([VLC requires -mno-cygwin]))
;;
esac
VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
- VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm])
+ VLC_ADD_LIBS([cdda vcdx cddax sdl_image aout_sdl vout_sdl],[-lwinmm])
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi],[-lws2_32])
VLC_ADD_LIBS([access_file], [-lshlwapi])
+ dnl
+ dnl DEP and ASLR options
+ dnl
+ AC_ARG_ENABLE(peflags,
+ [ --enable-peflags peflags use (default enabled)])
+ if test "${enable_peflags}" != "no"
+ then
+ AC_CHECK_TOOL(PEFLAGS, peflags, :)
+ fi
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 telnet],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
*nto*)
SYS=nto
- VLC_ADD_LIBS([x11 xvideo],[-lsocket])
;;
solaris*)
SYS=solaris
- # _POSIX_PTHREAD_SEMANTICS is needed to get the POSIX ctime_r
- # Perhaps it is useful other places as well?
- CFLAGS_save="${CFLAGS_save} -D_POSIX_PTHREAD_SEMANTICS"; CFLAGS="${CFLAGS_save}"
;;
hpux*)
SYS=hpux
AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
+AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"])
dnl
dnl Sadly autoconf doesn't think about testing foo.exe when ask to test
then
AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,,
- [VLC_ADD_LIBS([libvlccore gtk],[-lmingwex])])
+ [VLC_ADD_LIBS([libvlccore],[-lmingwex])])
)
fi
dnl
dnl Buggy glibc prevention. Purposedly not cached.
+dnl See sourceware.org bugs 5058 and 5443.
dnl Ubuntu alone has 20 bug numbers for this...
dnl
AC_MSG_CHECKING(for buggy GNU/libc versions)
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r lrintf daemon fork lstat posix_fadvise posix_madvise uselocale])
-AC_FUNC_ALLOCA
+AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale])
AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
AC_CHECK_FUNCS([stricmp strnicmp])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([vmsplice fstatfs])
+AC_CHECK_FUNCS([vmsplice eventfd fstatfs])
AH_BOTTOM([#include <vlc_fixups.h>])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo galaktos opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm])
AC_CHECK_LIB(m,round,[
VLC_ADD_LIBS([dbus],[-lm])
])
-AC_CHECK_LIB(mx,sqrtf,[
- VLC_ADD_LIBS([x264],[-lmx])
+AC_CHECK_LIB(m,sqrtf,[
+ VLC_ADD_LIBS([x264],[-lm])
])
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+AC_CHECK_LIB(m,lrintf, [
+ AC_DEFINE(HAVE_LRINTF, 1, [Define to 1 if you have the lrintf function])
+ VLC_ADD_LIBS([skins2],[-lm])
+])
+
dnl Check for dynamic plugins
ac_cv_have_plugins=no
# Win32 style
if test "${ac_cv_have_plugins}" = "no"; then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+ if test "${SYS}" = "mingw32" ; then
AC_CHECK_LIB(kernel32, main,
[VLC_ADD_LIBS([libvlccore],[-lkernel32])
AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary])
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore realaudio realvideo],[-ldl]),
+ VLC_ADD_LIBS([libvlccore realaudio realvideo lua],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore],[-lsvld]))))
])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
-AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h])
+AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for poll
AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])], [
-if test ${SYS} != "mingw32"
+if test ${SYS} != "mingw32" -a ${SYS} != "mingwce"
then
AC_MSG_WARN([Your platform does not support poll(). VLC has it's own poll() implementation, but it is only intended to be used on Windows. VLC might crash or be insecure when you see this message. Either switch to an OS with a proper poll() implementation, or implement one for your OS in VLC])
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)])
;;
esac
-dnl Build the gtk_main plugins?
-NEED_GTK_MAIN=no
-NEED_GNOME_MAIN=no
-NEED_GTK2_MAIN=no
-NEED_GNOME2_MAIN=no
-
dnl build the qte plugin ?
NEED_QTE_MAIN=no
fi
CFLAGS="${CFLAGS_save}"
-RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
-RDC_PROG_CC_FLAGS_IFELSE([-pipe])
+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
+RDC_PROG_CC_FLAGS([-pipe])
+
+AC_ARG_ENABLE(warnings-as-error,
+ AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default in debug)]),, [enable_warnings_as_error="$enable_debug"])
+AS_IF([test "${enable_warnings_as_error}" = "yes"], [
+ RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \
+ missing-braces nonnull parentheses uninitialized address enum-compare undef comment switch \
+ bad-function-cast implicit sequence-point strict-aliasing array-bounds missing-parameter-type \
+ overflow int-to-pointer-cast pointer-to-int-cast div-by-zero overflow ignored])
+])
+AC_SUBST(CFLAGS_WERROR)
dnl Check for various optimization flags
AC_CACHE_CHECK([if \$CC accepts -Os],
AC_CACHE_CHECK([for __attribute__((packed))],
[ac_cv_c_attribute_packed],
[ac_cv_c_attribute_packed=no
- AC_TRY_COMPILE(, [struct __attribute__((__packed__)) foo { int a; } b;],
+ AC_TRY_COMPILE(, [struct __attribute__((__packed__)) foo { int a; } b; (void)b;],
[ac_cv_c_attribute_packed=yes])])
if test "${ac_cv_c_attribute_packed}" != "no"; then
AC_DEFINE(HAVE_ATTRIBUTE_PACKED, 1, Support for __attribute__((packed)) for structs)
VLC_ADD_PLUGIN([podcast])
VLC_ADD_PLUGIN([shout])
VLC_ADD_PLUGIN([sap])
+ VLC_ADD_PLUGIN([mediadirs])
VLC_ADD_PLUGIN([fake])
VLC_ADD_PLUGIN([folder])
VLC_ADD_PLUGIN([rss])
VLC_ADD_PLUGIN([equalizer])
VLC_ADD_PLUGIN([param_eq])
VLC_ADD_PLUGIN([scaletempo])
- VLC_ADD_PLUGIN([converter_float])
VLC_ADD_PLUGIN([a52tospdif])
VLC_ADD_PLUGIN([dtstospdif])
- VLC_ADD_PLUGIN([audio_format])
ALIASES="${ALIASES} rvlc"
fi
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])
fi
if test "${SYS}" = "darwin"; then
VLC_ADD_PLUGIN([quartztext])
- VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,Carbon,-framework,ApplicationServices])
+ VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices])
fi
dnl
dnl We need support for -mmmx, we need <emmintrin.h>, and we also need a
dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
AC_ARG_ENABLE(sse,
-[ --disable-sse disable SSE (1 and 2) optimizations (default auto)]
+[ --disable-sse disable SSE (1, 2, 3 and 4) optimizations (default auto)]
,, [
case "${host_cpu}" in
i686|x86_64)
VLC_ADD_PLUGIN([i420_yuy2_sse2])
VLC_ADD_PLUGIN([i422_yuy2_sse2])
])
+
+ # SSE3
+ AC_CACHE_CHECK([if $CC groks SSE3 inline assembly],
+ [ac_cv_sse3_inline],
+ [CFLAGS="${CFLAGS_save} -O -msse3"
+ AC_TRY_COMPILE(,[void *p;asm volatile("movsldup %%xmm1,%%xmm0"::"r"(p));],
+ ac_cv_sse3_inline=yes, ac_cv_sse3_inline=no)
+ ARCH="${ARCH} sse3"
+ ])
+ AS_IF([test "${ac_cv_sse3_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE3, 1,
+ [Define to 1 if SSE3 inline assembly is available.]) ])
+ # SSSE3
+ AC_CACHE_CHECK([if $CC groks SSSE3 inline assembly],
+ [ac_cv_ssse3_inline],
+ [CFLAGS="${CFLAGS_save} -O -mssse3"
+ AC_TRY_COMPILE(,[void *p;asm volatile("pabsw %%xmm0,%%xmm0"::"r"(p));],
+ ac_cv_ssse3_inline=yes, ac_cv_ssse3_inline=no)
+ ARCH="${ARCH} ssse3"
+ ])
+
+ AS_IF([test "${ac_cv_ssse3_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSSE3, 1,
+ [Define to 1 if SSSE3 inline assembly is available.]) ])
+
+ # SSE4
+ AC_CACHE_CHECK([if $CC groks SSE4 inline assembly],
+ [ac_cv_sse4_inline],
+ [CFLAGS="${CFLAGS_save} -O -msse4"
+ AC_TRY_COMPILE(,[void *p;asm volatile("pmaxsb %%xmm1,%%xmm0"::"r"(p));],
+ ac_cv_sse4_inline=yes, ac_cv_sse4_inline=no)
+ ARCH="${ARCH} sse4"
+ ])
+ AS_IF([test "${ac_cv_sse4_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4, 1,
+ [Define to 1 if SSE4 inline assembly is available.]) ])
])
AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly],
VLC_ADD_PLUGIN([memcpy3dn])
])
+
+AC_ARG_ENABLE(neon,
+[ --disable-neon disable NEON optimizations (default auto)],, [
+ AS_IF([test "${host_cpu}" = "arm"], [enable_neon="yes"] ,[enable_neon="no"])
+])
+AS_IF([test "${enable_neon}" != "no"], [
+ AC_CACHE_CHECK([if $CC groks NEON inline assembly], [ac_cv_neon_inline], [
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM(,[[asm volatile("vqmovun.s64 d0, q1":::"d0");]])
+ ], [
+ ac_cv_neon_inline="yes"
+ ], [
+ ac_cv_neon_inline="no"
+ ])
+ ])
+])
+AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" = "yes"])
+
AC_ARG_ENABLE(altivec,
[ --disable-altivec disable AltiVec optimizations (default auto)],, [
AS_IF([test "${host_cpu}" = "powerpc"],
])
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
AC_CHECK_LIB( lua , luaL_newstate,
[LUA_LIBS="-llua"],
[ have_lua=no
- AC_MSG_WARN([lua >= 5.1 not found!])
- ])
+ AS_IF([test "x${enable_lua}" = "xyes"],
+ [AC_MSG_ERROR([lua >= 5.1 not found!])],
+ [AC_MSG_WARN([lua >= 5.1 not found!])])
+ ], [-lm])
)
)
])
dnl
dnl libproxy support
dnl
-PKG_ENABLE_MODULES_VLC([LIBPROXY], [], [libproxy-1.0], [libproxy support], [auto])
+AC_ARG_ENABLE(libproxy,
+ [ --enable-libproxy libproxy support (default auto)])
+AS_IF([test "${enable_libproxy}" != "no"], [
+ PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
+ AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available])
+ VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS])
+ VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS])
+ ], [
+ AS_IF([test "x${enable_libproxy}" != "x"], [
+ AC_MSG_ERROR([libproxy could not be found on your system])
+ ])
+ ])
+])
dnl
[ --enable-dshow Win32 DirectShow support (default enabled on Win32)])
if test "${enable_dshow}" != "no"
then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ if test "${SYS}" = "mingw32"
then
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(dshow.h,
enabled on Win32)]))
if test "${enable_bda}" != "no"
then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ if test "${SYS}" = "mingw32"
then
AC_CHECK_HEADERS(dshow.h,
[ VLC_ADD_PLUGIN([bda])
then
AC_ARG_WITH(opencv-tree,
[ --with-opencv-tree=PATH opencv tree for linking])
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ if test "${SYS}" = "mingw32"
then
test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
AC_MSG_CHECKING(for opencv in ${with_opencv_tree})
VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
AC_LANG_POP(C++)
- else
+ else
dnl No opencv could be found, sorry
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
- fi
+ fi
else
PKG_CHECK_MODULES(OPENCV, opencv,
[
then
AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
fi
- ])
+ ],
+ [#if defined( HAVE_STDINT_H )
+# include <stdint.h>
+#elif defined( HAVE_INTTYPES_H )
+# include <inttypes.h>
+#endif
+#include <dvbpsi/dvbpsi.h>
+#include <dvbpsi/descriptor.h>
+#include <dvbpsi/pat.h>
+#include <dvbpsi/pmt.h>])
CPPFLAGS="${CPPFLAGS_save}"
;;
esac
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
])
])
+AC_ARG_ENABLE(merge-ffmpeg,
+[ --enable-merged-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
+ enable_merge_ffmpeg="no"
+])
+AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
+
dnl
dnl avcodec decoder/encoder plugin
dnl
AS_IF([test "${enable_switcher}" = "yes"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [
VLC_ADD_PLUGIN([stream_out_switcher])
- VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS])
- VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS])
+ VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS $AVUTIL_CFLAGS])
],[AC_MSG_ERROR([Stream_out switcher depends on avcodec])
])
])
CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}"
AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
- VLC_ADD_PLUGIN([avformat])
- VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS])
- VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS])
+ AS_IF([test "$enable_merge_ffmpeg" = "no"], [
+ VLC_ADD_PLUGIN([avformat])
+ VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+ ], [
+ VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+ ])
VLC_RESTORE_FLAGS
],[
AC_MSG_ERROR([Could not find libavformat or libavutil. Use --disable-avformat to ignore this error.])
CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
AC_CHECK_HEADERS(libpostproc/postproc.h postproc/postprocess.h)
VLC_ADD_PLUGIN([postproc])
- VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS])
- VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS])
+ VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS])
VLC_RESTORE_FLAGS
],[
AC_MSG_ERROR([Could not find libpostproc. Use --disable-postproc to ignore this error.])
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_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- PKG_CHECK_MODULES(X264,x264, [
+ PKG_CHECK_MODULES(X264,x264 >= 0.76, [
VLC_ADD_PLUGIN([x264])
VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
fi
],[
if test "${enable_x264}" = "yes"; then
- AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
+ AC_MSG_ERROR([Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html])
fi
])
LDFLAGS="${LDFLAGS_save}"
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])
CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AS_IF([test "${enable_x11}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h, [
- VLC_ADD_PLUGIN([x11])
- VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11])
- VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
-
- AC_CHECK_LIB(Xext, XShmAttach, [VLC_ADD_LIBS([x11],[-lXext])])
- ])
+ AC_CHECK_HEADERS(X11/Xlib.h)
dnl Check for DPMS
AC_CHECK_HEADERS(X11/extensions/dpms.h, [
])
])
-dnl
-dnl XVideo module
-dnl (enabled by default except on win32)
-dnl
-AC_ARG_ENABLE(xvideo,
- [ --enable-xvideo XVideo support (default enabled)],, [
- enable_xvideo="$enable_x11"
-])
-AS_IF([test "${enable_xvideo}" != "no"], [
- AC_CHECK_HEADERS(X11/extensions/Xv.h, [
- CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
- AC_CHECK_LIB(Xv,XvPutImage,[
- VLC_ADD_PLUGIN([xvideo])
- VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
- VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])
- ])
- CFLAGS="${CFLAGS_save}"
- ])
-])
-
dnl
dnl GLX module
dnl (enabled by default except on win32)
])
AS_IF([test "${enable_xvmc}" != "no"], [
AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [
- VLC_ADD_PLUGIN([xvmc])
- VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv ${LIBMPEG2_LIBS}])
- VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS} ${LIBMPEG2_CFLAGS}])
+ AS_IF([test "${enable_libmpeg2}" = "yes"], [
+ VLC_ADD_PLUGIN([xvmc])
+ VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv ${LIBMPEG2_LIBS}])
+ VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS} ${LIBMPEG2_CFLAGS}])
+ ], [
+ AC_MSG_ERROR([XVideo-MotionCompensation needs libmpeg2 which isn't available])
+ ])
], [
AC_MSG_ERROR([XVideo-MotionCompensation extension not found!])
])
])
-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}"
enable_xcb="no"
])
])
+AC_ARG_ENABLE(xvideo,
+ [ --enable-xvideo XVideo support (default enabled)],, [
+ enable_xvideo="$enable_xcb"
+])
AS_IF([test "${enable_xcb}" != "no"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
- VLC_ADD_PLUGIN([xcb])
+ VLC_ADD_PLUGIN([xcb_x11])
VLC_ADD_PLUGIN([xcb_screen])
+ VLC_SET_CFLAGS_WERROR([xcb_screen], [-Wno-error=uninitialized]) # some gcc report a warning which doesn't reveal an error
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
then
SDL_PATH="${with_sdl_config_path}:${PATH}"
fi ])
- AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, ${SDL_PATH})
- SDL_CONFIG="${SDL12_CONFIG}"
- SDL_HEADER="SDL12/SDL.h"
- SDL_IMAGE="SDL12/SDL_image.h"
- if test "${SDL_CONFIG}" = "no"
- then
- AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, ${SDL_PATH})
- SDL_CONFIG=${SDL11_CONFIG}
- SDL_HEADER="SDL11/SDL.h"
- SDL_IMAGE="SDL11/SDL_image.h"
- fi
- if test "${SDL_CONFIG}" = "no"
- then
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
- SDL_HEADER="SDL/SDL.h"
- SDL_IMAGE="SDL/SDL_image.h"
- fi
- # check for cross-compiling
- SDL_PREFIX=
- AC_ARG_WITH(sdl-prefix,
- [ --with-sdl-prefix=PATH path to libsdl (needed for cross-compiling),
- e.g use as:
- --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
- if test "${with_sdl_prefix}" != "no" -a -n "${with_sdl_prefix}"
- then
- SDL_PREFIX="--prefix=${with_sdl_prefix}"
- fi
- if test "${SDL_CONFIG}" != "no"
- then
- # SDL on Darwin is heavily patched and can only run SDL_image
- if test "${SYS}" != "darwin" -a "${SYS}" != "mingw32"; then
- VLC_ADD_PLUGIN([vout_sdl])
- VLC_ADD_PLUGIN([aout_sdl])
- fi
- VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`])
- VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`])
- CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}"
- AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
- <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
- [ AC_CHECK_HEADERS(SDL.h, AC_DEFINE(SDL_INCLUDE_FILE, <SDL.h>,
- As a last resort we also test for SDL.h presence),
- [ AC_MSG_ERROR([The development package for SDL is not installed.
-Please install it and try again. Alternatively you can also configure with
---disable-sdl.])
- ])])
- AS_IF([ test "${enable_sdl_image}" != "no"],[
- AC_CHECK_HEADERS(${SDL_IMAGE}, [AC_DEFINE_UNQUOTED(SDL_IMAGE_INCLUDE_FILE,
- <${SDL_IMAGE}>, Indicate the path of SDL_image.h)
- VLC_ADD_PLUGIN([sdl_image])
- AC_CHECK_LIB(png, png_set_rows,
- [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz])
- AC_CHECK_LIB(jpeg, jpeg_start_decompress,
- [VLC_ADD_LIBS([sdl_image],[-ljpeg])])
- AC_CHECK_LIB(tiff, TIFFClientOpen,
- [VLC_ADD_LIBS([sdl_image],[-ltiff])])
- VLC_ADD_LIBS([sdl_image], [-lSDL_image])],
- [ AC_CHECK_HEADERS(SDL_image.h, AC_DEFINE(SDL_IMAGE_INCLUDE_FILE, <SDL_image.h>,
- As a last resort we also test for SDL_image.h presence),
- [ AC_MSG_WARN([The development package for SDL_image is not installed.
- You should install it alongside your SDL package.])
- ])])
- ])
- CPPFLAGS="${CPPFLAGS_save}"
- if expr 1.1.5 \> `${SDL_CONFIG} --version` >/dev/null
- then
- AC_MSG_ERROR([The development package for SDL is not installed.
-Please install it and try again. Alternatively you can also configure with
---disable-sdl.])
- fi
-
- elif test "${enable_sdl}" = "yes"
- then
- AC_MSG_ERROR([I couldn't find the SDL package. You can download libSDL
+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
+ SDL_HEADER="SDL/SDL.h"
+ SDL_IMAGE="SDL/SDL_image.h"
+
+ if test "${SDL_CONFIG}" != "no"; then
+ PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
+ # SDL on Darwin is heavily patched and can only run SDL_image
+ if test "${SYS}" != "darwin"; then
+ VLC_ADD_PLUGIN([vout_sdl])
+ VLC_ADD_PLUGIN([aout_sdl])
+ fi
+ VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags | sed 's,SDL,,'`])
+ VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`])
+
+ # SDL_image
+ AS_IF([ test "${enable_sdl_image}" != "no"],[
+ AC_CHECK_HEADERS("SDL/SDL_image.h", [
+ VLC_ADD_PLUGIN([sdl_image])
+ AC_CHECK_LIB(png, png_set_rows, [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz])
+ AC_CHECK_LIB(jpeg, jpeg_start_decompress, [VLC_ADD_LIBS([sdl_image],[-ljpeg])])
+ AC_CHECK_LIB(tiff, TIFFClientOpen, [VLC_ADD_LIBS([sdl_image],[-ltiff])])
+ VLC_ADD_LIBS([sdl_image], [-lSDL_image])],
+ [ AC_MSG_WARN([The development package for SDL_image is not installed.
+ You should install it alongside your SDL package.])
+ ])
+ ])
+ ],[
+ AC_MSG_ERROR([The development package for SDL is too old. You need 1.2.10.
+ Alternatively you can also configure with --disable-sdl.])
+ ])
+ else if test "${enable_sdl}" = "yes"; then
+ AC_MSG_ERROR([I could not find the SDL package. You can download libSDL
from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
])
+ fi
fi
fi
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 libxml2 module
dnl
-PKG_ENABLE_MODULES_VLC([libxml2], [], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
+PKG_ENABLE_MODULES_VLC([libxml2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
dnl
dnl SVG module
dnl Windows DirectX module
dnl
-if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "cygwin"
+if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
then
VLC_ADD_PLUGIN([panoramix])
fi
[ --enable-directx Win32 DirectX support (default enabled on Win32)])
if test "${enable_directx}" != "no"
then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "cygwin"
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
then
- AC_ARG_WITH(directx,
- [ --with-directx=PATH Win32 DirectX headers])
- if test -z "${with_directx}"
- then
AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGIN([directx])
VLC_ADD_PLUGIN([aout_directx])
VLC_ADD_LIBS([directx],[-lgdi32])
- ])
+ ],[AC_MSG_ERROR([Cannot find DirectX headers!])]
+ )
AC_CHECK_HEADERS(GL/gl.h,
[ VLC_ADD_PLUGIN([glwin32])
VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
[ VLC_ADD_PLUGIN([direct3d])
VLC_ADD_LIBS([direct3d],[-lgdi32])
])
- else
- AC_MSG_CHECKING(for directX headers in ${with_directx})
- if test -f ${with_directx}/ddraw.h
- then
- VLC_ADD_PLUGIN([directx])
- VLC_ADD_PLUGIN([aout_directx])
- VLC_ADD_CPPFLAGS([directx aout_directx],[-I${with_directx}])
- VLC_ADD_LIBS([directx],[-lgdi32])
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Cannot find ${with_directx}/ddraw.h!])
- fi
- fi
+ VLC_ADD_LIBS([direct3d directx glwin32],[-lole32])
+ fi
+fi
+
+dnl
+dnl win32 GDI plugin
+dnl
+AC_ARG_ENABLE(wingdi,
+ [ --enable-wingdi Win32 GDI module (default enabled on Win32)])
+if test "${enable_wingdi}" != "no"; then
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_PLUGIN([wingdi])
+ VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32])
+ fi
+ if test "${SYS}" = "mingwce"; then
+ VLC_ADD_PLUGIN([wingdi])
+ VLC_ADD_PLUGIN([wingapi])
+ VLC_ADD_LIBS([wingdi],[-laygshell])
+ VLC_ADD_LIBS([wingapi],[-laygshell])
fi
fi
+
dnl
dnl Linux framebuffer module
dnl
dnl
dnl libcaca plugin
dnl
-AC_ARG_ENABLE(caca,
- [ --enable-caca libcaca output (default disabled)])
-if test "${enable_caca}" = "yes"
-then
- CACA_PATH="${PATH}"
- AC_ARG_WITH(caca-config-path,
- [ --with-caca-config-path=PATH caca-config path (default search in \$PATH)],
- [ if test "${with_caca_config_path}" != "no"
- then
- CACA_PATH="${with_caca_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH})
- if test "${CACA_CONFIG}" != "no"
- then
- VLC_ADD_PLUGIN([caca])
- VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
- VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`])
- AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h>
- caca_event_t ev;]],
- [[ev.type = 0;]]
- )],
- [],
- [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])]
- )
- fi
-fi
-
-dnl
-dnl win32 GDI plugin
-dnl
-AC_ARG_ENABLE(wingdi,
- [ --enable-wingdi Win32 GDI module (default enabled on Win32)])
-if test "${enable_wingdi}" != "no"; then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
- VLC_ADD_PLUGIN([wingdi])
- VLC_ADD_LIBS([wingdi],[-lgdi32])
- fi
- if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([wingdi])
- VLC_ADD_PLUGIN([wingapi])
- VLC_ADD_LIBS([wingdi],[-laygshell])
- VLC_ADD_LIBS([wingapi],[-laygshell])
- fi
-fi
+PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto])
dnl
dnl Audio plugins
dnl
dnl ALSA module
dnl
-AC_ARG_ENABLE(alsa,
- [ --enable-alsa ALSA sound support for Linux (default enabled)])
-if test "${enable_alsa}" != "no"
-then
- AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
- if test "${have_alsa}" = "true"
- then
- CFLAGS="${CFLAGS_save}"
- AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
- #define ALSA_PCM_NEW_SW_PARAMS_API
- #include <alsa/asoundlib.h>],
- [snd_pcm_hw_params_get_period_time(0,0,0);],
- AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
- VLC_ADD_PLUGIN([alsa])
- VLC_ADD_LIBS([alsa],[-lasound -lm -ldl])
- VLC_ADD_PLUGIN([access_alsa])
- VLC_ADD_LIBS([access_alsa],[-lasound -lm -ldl])
- else
- if test "${enable_alsa}" = "yes"; then
- AC_MSG_ERROR([Could not find ALSA development headers])
- fi
- fi
-fi
+PKG_ENABLE_MODULES_VLC([ALSA], [], [alsa >= 1.0.0], [Alsa sound support for linux], [auto])
+PKG_ENABLE_MODULES_VLC([ACCESS_ALSA], [access_alsa], [alsa >= 1.0.0], [Alsa access for linux], [auto])
dnl
dnl win32 waveOut plugin
AC_ARG_ENABLE(waveout,
[ --enable-waveout Win32 waveOut module (default enabled on Win32)])
if test "${enable_waveout}" != "no"; then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+ if test "${SYS}" = "mingw32"; then
VLC_ADD_PLUGIN([waveout])
VLC_ADD_LIBS([waveout],[-lwinmm])
fi
dnl
dnl UPnP Plugin (Intel SDK)
dnl
-AC_ARG_ENABLE(upnp,
- AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)]))
-
-VLC_ADD_CXXFLAGS([upnp_intel], [ ])
-AS_IF([test "x${enable_upnp}" != "xno"], [
- AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread])
- AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"], [
- AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)])
- ])
- AS_IF([test "${has_upnp}" = "yes"], [
- VLC_ADD_LIBS([upnp_intel], [-lupnp -lixml])
- ])
-], [
- has_upnp="no"
-])
-
-AS_IF([test "${has_upnp}" = "yes"], [
- VLC_ADD_PLUGIN([upnp_intel])
-])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
dnl
fi
fi
- if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"); then
+ if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32"); then
VLC_ADD_PLUGIN([skins2])
ALIASES="${ALIASES} svlc"
VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
(test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
-dnl
-dnl PDA Gtk+2 module
-dnl
-AC_ARG_ENABLE(pda,
- [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
-if test "${enable_pda}" = "yes"
-then
- PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
- VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
- VLC_ADD_LIBS([gtk2],[${GTK2_LIBS}])
- VLC_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
- VLC_ADD_LIBS([pda],[${LDFLAGS_pda}])
- VLC_ADD_LIBS([pda],[${GTK2_LIBS}])
- VLC_ADD_PLUGIN([pda])
- if test "${SYS}" != "mingw32"; then
- NEED_GTK2_MAIN=yes
- VLC_ADD_CFLAGS([gtk2_main],[$GTK2_CFLAGS])
- VLC_ADD_LIBS([gtk2_main],[$GTK2_LIBS])
- fi
-fi
-AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
-
dnl
dnl Maemo
dnl
VLC_ADD_PLUGIN([qt4])
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc"
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"], [
+ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
- VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_PLUGIN([visual])
fi
-dnl
-dnl OpenGL visualisation plugin
-dnl
-AC_ARG_ENABLE(galaktos,
- [ --enable-galaktos OpenGL visualisation plugin (default disabled)])
-if test "${enable_galaktos}" = "yes"
-then
- AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
- VLC_ADD_PLUGIN([galaktos])
- if test "${SYS}" != "mingw32"; then
- VLC_ADD_LIBS([galaktos],[${X_LIBS} -lGL -lGLU])
- else
- VLC_ADD_LIBS([galaktos],[-lopengl32])
- fi
- ])
-fi
-
dnl
dnl goom visualization plugin
dnl
-AC_ARG_ENABLE(goom,
-[ --enable-goom goom visualisation plugin (default disabled)])
-if test "${enable_goom}" = "yes"
-then
- AC_ARG_WITH(goom-tree,
- [ --with-goom-tree=PATH goom tree for static linking (required)])
-
- dnl
- dnl test for --with-goom-tree
- dnl
- if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then
- AC_MSG_CHECKING(for libgoom2.a in ${with_goom_tree})
- real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`"
- if test -z "${real_goom_tree}"; then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_goom_tree}])
- fi
- if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
- AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
- VLC_ADD_PLUGIN([goom])
- VLC_ADD_LIBS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
- VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
- else
- dnl The given libgoom2 wasn't built, try to look for the old goom
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
- if test -f "${real_goom_tree}/libgoom.a"; then
- AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
- VLC_ADD_PLUGIN([goom])
- VLC_ADD_LIBS([goom],[-L${real_goom_tree} -lgoom])
- VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
- else
- dnl The given libgoom wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}])
- fi
- fi
- else
- AC_CHECK_HEADERS(goom/goom.h, [
- LDFLAGS="${LDFLAGS_save} ${LIBS_goom}"
- AC_CHECK_LIB(goom2, goom_init, [
- VLC_ADD_PLUGIN([goom])
- VLC_ADD_LIBS([goom],[-lgoom2])
- ],[
- AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.])
- ])
- LDFLAGS="${LDFLAGS_save}"
- ])
- fi
-fi
+PKG_ENABLE_MODULES_VLC([goom], [], [libgoom2], [goom visualization plugin], [auto])
dnl
dnl libprojectM visualization plugin
dnl
dnl AtmoLight (homebrew AmbiLight)
dnl
-if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
- AC_ARG_ENABLE(atmo,
-AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight)
- (default enabled)]))
- if test "${enable_atmo}" != "no"; then
- AC_LANG_PUSH(C++)
- VLC_ADD_PLUGIN([atmo])
- AC_LANG_POP(C++)
- fi
-fi
+AC_ARG_ENABLE(atmo,
+AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew Philips ambilight)
+ (broken, default disabled)]),, [enable_atmo="no"])
+AS_IF([test "${enable_atmo}" != no], [
+ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "linux"], [
+ AC_LANG_PUSH(C++)
+ VLC_ADD_PLUGIN([atmo])
+ AC_LANG_POP(C++)
+ ])
+])
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
dnl libgcrypt
dnl
AC_ARG_ENABLE(libgcrypt,
- [ --disable-libgcrypt libgcrypts support (default enabled)])
+ [ --disable-libgcrypt gcrypt support (default enabled)])
AS_IF([test "${enable_libgcrypt}" != "no"], [
- AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+ AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
+ have_libgcrypt="yes"
+ GCRYPT_CFLAGS=""
+ GCRYPT_LIBS="-lgcrypt"
+ ], [
+ AS_IF([test "${enable_libgcrypt}"], [
+ AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found.])
+ ])
+ have_libgcrypt="no"
+ ], [#include <gcrypt.h>])
])
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
AS_IF([test "${have_libgcrypt}" = "yes"],[
- VLC_ADD_LIBS([rtp stream_out_rtp], [${LIBGCRYPT_LIBS}])
+ VLC_ADD_LIBS([rtp stream_out_rtp], [${GCRYPT_LIBS}])
])
fi
-AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
+AC_SUBST(GCRYPT_CFLAGS)
+AC_SUBST(GCRYPT_LIBS)
+AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"])
dnl
dnl TLS/SSL
])
dnl The GnuTLS plugin invokes gcry_control directly.
AS_IF([test "${have_libgcrypt}" = "yes"],[
- VLC_ADD_LIBS([gnutls], [${LIBGCRYPT_LIBS}])
- VLC_ADD_CFLAGS([gnutls], [${LIBGCRYPT_CFLAGS}])
+ VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}])
+ VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}])
])
VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
- AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)])
+ AC_MSG_ERROR([gnutls not present or too old (version 1.7.4 required)])
])
])
])
AS_IF([test "${enable_remoteosd}" != "no"], [
AS_IF([test "${have_libgcrypt}" = "yes"],[
VLC_ADD_PLUGIN([remoteosd])
- VLC_ADD_LIBS([remoteosd], ${LIBGCRYPT_LIBS})
- VLC_ADD_CFLAGS([remoteosd], ${LIBGCRYPT_CFLAGS})
+ VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
+ VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
], [
AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin])
])
AS_IF([test "${have_libgcrypt}" = "yes"], [
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([stream_out_raop])
- VLC_ADD_LIBS([stream_out_raop], [${LIBGCRYPT_LIBS} -lgpg-error])
- VLC_ADD_CFLAGS([stream_out_raop], [${LIBGCRYPT_CFLAGS}])
+ VLC_ADD_LIBS([stream_out_raop], [${GCRYPT_LIBS} -lgpg-error])
+ VLC_ADD_CFLAGS([stream_out_raop], [${GCRYPT_CFLAGS}])
], [
AC_MSG_RESULT(no)
AC_MSG_WARN([libgcrypt support required for RAOP plugin])
then
AC_MSG_ERROR([libgcrypt is required for update checking system])
fi
- VLC_ADD_LIBS([libvlccore], [${LIBGCRYPT_LIBS}])
- VLC_ADD_CFLAGS([libvlccore], [${LIBGCRYPT_CFLAGS}])
+ VLC_ADD_LIBS([libvlccore], [${GCRYPT_LIBS}])
+ VLC_ADD_CFLAGS([libvlccore], [${GCRYPT_CFLAGS}])
AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
[ --with-wine-sdk-path=PATH path to wine sdk])
if test "${enable_activex}" != "no"
then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ if test "${SYS}" = "mingw32"
then
AC_CHECK_PROGS(MIDL, [midl], no)
if test "${with_wine_sdk_path}" != ""
dnl Tests for Osso and Xsp
AC_CHECK_LIB(osso, osso_display_blanking_pause, [
PKG_CHECK_MODULES(GLIB2, glib-2.0, [
- VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
- VLC_ADD_LIBS([x11 xvideo xvmc glx omapfb],[-losso])
+ VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+ VLC_ADD_LIBS([xvmc glx],[-losso])
])
])
AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
- VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx],[-DHAVE_XSP])
- VLC_ADD_LIBS([x11 xvideo xvmc glx],[-lXsp])
+ VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP])
+ VLC_ADD_LIBS([xvmc glx],[-lXsp])
])
dnl
VLC_ADD_PLUGIN([test4])
fi
-dnl
-dnl gtk_main plugin
-dnl
-if test "${NEED_GTK_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gtk_main])
- VLC_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}])
- VLC_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}])
-fi
-
-if test "${NEED_GNOME_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gnome_main])
- VLC_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}])
- VLC_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}])
-fi
-
-if test "${NEED_GTK2_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gtk2_main])
- VLC_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN])
- VLC_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN])
- VLC_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}])
- VLC_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2} ${LDFLAGS_pda}])
-fi
-
-if test "${NEED_GNOME2_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gnome2_main])
- VLC_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}])
- VLC_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}])
-fi
-
dnl
dnl qte_main plugin
dnl
modules/access/cdda/Makefile
modules/access/rtp/Makefile
modules/access/rtsp/Makefile
- modules/access/rtmp/Makefile
modules/access/vcd/Makefile
modules/access/vcdx/Makefile
modules/access/screen/Makefile
modules/demux/playlist/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
- modules/gui/pda/Makefile
modules/gui/macosx/Makefile
modules/gui/maemo/Makefile
modules/gui/minimal_macosx/Makefile
modules/services_discovery/Makefile
modules/stream_filter/Makefile
modules/stream_out/Makefile
- modules/stream_out/transrate/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
- modules/video_filter/atmo/Makefile
modules/video_filter/dynamicoverlay/Makefile
modules/video_output/Makefile
modules/video_output/msw/Makefile
modules/video_output/x11/Makefile
modules/visualization/Makefile
modules/visualization/visual/Makefile
- modules/visualization/galaktos/Makefile
])
dnl Generate makefiles
echo rm -f .error\$\$ >>compile
echo ERROR=0 >>compile
echo export PATH=$PATH LANG=C >>compile
-echo "(make \$@ 2>&1 || touch .error\$\$)| \\" >>compile
+echo "(make V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile
echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile
echo test -f .error\$\$ \&\& ERROR=1 >>compile
echo rm -f .error\$\$ >>compile
projects / vlc / blobdiff