X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=7071c47c21c10924923afe9eaff2eb86388e6895;hb=60a57b8367661ebfffdf6e88e6e1965b1ed7878f;hp=565ec3f752b37d5df62e0a623e089cd4995f8d66;hpb=9e57ad81139a4ff8958e2bc0a9d8c35de412c0d1;p=vlc diff --git a/configure.ac b/configure.ac index 565ec3f752..7071c47c21 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Yellow Bastard" +CODENAME="The Luggage" COPYRIGHT_YEARS="1996-2009" AC_PREREQ(2.59c) @@ -125,20 +125,17 @@ AC_ARG_WITH(contrib, if test "`echo \"$topdir\" | cut -c 1`" != "/"; then topdir="`pwd`/$topdir" fi - CONTRIB_DIR=${topdir}/extras/contrib + CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host} + if ! test -d "$CONTRIB_DIR" + then + gccmachine=`$CC -dumpmachine` + CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine} + fi fi AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) AS_IF([test -d ${CONTRIB_DIR}/lib],[ - AS_IF([test "`grep HOST ${CONTRIB_DIR}/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"],[ - if test "${with_contrib}" = "yes"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host]) - else - AC_MSG_RESULT([no]) - AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host]) - fi - ],[ AC_MSG_RESULT([yes]) + AC_SUBST(CONTRIB_DIR) export PATH=${CONTRIB_DIR}/bin:$PATH CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" @@ -170,10 +167,9 @@ AC_ARG_WITH(contrib, export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES fi + ],[ + AC_MSG_RESULT([no]) ]) - ],[ - AC_MSG_RESULT([no]) - ]) ]) dnl dnl Set default values @@ -205,6 +201,12 @@ case "${host_os}" in 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*) @@ -217,7 +219,7 @@ case "${host_os}" in 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]) @@ -263,14 +265,8 @@ case "${host_os}" in 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 @@ -353,7 +349,7 @@ case "${host_os}" in 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 oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc 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 @@ -367,7 +363,7 @@ case "${host_os}" in 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],[-lws2]) + VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) fi ;; @@ -392,9 +388,9 @@ case "${host_os}" in LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}" dnl Check for BONE if test -f /boot/beos/system/lib/libbind.so; then - VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lbind -lsocket]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket]) else - VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lnet]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet]) fi dnl Ugly check for Zeta @@ -450,6 +446,9 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) 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 @@ -572,16 +571,15 @@ 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 daemon fork lstat posix_fadvise posix_madvise uselocale]) -AC_FUNC_ALLOCA 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 ]) @@ -728,13 +726,13 @@ AC_CHECK_LIB(m,cos,[ 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 ball],[-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]) @@ -925,12 +923,22 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(pthread.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal. +dnl It seems that autoconf detects pkg-config only during the first +dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case, +dnl it is nested within a conditional block, so it was not working right. dnl Make PKG_CONFIG_PATH precious so that it appears in the help and get saved AC_ARG_VAR(PKG_CONFIG_PATH, [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 @@ -968,8 +976,8 @@ then 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" @@ -997,9 +1005,6 @@ fi ;; esac -dnl build the qte plugin ? -NEED_QTE_MAIN=no - dnl Check for ntohl, etc. AC_CACHE_CHECK([for ntohl in sys/param.h], [ac_cv_c_ntohl_sys_param_h], @@ -1012,11 +1017,11 @@ if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then 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_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_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 \ @@ -1195,6 +1200,7 @@ VLC_ADD_PLUGIN([wave]) VLC_ADD_PLUGIN([ripple]) VLC_ADD_PLUGIN([psychedelic]) VLC_ADD_PLUGIN([gradient]) +VLC_ADD_PLUGIN([ball]) VLC_ADD_PLUGIN([motionblur]) VLC_ADD_PLUGIN([rv32]) VLC_ADD_PLUGIN([rotate]) @@ -1209,6 +1215,7 @@ VLC_ADD_PLUGIN([blend]) 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]) @@ -1226,7 +1233,7 @@ AC_LANG_POP(C++) if test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([gestures]) - VLC_ADD_PLUGIN([rc]) + VLC_ADD_PLUGIN([oldrc]) VLC_ADD_PLUGIN([hotkeys]) VLC_ADD_PLUGIN([showintf]) VLC_ADD_PLUGIN([marq]) @@ -1262,13 +1269,12 @@ if test "${SYS}" != "mingwce"; then 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([converter_float]) VLC_ADD_PLUGIN([a52tospdif]) VLC_ADD_PLUGIN([dtstospdif]) - VLC_ADD_PLUGIN([audio_format]) ALIASES="${ALIASES} rvlc" fi @@ -1282,10 +1288,9 @@ if test "${SYS}" = "mingwce"; then VLC_ADD_PLUGIN([simple_channel_mixer]) VLC_ADD_PLUGIN([headphone_channel_mixer]) VLC_ADD_PLUGIN([normvol]) - VLC_ADD_PLUGIN([converter_float]) + VLC_ADD_PLUGIN([audiobargraph_a]) 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]) @@ -1314,7 +1319,7 @@ else 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 @@ -1457,38 +1462,51 @@ AS_IF([test "${enable_sse}" != "no"], [ # 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], @@ -1775,9 +1793,10 @@ then ]) ]) if test "x${have_lua}" = "xyes" ; then - AC_DEFINE(HAVE_LUA, 1, [Define if you have the lua library]) VLC_ADD_LIBS([lua],[$LUA_LIBS]) VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS]) + else + AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.]) fi fi AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) @@ -1789,7 +1808,7 @@ AC_ARG_ENABLE(httpd, [ --enable-httpd HTTP daemon (default enabled)]) if test "${enable_httpd}" != "no" then - VLC_ADD_PLUGIN([http]) + VLC_ADD_PLUGIN([oldhttp]) AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support) fi AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) @@ -1823,7 +1842,7 @@ AS_IF([test "${enable_vlm}" != "no"], [ AC_MSG_ERROR([VLM requires the stream output. Do not use --disable-sout.]) ]) AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support]) - VLC_ADD_PLUGIN([telnet]) + VLC_ADD_PLUGIN([oldtelnet]) ]) AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"]) @@ -1838,6 +1857,7 @@ AS_IF([test "${enable_growl}" != "no"], [ AC_CHECK_HEADERS(Growl/GrowlDefines.h, [ VLC_ADD_PLUGIN([growl]) VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit]) + VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) ] ) @@ -1864,8 +1884,7 @@ AC_ARG_ENABLE(taglib, [ --disable-taglib Taglib support (default enabled) ]) AS_IF([test "${enable_taglib}" != "no"],[ PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, - [ AC_DEFINE( HAVE_TAGLIB, 1, [Define if you have taglib plugin built] ) - VLC_ADD_PLUGIN([taglib]) + [ VLC_ADD_PLUGIN([taglib]) VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ], [AC_MSG_WARN(TagLib library not found)]) @@ -1933,6 +1952,9 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.]) 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. @@ -1986,10 +2008,10 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.]) 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]) @@ -2012,8 +2034,8 @@ dnl 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 @@ -2212,6 +2234,19 @@ if test "${enable_smb}" != "no"; then 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 @@ -2299,7 +2334,16 @@ then 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 +#elif defined( HAVE_INTTYPES_H ) +# include +#endif +#include +#include +#include +#include ]) CPPFLAGS="${CPPFLAGS_save}" ;; esac @@ -2330,6 +2374,21 @@ then 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 @@ -2361,7 +2420,7 @@ then 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 @@ -2410,7 +2469,7 @@ AC_ARG_ENABLE(libcdio, [ --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 @@ -2425,9 +2484,7 @@ then if test "${enable_vcdinfo}" != "no" then PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22, - [have_libvcdinfo=yes - AC_DEFINE(HAVE_VCDINFO, 1, - [Define if you have libvcdinfo 0.7.22 or greater installed])], + [have_libvcdinfo=yes], [AC_MSG_WARN(VCD information library not found)]) fi fi @@ -2642,15 +2699,11 @@ dnl PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto]) if test "${enable_sout}" != "no"; then PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg demux support], [auto]) -else - AM_CONDITIONAL(HAVE_MUX_OGG, 0) 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]) -else - AM_CONDITIONAL(HAVE_shout, 0) +PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto]) fi dnl @@ -2898,7 +2951,7 @@ AS_IF([test "${enable_id3tag}" = "yes"], [ ]) 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"]) @@ -2933,6 +2986,26 @@ then ]) 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 @@ -2967,6 +3040,10 @@ then 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]) @@ -3014,7 +3091,7 @@ then 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]) @@ -3075,7 +3152,7 @@ fi 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 @@ -3306,8 +3383,7 @@ AC_CHECK_HEADERS(png.h, [ VLC_ADD_LIBS([png],[-lpng -lz]) VLC_ADD_PLUGIN([png]) VLC_ADD_PLUGIN([osdmenu]) - VLC_ADD_PLUGIN([osd_parser]) - AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])], + VLC_ADD_PLUGIN([osd_parser])], [],[-lz]) LDFLAGS="${LDFLAGS_save}" ]) @@ -3426,21 +3502,17 @@ dnl 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]) @@ -3508,9 +3580,21 @@ AS_IF([test "${enable_kate}" != "no"], [ 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 @@ -3524,81 +3608,6 @@ dnl Xlib 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 defines DPMSInfo.) - ],[ - AC_MSG_RESULT(no) - ]) - ],,[ - #include - ]) -]) - -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 @@ -3616,14 +3625,14 @@ AC_ARG_ENABLE(xvideo, 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"], [ @@ -3644,13 +3653,46 @@ AS_IF([test "${enable_xcb}" != "no"], [ ], [true]) dnl xcb-utils - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms]) + 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 @@ -3782,7 +3824,7 @@ fi 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 @@ -3799,33 +3841,6 @@ then VLC_ADD_PLUGIN([snapshot]) fi -dnl -dnl Qt Embedded module -dnl (disabled by default) -dnl -AC_ARG_ENABLE(qte, - [ --enable-qte QT Embedded support (default disabled)]) -if test "${enable_qte}" = "yes" -then - AC_ARG_WITH(qte, - [ --with-qte=PATH Qt Embedded headers and libraries]) - if test "${with_qte}" != "no" -a -n "${with_qte}" - then - VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) - else - VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) - fi - VLC_ADD_PLUGIN([qte]) - NEED_QTE_MAIN=yes - CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" - AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ - AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) - ] ) - CPPFLAGS="${CPPFLAGS_save}" -fi - dnl dnl Roku HD1000 Video output module dnl @@ -3937,6 +3952,7 @@ AC_ARG_ENABLE(omapfb, AC_CHECK_HEADERS(X11/Xlib.h, [ VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ]) ]) + VLC_ADD_PLUGIN([swscale_omap]) fi dnl @@ -4060,7 +4076,7 @@ fi 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 @@ -4081,7 +4097,8 @@ then 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 @@ -4121,8 +4138,8 @@ dnl CoreAudio plugin dnl AC_ARG_ENABLE(macosx-audio, [ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)]) -if test "${enable_macosx-audio}" != "no" && - (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") +if test "x${enable_macosx_audio}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) @@ -4284,6 +4301,7 @@ if test "${enable_skins2}" = "yes" || 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" || @@ -4291,27 +4309,25 @@ 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]) - AC_DEFINE([BUILD_MAEMO], 1, [Define if you are using Maemo interfaces]) + 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 @@ -4323,19 +4339,19 @@ AC_ARG_ENABLE(qt4, AS_IF([test "${enable_qt4}" != "no"], [ PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [ 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}" != "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]) @@ -4347,26 +4363,6 @@ AS_IF([test "${enable_qt4}" != "no"], [ ]) AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"]) -dnl -dnl WinCE GUI module -dnl -AC_ARG_ENABLE(wince, - [ --enable-wince Windows CE interface (default enabled with MinGW)]) -if test "${enable_wince}" != "no"; then - if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGIN([wince]) - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) - elif test "${SYS}" = "mingw32"; then - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) - fi -fi - dnl dnl Simple test for skins2 dependency dnl @@ -4374,72 +4370,79 @@ AS_IF([test "${enable_skins2}" != "no" && test "x$enable_qt4" = "xno"], [ AC_MSG_ERROR([The skins2 module depends on a the Qt4 development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2.]) ]) -dnl -dnl Opie QT embedded module -dnl -AC_ARG_ENABLE(opie, - [ --enable-opie Qt embedded interface support (default disabled)], - [if test "${enable_opie}" = "yes"; then - AC_ARG_WITH(qte, - [ --with-qte=PATH Qt Embedded headers and libraries]) - if test "${with_qte}" != "no" -a -n "${with_qte}" - then - VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) - else - VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`]) - VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`]) - fi - CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" - AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ - AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) - ] ) - CPPFLAGS="${CPPFLAGS_save}" - - VLC_ADD_PLUGIN([opie]) - NEED_QTE_MAIN=yes - VLC_ADD_LIBS([opie],[-lqpe ${LDFLAGS_qte}]) - VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) - if test "${with_qte}" != "no" -a -n "${with_qte}" - then - MOC=${with_qte}/bin/moc - else - MOC=${QTDIR}/bin/moc - fi - fi]) - dnl dnl MacOS X video output/gui modules dnl AC_ARG_ENABLE(macosx, - [ --enable-macosx MacOS X support (default enabled on MacOS X)]) + [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) if test "x${enable_macosx}" = "xyes" then - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) - VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,Cocoa]) VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) - VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle]) - VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle]) + VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) dnl For bug report VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) - 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_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) - VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] ) + VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore]) + VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer], [-fobjc-exceptions] ) - VLC_ADD_PLUGIN([access_eyetv]) - VLC_ADD_PLUGIN([qtcapture]) VLC_ADD_PLUGIN([macosx]) VLC_ADD_PLUGIN([minimal_macosx]) VLC_ADD_PLUGIN([opengllayer]) fi +dnl +dnl MacOS X related modules +dnl + +AC_ARG_ENABLE(macosx-vout, + [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)]) +if test "x${enable_macosx_vout}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes") +then + VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_PLUGIN([vout_macosx]) +fi + +AC_ARG_ENABLE(macosx-dialog-provider, + [ --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)]) +if test "x${enable_macosx_dialog_provider}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes") +then + VLC_ADD_LDFLAGS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) + VLC_ADD_PLUGIN([macosx_dialog_provider]) +fi + +AC_ARG_ENABLE(macosx-qtcapture, + [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_qtcapture}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes") +then + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) + VLC_ADD_PLUGIN([qtcapture]) +fi + +AC_ARG_ENABLE(macosx-eyetv, + [ --enable-macosx-eyetv Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_eyetv}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes") +then + VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) + VLC_ADD_PLUGIN([access_eyetv]) +fi + + + dnl dnl QNX RTOS module dnl @@ -4520,6 +4523,13 @@ then ]) 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 @@ -4533,12 +4543,12 @@ fi 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) @@ -4559,8 +4569,8 @@ dnl Bonjour services discovery 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 @@ -4588,16 +4598,32 @@ 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], [ + 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`]) + ], [ + AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + ], [#include ] + ) ]) + 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 @@ -4616,8 +4642,8 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) 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]) ], [ @@ -4637,8 +4663,8 @@ AC_ARG_ENABLE(remoteosd, 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]) ]) @@ -4652,14 +4678,24 @@ AC_MSG_CHECKING([whether to enable RAOP 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]) ]) +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 @@ -4671,11 +4707,44 @@ then 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 +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 @@ -4804,8 +4873,8 @@ then 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 @@ -4938,18 +5007,6 @@ fi 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 omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) - VLC_ADD_LIBS([xvmc glx omapfb],[-losso]) - ]) -]) -AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[ - VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP]) - VLC_ADD_LIBS([xvmc glx],[-lXsp]) -]) - dnl dnl test plugins dnl @@ -4971,17 +5028,6 @@ then VLC_ADD_PLUGIN([test4]) fi -dnl -dnl qte_main plugin -dnl -if test "${NEED_QTE_MAIN}" != "no" -then - VLC_ADD_PLUGIN([qte_main]) - VLC_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN]) - VLC_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}]) - VLC_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) -fi - dnl dnl Plugin and builtin checks dnl @@ -5088,6 +5134,7 @@ dnl Create vlc-config.in 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 @@ -5146,7 +5193,6 @@ AC_CONFIG_FILES([ 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 @@ -5161,12 +5207,12 @@ AC_CONFIG_FILES([ 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/macosx_dialog_provider/Makefile modules/gui/qnx/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile - modules/gui/wince/Makefile modules/meta_engine/Makefile modules/misc/Makefile modules/misc/dummy/Makefile @@ -5178,20 +5224,18 @@ AC_CONFIG_FILES([ modules/misc/osd/Makefile modules/misc/stats/Makefile modules/misc/xml/Makefile - modules/misc/probe/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile modules/packetizer/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 ]) @@ -5207,13 +5251,15 @@ chmod 0755 vlc-config /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 @@ -5241,7 +5287,7 @@ fi 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 ""