X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=a6e2e3f35361d9d32861994a910dce409fd191b0;hb=78f088c01aad0701b39aeac00cd3e35ad4e71368;hp=7e1b61097f95412bdae49ce4ea7675e1dfab40e5;hpb=531dda8035e8700b48033ceb0e9a1015537944c7;p=vlc diff --git a/configure.ac b/configure.ac index 7e1b61097f..a6e2e3f353 100644 --- a/configure.ac +++ b/configure.ac @@ -323,6 +323,7 @@ AC_CACHE_VAL(lt_cv_deplibs_check_method, [lt_cv_deplibs_check_method=pass_all]) AC_DISABLE_STATIC +AC_DISABLE_FAST_INSTALL AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL m4_undefine([AC_PROG_F77]) @@ -355,7 +356,6 @@ fi dnl dnl Gettext stuff dnl -ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fa fr fur gl he hi hu it ja ka ko lt lv ms my ne nl no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW" AM_GNU_GETTEXT_VERSION(0.16.1) AM_GNU_GETTEXT AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ @@ -444,6 +444,10 @@ AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) +AS_IF([test "${SYS}" = "linux"], [ + AC_CHECK_FUNCS(tee) +]) + dnl Check for setlocal and langinfo AC_CHECK_FUNCS(setlocale) AC_CHECK_HEADERS(langinfo.h) @@ -587,7 +591,7 @@ AC_CHECK_LIB(m,cos,[ VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm]) + VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm]) @@ -792,7 +796,7 @@ AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioc AC_CHECK_HEADERS([arpa/inet.h net/if.h netinet/in.h sys/socket.h netinet/udplite.h]) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) -AC_CHECK_HEADERS(linux/version.h) +AC_CHECK_HEADERS([linux/version.h linux/dccp.h]) AC_CHECK_HEADERS(syslog.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -879,18 +883,25 @@ then VLC_ADD_LDFLAGS([screensaver libvlc],[$DBUS_LIBS]) VLC_ADD_CFLAGS([screensaver libvlc],[$DBUS_CFLAGS]) dnl Check for dbus control interface - AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)]) + AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)]) if test "${enable_dbus_control}" != "no" then VLC_ADD_PLUGINS([dbus]) VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS]) VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) + fi + dnl Check for Telepathy + AC_ARG_ENABLE(telepathy, [ --enable-telepathy Telepathy Presence plugin through DBus(default enabled)]) + if test "${enable_telepathy}" != "no"; then + VLC_ADD_PLUGINS([telepathy]) + VLC_ADD_LDFLAGS([telepathy],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS]) fi], if ${PKG_CONFIG} --exists dbus-1 then [AC_ARG_ENABLE(old-dbus, - [ --enable-old-dbus Deprecated D-Bus support (default disabled)])] + [ --enable-old-dbus Deprecated D-Bus support (default disabled)])] if test "${enable_old_dbus}" != "yes" then @@ -955,7 +966,7 @@ if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then fi CFLAGS="${CFLAGS_save}" -RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings old-style-definition missing-prototypes volatile-register-var]) +RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var]) RDC_PROG_CC_FLAGS_IFELSE([-pipe]) dnl This helps detect broken plugins with undefined symbols @@ -988,7 +999,7 @@ AC_CACHE_CHECK([if \$CC accepts -O3], [ac_cv_c_o3], [CFLAGS="${CFLAGS_save} -O3" AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) -if test "${ac_cv_c_o3}" != "no"; then +if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3" else AC_CACHE_CHECK([if \$CC accepts -O2], @@ -1192,12 +1203,13 @@ dnl dnl default modules dnl VLC_ADD_PLUGINS([dummy logger memcpy]) -VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) -VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac]) -VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen]) +VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) +VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub mpeg_audio lpcm a52 dts cinepak flac]) +VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving]) VLC_ADD_PLUGINS([converter_fixed mono]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) +VLC_ADD_PLUGINS([spatializer]) VLC_ADD_PLUGINS([playlist export nsc xtag]) VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image logo magnify puzzle colorthres]) VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv]) @@ -1496,7 +1508,7 @@ AS_IF([test "${CFLAGS_TUNING}"], dnl dnl x86 accelerations dnl -if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}"="i486" -o "${host_cpu}" = "x86_64" +if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "x86_64" then ARCH="${ARCH} mmx" VLC_ADD_PLUGINS([${ACCEL_MODULES}]) @@ -1511,7 +1523,7 @@ dnl dnl Memory usage dnl AC_ARG_ENABLE(optimize-memory, -[ --enable-optimize-memory optimize memory usage over performance]) +[ --enable-optimize-memory optimize memory usage over performance]) if test "${enable_optimize_memory}" = "yes"; then AC_DEFINE(OPTIMIZE_MEMORY, 1, Define if you want to optimize memory usage over performance) fi @@ -1837,7 +1849,7 @@ dnl dnl special access module for dc1394 input dnl AC_ARG_ENABLE(dc1394, - [ --enable-dc1394 dc1394 access module (default disabled)]) + [ --enable-dc1394 dc1394 access module (default disabled)]) if test "${enable_dc1394}" = "yes" then AC_CHECK_HEADERS(libraw1394/raw1394.h, [ @@ -2106,7 +2118,7 @@ dnl dnl Windows DirectShow BDA access module dnl AC_ARG_ENABLE(bda, - [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) + [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) if test "${enable_bda}" != "no" then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" @@ -2123,7 +2135,7 @@ dnl dnl OpenCV wrapper and example filters dnl AC_ARG_ENABLE(opencv, - [ --enable-opencv OpenCV (computer vision) filter (default disabled)]) + [ --enable-opencv OpenCV (computer vision) filter (default disabled)]) if test "${enable_opencv}" = "yes" -a "${CXX}" != ""; then AC_ARG_WITH(opencv-tree, @@ -2293,7 +2305,7 @@ dnl dnl Video4Linux plugin dnl AC_ARG_ENABLE(v4l2, - [ --enable-v4l2 Video4Linux2 input support (default disabled)]) + [ --enable-v4l2 Video4Linux2 input support (default disabled)]) if test "${enable_v4l2}" = "yes" then AC_ARG_WITH(v4l2, @@ -2920,6 +2932,34 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_LDFLAGS([ffmpeg],[-lz]) fi]) + AC_ARG_WITH(ffmpeg-amrnb, + [ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support], + [ + if test "$with_ffmpeg_amrnb" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lamrnb]) + fi]) + + AC_ARG_WITH(ffmpeg-amrwb, + [ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support], + [ + if test "$with_ffmpeg_amrwb" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lamrwb]) + fi]) + + AC_ARG_WITH(ffmpeg-x264, + [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support], + [ + if test "$with_ffmpeg_x264" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lx264]) + fi]) + + AC_ARG_WITH(ffmpeg-a52, + [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support], + [ + if test "$with_ffmpeg_a52" = "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-la52]) + fi]) + dnl dnl test for --with-ffmpeg-tree dnl @@ -2953,59 +2993,33 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo fi dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - - if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_zlib}" != "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lz]) - fi - fi - if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_mp3lame}" != "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) - fi - fi - if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_faac}" != "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) - fi - fi - if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then - if test "${with_ffmpeg_dts}" != "yes"; then - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" - AC_CHECK_LIB(dts_pic, dts_free, - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ], - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) - LDFLAGS="${LDFLAGS_save}" - fi - fi - if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lvorbis -lvorbisenc]) - fi - if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lfaad]) - fi - if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore]) - fi - + + dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc + PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH" + PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR" + export PKG_CONFIG_PATH="" + export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}" + + PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [ + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) + VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] + ,[]) + AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[ + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}" + ],[ + unset PKG_CONFIG_PATH + ]) + AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[ + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}" + ],[ + unset PKG_CONFIG_LIBDIR + ]) + VLC_ADD_BUILTINS([ffmpeg]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then VLC_ADD_BUILTINS([stream_out_switcher]) fi - if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a]) - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavutil]) - fi - - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a]) - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec]) - - if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then - AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a]) - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat]) - fi if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) @@ -3919,7 +3933,7 @@ dnl XVMC module dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(xvmc, - [ --enable-xvmc XVMC support (default disabled)]) + [ --enable-xvmc XVMC support (default disabled)]) if test "${enable_xvmc}" = "yes" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_xvmc}" = "yes"); then @@ -4027,7 +4041,7 @@ dnl AC_ARG_ENABLE(sdl, [ --enable-sdl SDL support (default enabled)]) AC_ARG_ENABLE(sdl-image, - [ --enable-sdl-image SDL image support (default enabled)]) + [ --enable-sdl-image SDL image support (default enabled)]) if test "${enable_sdl}" != "no" then SDL_PATH="${PATH}" @@ -5269,15 +5283,20 @@ AC_ARG_ENABLE(macosx, then VLC_ADD_PLUGINS([access_eyetv]) VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) + VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL]) VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) + VLC_ADD_OBJCFLAGS( [minimal_macosx],[-fobjc-exceptions] ) fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, [VLC_ADD_PLUGINS([access_eyetv]) VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) VLC_ADD_BUILTINS([macosx]) + VLC_ADD_BUILTINS([minimal_macosx]) + VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL]) VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) VLC_ADD_OBJCFLAGS([macosx],[-fobjc-exceptions]) + VLC_ADD_OBJCFLAGS([minimal_macosx],[-fobjc-exceptions]) ])]) CFLAGS=$ORIGCFLAGS @@ -5298,10 +5317,20 @@ dnl dnl ncurses module dnl AC_ARG_ENABLE(ncurses, - [ --enable-ncurses ncurses interface support (default disabled)], - [if test "${enable_ncurses}" = "yes"; then - VLC_ADD_PLUGINS([ncurses]) - VLC_ADD_LDFLAGS([ncurses],[-lncurses]) + [ --disable-ncurses ncurses interface support (default enabled)], + [if test "${enable_ncurses}" != "no"; then + AC_CHECK_HEADERS(ncursesw/curses.h, + [AC_CHECK_LIB( ncursesw, mvprintw, + [VLC_ADD_PLUGINS([ncurses]) + VLC_ADD_LDFLAGS([ncurses],[-lncursesw])]) + ], + [AC_CHECK_HEADER(curses.h, + [AC_CHECK_LIB(ncurses, mvprintw, + [VLC_ADD_PLUGINS([ncurses]) + VLC_ADD_LDFLAGS([ncurses],[-lncurses])] + )] + )] + ) fi]) dnl @@ -5450,7 +5479,7 @@ AC_ARG_ENABLE(gnutls, [ --enable-gnutls gnutls TLS/SSL support (default enabled)]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2.9], [have_gnutls="yes"], [have_gnutls="no"]) + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.3.3], [have_gnutls="yes"], [have_gnutls="no"]) AS_IF([test "${have_gnutls}" = "yes"], [ VLC_ADD_PLUGINS([gnutls]) @@ -5814,7 +5843,7 @@ dnl dnl Mediacontrol Python bindings dnl AC_ARG_ENABLE(python-bindings, - [ --enable-python-bindings Enable Python bindings (default disabled)]) + [ --enable-python-bindings Enable Python bindings (default disabled)]) dnl TODO: look for python dev headers AS_IF([test "${enable_python_bindings}" = "yes"], PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python" @@ -6005,7 +6034,6 @@ AC_SUBST(MOZILLA_SDK_PATH) AC_SUBST(WINE_SDK_PATH) AC_SUBST(LIBEXT) AC_SUBST(AM_CPPFLAGS) -AC_SUBST(ALL_LINGUAS) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(FILE_LIBVLC_DLL) @@ -6051,6 +6079,7 @@ AC_CONFIG_FILES([ modules/audio_filter/channel_mixer/Makefile modules/audio_filter/converter/Makefile modules/audio_filter/resampler/Makefile + modules/audio_filter/spatializer/Makefile modules/audio_mixer/Makefile modules/audio_output/Makefile modules/codec/Makefile @@ -6072,6 +6101,7 @@ AC_CONFIG_FILES([ modules/gui/beos/Makefile modules/gui/pda/Makefile modules/gui/macosx/Makefile + modules/gui/minimal_macosx/Makefile modules/gui/qnx/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile @@ -6143,6 +6173,8 @@ echo " vlc aliases :${ALIASES} plugins/bindings :${PLUGINS_BINDINGS} +You can check which modules have been enabled +with \`./vlc-config --list plugin'. You can tune the compiler flags in vlc-config. To build vlc and its plugins, type \`./compile' or \`make'. "