LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib"
LDFLAGS="${LDFLAGS_save}"
;;
+ openbsd*)
+ CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include -I/usr/X11R6/include"
+ CPPFLAGS="${CPPFLAGS_save}"
+ LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib -L/usr/X11R6/lib/"
+ LDFLAGS="${LDFLAGS_save}"
+ ;;
esac
;;
darwin*)
VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([libvlc],[-Wl,-undefined,dynamic_lookup])
- VLC_ADD_LDFLAGS([avcodec avformat swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
enable_skins2="no"
echo " Assuming --disable-skins2"
- enable_x11="no"
- echo " Assuming --disable-x11"
enable_xcb="no"
echo " Assuming --disable-xcb"
- enable_glx="no"
- echo " Assuming --disable-glx"
- enable_xvideo="no"
- echo " Assuming --disable-xvideo"
fi
dnl
dnl Check for Mac OS X SDK settings
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
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_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 audiobargraph_a],[-lws2_32])
VLC_ADD_LIBS([access_file], [-lshlwapi])
dnl
dnl DEP and ASLR options
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 ts telnet],[-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 audiobargraph_a],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
lt_cv_deplibs_check_method=pass_all
+AS_IF([test "${enable_shared}" = "no"], [
+ AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
+])
dnl
dnl Gettext stuff
dnl Check for usual libc functions
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 getpid 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 strtok_r strtoll vasprintf swab tdestroy])
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 eventfd fstatfs])
+AC_CHECK_FUNCS([vmsplice eventfd fstatfs accept4])
AH_BOTTOM([#include <vlc_fixups.h>])
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 i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio 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])
+ VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract],[-lm])
])
AC_CHECK_LIB(m,ceil,[
- VLC_ADD_LIBS([hotkeys mosaic],[-lm])
+ VLC_ADD_LIBS([access_imem hotkeys mosaic swscale_omap],[-lm])
])
AC_CHECK_LIB(m,exp,[
VLC_ADD_LIBS([gaussianblur],[-lm])
[Paths where to find .pc not at the default location])
PKG_PROG_PKG_CONFIG()
+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"
+ ])
+ ])
+
+
dnl
dnl Check for zlib.h and -lz along with system -lminizip if available
dnl
dnl api stable dbus
PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0.0,
[ AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] )
- VLC_ADD_LIBS([screensaver libvlccore],[$DBUS_LIBS])
- VLC_ADD_CFLAGS([screensaver libvlccore],[$DBUS_CFLAGS])
+ VLC_ADD_LIBS([libvlccore],[$DBUS_LIBS])
+ VLC_ADD_CFLAGS([libvlccore],[$DBUS_CFLAGS])
dnl Check for dbus control interface
AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)])
if test "${enable_dbus_control}" != "no"
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_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default disabled)]),, [enable_warnings_as_error="no"])
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 \
VLC_ADD_PLUGIN([scale])
VLC_ADD_PLUGIN([vmem])
VLC_ADD_PLUGIN([logo])
+VLC_ADD_PLUGIN([audiobargraph_v])
VLC_ADD_PLUGIN([magnify])
VLC_ADD_PLUGIN([puzzle])
VLC_ADD_PLUGIN([colorthres])
VLC_ADD_PLUGIN([dolby_surround_decoder])
VLC_ADD_PLUGIN([headphone_channel_mixer])
VLC_ADD_PLUGIN([normvol])
+ VLC_ADD_PLUGIN([audiobargraph_a])
VLC_ADD_PLUGIN([equalizer])
VLC_ADD_PLUGIN([param_eq])
VLC_ADD_PLUGIN([scaletempo])
VLC_ADD_PLUGIN([simple_channel_mixer])
VLC_ADD_PLUGIN([headphone_channel_mixer])
VLC_ADD_PLUGIN([normvol])
+ VLC_ADD_PLUGIN([audiobargraph_a])
VLC_ADD_PLUGIN([a52tospdif])
VLC_ADD_PLUGIN([dtstospdif])
VLC_ADD_PLUGIN([i420_yuy2])
# SSE3
AC_CACHE_CHECK([if $CC groks SSE3 inline assembly],
[ac_cv_sse3_inline],
- [CFLAGS="${CFLAGS_save} -O -msse3"
+ [CFLAGS="${CFLAGS_save}"
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"
- ])
+ ac_cv_sse3_inline=yes, ac_cv_sse3_inline=no)])
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"
+ [CFLAGS="${CFLAGS_save}"
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"
- ])
-
+ ac_cv_ssse3_inline=yes, ac_cv_ssse3_inline=no)])
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"
+ # SSE4.1
+ AC_CACHE_CHECK([if $CC groks SSE4.1 inline assembly],
+ [ac_cv_sse4_1_inline],
+ [CFLAGS="${CFLAGS_save}"
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_cv_sse4_1_inline=yes, ac_cv_sse4_1_inline=no)])
+ AS_IF([test "${ac_cv_sse4_1_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4_1, 1,
+ [Define to 1 if SSE4_1 inline assembly is available.]) ])
+
+ # SSE4.2
+ AC_CACHE_CHECK([if $CC groks SSE4.2 inline assembly],
+ [ac_cv_sse4_2_inline],
+ [CFLAGS="${CFLAGS_save}"
+ AC_TRY_COMPILE(,[void *p;asm volatile("pcmpgtq %%xmm1,%%xmm0"::"r"(p));],
+ ac_cv_sse4_2_inline=yes, ac_cv_sse4_2_inline=no)])
+ AS_IF([test "${ac_cv_sse4_2_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4_2, 1,
+ [Define to 1 if SSE4_2 inline assembly is available.]) ])
+
+ # SSE4A
+ AC_CACHE_CHECK([if $CC groks SSE4A inline assembly],
+ [ac_cv_sse4a_inline],
+ [CFLAGS="${CFLAGS_save}"
+ AC_TRY_COMPILE(,[void *p;asm volatile("insertq %%xmm1,%%xmm0"::"r"(p));],
+ ac_cv_sse4a_inline=yes, ac_cv_sse4a_inline=no)])
+ AS_IF([test "${ac_cv_sse4a_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4A, 1,
+ [Define to 1 if SSE4A inline assembly is available.]) ])
])
AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly],
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
other_libs="$other_libs -lws2_32"
+ elif test "${SYS}" = "mingwce"; then
+ # add ws2 for closesocket, select, recv
+ other_libs="$other_libs -lws2"
fi
dnl We need to check for pic because live555 don't provide shared libs
dnl and we want to build a plugins so we need -fPIC on some arch.
VLC_ADD_LIBS([live555],[-lws2_32])
fi
- VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
+ VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
- VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
+ VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
dnl - special access module for dc1394 input
dnl - dv module: digital video module check for libraw1394
dnl
-PKG_ENABLE_MODULES_VLC([dc1394], [], [libraw1394 >= 2.0.1 libdc1394 >= 1.0.0], [dc1394 access module], [auto])
-PKG_ENABLE_MODULES_VLC([dv], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
+PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
+PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
dnl
dnl dvdread module: check for libdvdread
fi ])
fi
+
+dnl
+dnl sftp access support
+dnl
+AC_ARG_ENABLE(sftp,
+ [ --enable-sftp sftp input access module (default disable)])
+if test "${enable_sftp}" = "yes"; then
+ AC_CHECK_HEADERS(libssh2.h, [
+ VLC_ADD_PLUGIN([access_sftp])
+ VLC_ADD_LIBS([access_sftp], [-lssh2])
+ ])
+fi
+
dnl
dnl libdvbpsi ts demux/mux
dnl
CPPFLAGS="${CPPFLAGS_save}"
fi
+dnl
+dnl libv4l1 support for video4linux.
+dnl
+AC_ARG_ENABLE( libv4l,
+ [ --enable-libv4l Libv4l Video4Linux support (default enabled)])
+if test "${enable_libv4l}" != "no" -a "${enable_v4l}" != "no"
+then
+ PKG_CHECK_MODULES( LIBV4L, libv4l1, [
+ VLC_ADD_LDFLAGS([v4l],[${LIBV4L_LIBS}])
+ VLC_ADD_CFLAGS([v4l],[${LIBV4L_CFLAGS}])
+ AC_DEFINE(HAVE_LIBV4L1, 1, Define if libv4l is available)],
+ AC_MSG_WARN([LibV4L support disabled because libv4l development headers were not found])
+ )
+fi
+
dnl
dnl Video4Linux2 plugin
dnl
PKG_CHECK_MODULES( LIBV4L2, libv4l2, [
VLC_ADD_LDFLAGS([v4l2],[${LIBV4L2_LIBS}])
VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}])
- AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l is available)],
+ AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)],
AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found])
)
fi
[ --enable-libcdio CD input and control library support (default enabled)])
AC_ARG_ENABLE(vcdinfo,
- [ --enable-libvcdinfo VCD information library support (default enabled)])
+ [ --enable-vcdinfo VCD information library support (default enabled)])
have_libcdio=no
have_libvcdinfo=no
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])
+PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
fi
dnl
])
AC_ARG_ENABLE(merge-ffmpeg,
-[ --enable-merged-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
+[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
enable_merge_ffmpeg="no"
])
AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
])
fi
+dnl
+dnl libva needs avcodec
+dnl
+AC_ARG_ENABLE(libva,
+ [ --enable-libva libva VAAPI support (default disabled)])
+AS_IF([test "${enable_libva}" = "yes"], [
+ AS_IF([test "x${have_avcodec}" = "xyes"], [
+ PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
+ [
+ VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
+ VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
+ AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ ],[
+ AC_MSG_ERROR([Could not find libva.])
+ ])
+ ],[
+ AC_MSG_ERROR([libva VAAPI support depends on libavcodec.])
+ ])
+])
+
dnl
dnl stream_out switcher needs libavcodec
dnl
VLC_ADD_PLUGIN([avformat])
VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+
+ VLC_ADD_PLUGIN([access_avio])
+ VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
], [
VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
- AC_CHECK_HEADERS(libpostproc/postproc.h postproc/postprocess.h)
+ AC_CHECK_HEADERS(postproc/postprocess.h)
VLC_ADD_PLUGIN([postproc])
VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS])
dnl
dnl twolame encoder plugin
dnl
-PKG_ENABLE_MODULES_VLC([twolame], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC])
+PKG_ENABLE_MODULES_VLC([TWOLAME], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC])
dnl
dnl QuickTime plugin
dnl libass subtitle rendering module
dnl
AC_ARG_ENABLE(libass,
- [ --enable-libass Subtitle support using libass (default disabled)])
-AS_IF( [test "${enable_libass}" = "yes"], [
+ [ --enable-libass Subtitle support using libass (default enabled)])
+AS_IF( [test "${enable_libass}" != "no"], [
PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6,
[
- VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
+ VLC_ADD_LIBS([libass],[$LIBASS_LIBS])
VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
VLC_ADD_PLUGIN([libass])
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz])
- else
VLC_ADD_LIBS([libass],[-lfontconfig])
- fi
])
],[
AC_MSG_WARN([LIBASS library not found])
dnl
-dnl tiger decoder plugin
+dnl tiger rendering for kate decoder plugin
dnl
-PKG_ENABLE_MODULES_VLC([TIGER], [], [tiger >= 0.3.1], [Tiger rendering library for Kate streams],[auto])
+AC_ARG_ENABLE(tiger,
+[ --enable-tiger Tiger rendering library for Kate streams (default enabled)])
+AS_IF([test "${enable_tiger}" != "no"], [
+ PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
+ AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])
+ VLC_ADD_CFLAGS([kate],[$TIGER_CFLAGS])
+ VLC_ADD_LIBS([kate],[$TIGER_LIBS]) ],[
+ AS_IF([test "x${enable_tiger}" != "x"], [
+ AC_MSG_ERROR([libtiger does not appear to be installed on your system.])
+ ])
+ ])
+])
+
dnl
dnl
AC_PATH_XTRA()
-AC_ARG_ENABLE(x11,
- [ --enable-x11 X11 support with Xlib (default enabled)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
- enable_x11="yes"
- ], [
- enable_x11="no"
- ])
-])
-
-CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
-
-AS_IF([test "${enable_x11}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h)
-
-dnl Check for DPMS
- AC_CHECK_HEADERS(X11/extensions/dpms.h, [
- AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h)
- AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(DPMSINFO_IN_DPMS_H, 1,
- Define if <X11/extensions/dpms.h> defines DPMSInfo.)
- ],[
- AC_MSG_RESULT(no)
- ])
- ],,[
- #include <X11/Xlib.h>
- ])
-])
-
-dnl
-dnl GLX module
-dnl (enabled by default except on win32)
-dnl
-AC_ARG_ENABLE(glx,
- [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
- enable_glx="$enable_x11"
-])
-AS_IF([test "${enable_glx}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h)
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
- [[#if !defined(HAVE_X11_XLIB_H) || !defined(HAVE_GL_GLU_H) || !defined(HAVE_GL_GLX_H)
- choke me
- #endif]]),
- [
- VLC_ADD_PLUGIN([glx])
- VLC_ADD_LIBS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
- VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
- ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])])
-])
-
-dnl
-dnl XVMC module
-dnl (disabled by default except on win32)
-dnl
-AC_ARG_ENABLE(xvmc,
- [ --enable-xvmc XvMC support (default disabled)],, [
- enable_xvmc="no"
-])
-AS_IF([test "${enable_xvmc}" != "no"], [
- AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [
- 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 End of Xlib tests
-CPPFLAGS="${CPPFLAGS_save}"
-
dnl
dnl X C Bindings modules
enable_xvideo="$enable_xcb"
])
+need_xid_provider="no"
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_x11])
VLC_ADD_PLUGIN([xcb_screen])
+ VLC_ADD_PLUGIN([xcb_apps])
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"], [
], [true])
dnl xcb-utils
- PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4],
- [true],
- [PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms])
- VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API])]
- )
+ PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
+ have_xcb_keysyms="yes"
+ ], [
+ PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [
+ have_xcb_keysyms="yes"
+ VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API])
+ ], [
+ have_xcb_keysyms="no"
+ need_xid_provider="yes"
+ ])
+ ])
+
+ AS_IF([test "${have_xcb_keysyms}" = "yes"], [
+ PKG_CHECK_MODULES(XPROTO, [xproto])
+ VLC_ADD_PLUGIN([xcb_window])
+ VLC_ADD_PLUGIN([globalhotkeys])
+ VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
+ VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
+ ])
+ VLC_ADD_PLUGIN([xdg_screensaver])
+])
- VLC_ADD_PLUGIN([xcb_window])
- VLC_ADD_PLUGIN([globalhotkeys])
- VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] )
- VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] )
+AC_ARG_ENABLE(glx,
+ [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
+ enable_glx="$enable_xcb"
+])
+AS_IF([test "${enable_glx}" != "no"], [
+ PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb])
+ PKG_CHECK_MODULES(GL, [gl],, [
+ AC_CHECK_HEADER([GL/gl.h], [
+ GL_CFLAGS=""
+ GL_LIBS="-lGL"
+ ], [
+ AC_MSG_ERROR([GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx.])
+ ])
+ ])
+ VLC_ADD_PLUGIN([xcb_glx])
])
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
dnl
dnl
dnl libxml2 module
dnl
-PKG_ENABLE_MODULES_VLC([libxml2], [xml], [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
AC_CHECK_HEADERS(X11/Xlib.h, [
VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ])
])
+ VLC_ADD_PLUGIN([swscale_omap])
fi
dnl
dnl
dnl libcaca plugin
dnl
-PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto])
+PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta1], [libcaca output],[auto])
dnl
dnl Audio plugins
AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [
VLC_ADD_PLUGIN([oss])
VLC_ADD_PLUGIN([access_oss])
- AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])])
+ AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])
+ VLC_ADD_LIBS([access_oss],[-lossaudio])])
])
fi
VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11])
+ need_xid_provider="no"
fi fi fi
fi
AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
dnl
-dnl Maemo
+dnl Hildon UI
dnl
-AC_ARG_ENABLE(maemo,
- [ --enable-maemo Internet tablets based on Maemo SDK (default disabled)])
-if test "${enable_maemo}" = "yes"
-then
+AC_ARG_ENABLE(hildon,
+ [ --enable-hildon Hildon touchscreen UI (default disabled)])
+AS_IF([test "${enable_hildon}" = "yes"], [
PKG_CHECK_MODULES(HILDON, [hildon-1 hildon-fm-2], [
- VLC_ADD_CFLAGS([maemo],[${HILDON_CFLAGS}])
- VLC_ADD_LIBS([maemo],[${HILDON_LIBS}])
- VLC_ADD_PLUGIN([maemo])
- VLC_ADD_PLUGIN([swscale_maemo])
+ VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS}])
+ VLC_ADD_LIBS([hildon],[${HILDON_LIBS}])
+ VLC_ADD_PLUGIN([hildon])
ALIASES="${ALIASES} mvlc"
+ need_xid_provider="no"
], [
- AS_IF([test "${enable_maemo}" = "yes"],[
+ AS_IF([test "${enable_hildon}" = "yes"],[
AC_MSG_ERROR([Hildon libraries not found])
])
- enable_maemo="no"
+ enable_hildon="no"
])
-fi
-AM_CONDITIONAL(BUILD_MAEMO, [test "${enable_maemo}" = "yes"])
+])
+AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"])
dnl
dnl QT 4
ALIASES="${ALIASES} qvlc"
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
+ need_xid_provider="no"
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
])
- QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
+ QT4LOCALEDIR="$(eval $PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
AC_SUBST(QT4LOCALEDIR)
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
], [
AS_IF([test "${enable_qt4}" = "yes"],[
AC_MSG_ERROR([Qt 4 library not found])
])
fi
+dnl
+dnl Post-interface configuration checks
+dnl
+AS_IF([test "$need_xid_provider" = "yes"], [
+ AC_MSG_ERROR([X11 video outputs need a window provider (Qt4, Skins2, Hildon or xcb-utils), but none were found. Please install xcb-keysyms.])
+])
+
dnl
dnl Visualisation plugin
dnl
dnl
dnl goom visualization plugin
dnl
-PKG_ENABLE_MODULES_VLC([goom], [], [libgoom2], [goom visualization plugin], [auto])
+PKG_ENABLE_MODULES_VLC([GOOM], [], [libgoom2], [goom visualization plugin], [auto])
dnl
dnl libprojectM visualization plugin
dnl
-PKG_ENABLE_MODULES_VLC([projectm], [], [libprojectM], [projectM visualization plugin], [auto])
+PKG_ENABLE_MODULES_VLC([PROJECTM], [], [libprojectM], [projectM visualization plugin], [auto])
dnl
dnl AtmoLight (homebrew AmbiLight)
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 libudev services discovery
+PKG_ENABLE_MODULES_VLC([UDEV], [], [libudev >= 142], [Linux udev services discovery], [auto])
dnl
dnl MTP devices services discovery
[ --disable-libgcrypt gcrypt support (default enabled)])
AS_IF([test "${enable_libgcrypt}" != "no"], [
AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
- have_libgcrypt="yes"
- GCRYPT_CFLAGS=""
- GCRYPT_LIBS="-lgcrypt"
+ libgcrypt-config --version >/dev/null || \
+ AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
+ AC_CHECK_LIB(gcrypt, gcry_control, [
+ have_libgcrypt="yes"
+ GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
+ GCRYPT_LIBS="`libgcrypt-config --libs`"
+ ], [
+ AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.])
+ ], [`libgcrypt-config --libs`])
], [
- AS_IF([test "${enable_libgcrypt}"], [
- AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found.])
- ])
- have_libgcrypt="no"
- ], [#include <gcrypt.h>])
+ AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.])
+ ], [#include <gcrypt.h>]
+ )
])
+
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
AS_IF([test "${have_libgcrypt}" = "yes"],[
VLC_ADD_LIBS([rtp stream_out_rtp], [${GCRYPT_LIBS}])
])
+dnl
+dnl OSSO (Maemo screen blanking) plugin
+dnl
+PKG_ENABLE_MODULES_VLC([OSSO], [], [libosso], [Maemo support], [auto])
+
+AS_IF([test -f "/etc/maemo_version"], [
+ AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.])
+])
+
+
dnl
dnl update checking system
dnl
AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
+dnl
+dnl SQLite
+dnl
+AC_ARG_WITH(sqlite,
+ [ --with-sqlite=PATH sqlite path linking])
+if test "${SYS}" != "darwin"; then
+ PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3], [sqlite3], [auto])
+else
+ if test "${enable_sqlite}" != "no"
+ then
+ AC_CHECK_HEADERS(sqlite3.h, [
+ VLC_ADD_PLUGIN([sqlite])
+ if test "${with_sqlite}" != "no" -a -n "${with_sqlite}"; then
+ AC_MSG_CHECKING(existence of sqlite directory in ${with_sqlite})
+ real_sqlite="`cd ${with_sqlite} 2>/dev/null && pwd`"
+ if test -z "${real_sqlite}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_sqlite}])
+ fi
+ VLC_ADD_CFLAGS([sqlite],[-I${with_sqlite}/include])
+ VLC_ADD_LIBS([sqlite], [-L${with_sqlite}/lib -lsqlite3])
+ AC_MSG_RESULT(yes)
+ else
+ VLC_ADD_LIBS([sqlite], [-lsqlite3])
+ fi
+ AC_DEFINE([SQLITE_MODULE], 1, [Define if you want to use SQLite module]) ],
+ AC_MSG_ERROR([sqlite3 is required for sqlite module]) )
+ fi
+fi
+AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
+
dnl
dnl Endianness check
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" )
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
break
fi
done
AC_LANG_POP(C++)
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
-dnl Tests for Osso and Xsp
-AC_CHECK_LIB(osso, osso_display_blanking_pause, [
- PKG_CHECK_MODULES(GLIB2, glib-2.0, [
- 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([xvmc glx],[-DHAVE_XSP])
- VLC_ADD_LIBS([xvmc glx],[-lXsp])
-])
-
dnl
dnl test plugins
dnl
VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
+ extras/package/win32/spad.nsi
extras/package/win32/vlc.win32.nsi
extras/package/macosx/Info.plist
extras/package/macosx/Resources/English.lproj/InfoPlist.strings
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/wmafixed/Makefile
- modules/codec/xvmc/Makefile
modules/control/Makefile
modules/control/http/Makefile
modules/control/globalhotkeys/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
modules/gui/macosx/Makefile
- modules/gui/maemo/Makefile
+ modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/qnx/Makefile
modules/gui/qt4/Makefile
modules/services_discovery/Makefile
modules/stream_filter/Makefile
modules/stream_out/Makefile
+ modules/stream_out/transcode/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
modules/video_filter/dynamicoverlay/Makefile
modules/video_output/Makefile
modules/video_output/msw/Makefile
modules/video_output/qte/Makefile
- modules/video_output/x11/Makefile
modules/visualization/Makefile
modules/visualization/visual/Makefile
])
/bin/echo -n "Enabled modules: "
./vlc-config --list plugin
+dnl Do we have to use make or gmake ?
+USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac`
dnl Shortcut to nice compile message
rm -f compile
echo '#! /bin/sh' >compile
echo rm -f .error\$\$ >>compile
echo ERROR=0 >>compile
echo export PATH=$PATH LANG=C >>compile
-echo "(make V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile
+echo "($USE_MAKE_OR_GMAKE 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
echo "plugins/bindings :${PLUGINS_BINDINGS}
You can tune the compiler flags in vlc-config.
-To build vlc and its plugins, type \`./compile' or \`make'.
+To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'.
"
if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then
echo ""
projects / vlc / blobdiff