X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fda159f961b94109e7ebeecd11e77ae6ea730c9c;hb=494dbf114ee7bdd85ac21f4a344a3e98b3c6e3ff;hp=b73734fe99853da690d9c8a75922d78506d080e0;hpb=59f49f9cce13e7561f1c6448803e388062105f83;p=vlc diff --git a/configure.ac b/configure.ac index b73734fe99..fda159f961 100644 --- a/configure.ac +++ b/configure.ac @@ -348,7 +348,7 @@ case "${host_os}" in VLC_ADD_LIBS([activex mozilla],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx 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 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]) + VLC_ADD_LIBS([filesystem], [-lshlwapi]) dnl dnl DEP and ASLR options dnl @@ -380,20 +380,14 @@ case "${host_os}" in CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" VLC_ADD_CXXFLAGS([beos],[]) VLC_ADD_LIBS([vlc libvlccore logger],[-lbe]) - VLC_ADD_LIBS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) VLC_ADD_LIBS([dvdnav dvdread],[-ldl]) - VLC_ADD_LIBS([access_file],[-lpoll]) + VLC_ADD_LIBS([filesystem],[-lpoll]) 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 oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket]) + VLC_ADD_LIBS([filesystem 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 oldtelnet netsync sap libvlccore growl_udp],[-lnet]) - fi - - dnl Ugly check for Zeta - if test -f /boot/beos/system/lib/libzeta.so; then - VLC_ADD_LIBS([beos],[-lzeta]) + VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet]) fi ;; *) @@ -568,37 +562,19 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([gettimeofday isatty getpwuid_r memalign posix_memalign getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale tdestroy]) -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 strtok_r strtoll vasprintf swab]) -AC_CHECK_FUNCS([stricmp strnicmp]) +AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale]) +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 swab vasprintf]) 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 accept4]) +AC_CHECK_FUNCS([accept4 eventfd fstatfs vmsplice]) AH_BOTTOM([#include ]) AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])]) -dnl Check for setlocal and langinfo -AC_CHECK_FUNCS(setlocale) -AC_CHECK_HEADERS(langinfo.h) -AC_CHECK_FUNCS(nl_langinfo) - -AC_CACHE_CHECK([for nl_langinfo and CODESET], ac_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - ac_cv_langinfo_codeset=yes, - ac_cv_langinfo_codeset=no) - ]) -if test ${ac_cv_langinfo_codeset} = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) -fi - SOCKET_LIBS="" AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ @@ -724,7 +700,7 @@ 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 access_avio 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 realvideo opengl],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm]) @@ -800,7 +776,7 @@ if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then ac_cv_my_have_dlopen=yes, AC_CHECK_LIB(dl, dlopen, ac_cv_my_have_dlopen=yes - VLC_ADD_LIBS([libvlccore realaudio realvideo lua],[-ldl]), + VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]), AC_CHECK_LIB(svld, dlopen, ac_cv_my_have_dlopen=yes VLC_ADD_LIBS([libvlccore],[-lsvld])))) @@ -827,7 +803,7 @@ if test "${THREAD_LIB}" = "error"; then THREAD_LIB="" fi -VLC_ADD_LIBS([libvlccore libvlc plugin],[${THREAD_LIB}]) +VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${THREAD_LIB}]) AC_CHECK_LIB(rt, clock_nanosleep, [ VLC_ADD_LIBS([libvlccore],[-lrt]) @@ -860,7 +836,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h) -AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h) +AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h) AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ @@ -873,8 +849,6 @@ AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h]) AC_CHECK_HEADERS(syslog.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -AC_HEADER_TIME - dnl LP64 adn LLP64 architectures had better define ssize_t by themselves... AH_TEMPLATE(ssize_t, [Define to `int' if does not define.]) AC_CHECK_TYPE(ssize_t,, [ @@ -1187,114 +1161,14 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -dnl Video filters: -VLC_ADD_PLUGIN([deinterlace]) -VLC_ADD_PLUGIN([yuvp]) -VLC_ADD_PLUGIN([invert]) -VLC_ADD_PLUGIN([mirror]) -VLC_ADD_PLUGIN([adjust]) -VLC_ADD_PLUGIN([transform]) -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]) -VLC_ADD_PLUGIN([noise]) -VLC_ADD_PLUGIN([grain]) -VLC_ADD_PLUGIN([extract]) -VLC_ADD_PLUGIN([sharpen]) -VLC_ADD_PLUGIN([croppadd]) -VLC_ADD_PLUGIN([canvas]) -VLC_ADD_PLUGIN([blendbench]) -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]) -VLC_ADD_PLUGIN([scene]) -VLC_ADD_PLUGIN([yuv]) - ALIASES="${ALIASES} cvlc" -dnl -dnl default modules that need g++ -dnl -AC_LANG_PUSH(C++) -VLC_ADD_PLUGIN([spatializer]) -AC_LANG_POP(C++) - if test "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([gestures]) VLC_ADD_PLUGIN([oldrc]) - VLC_ADD_PLUGIN([hotkeys]) - VLC_ADD_PLUGIN([showintf]) - VLC_ADD_PLUGIN([marq]) - VLC_ADD_PLUGIN([podcast]) - VLC_ADD_PLUGIN([shout]) - VLC_ADD_PLUGIN([sap]) VLC_ADD_PLUGIN([mediadirs]) - VLC_ADD_PLUGIN([fake]) - VLC_ADD_PLUGIN([folder]) - VLC_ADD_PLUGIN([rss]) - VLC_ADD_PLUGIN([mosaic]) - VLC_ADD_PLUGIN([wall]) - VLC_ADD_PLUGIN([motiondetect]) - VLC_ADD_PLUGIN([clone]) - VLC_ADD_PLUGIN([crop]) - VLC_ADD_PLUGIN([erase]) - VLC_ADD_PLUGIN([bluescreen]) - VLC_ADD_PLUGIN([alphamask]) - VLC_ADD_PLUGIN([gaussianblur]) - VLC_ADD_PLUGIN([i420_yuy2]) - VLC_ADD_PLUGIN([i422_yuy2]) - VLC_ADD_PLUGIN([i422_i420]) - VLC_ADD_PLUGIN([yuy2_i422]) - VLC_ADD_PLUGIN([yuy2_i420]) - VLC_ADD_PLUGIN([chain]) - VLC_ADD_PLUGIN([aout_file]) - VLC_ADD_PLUGIN([linear_resampler]) - VLC_ADD_PLUGIN([bandlimited_resampler]) - VLC_ADD_PLUGIN([float32_mixer]) - VLC_ADD_PLUGIN([spdif_mixer]) - VLC_ADD_PLUGIN([simple_channel_mixer]) - 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([a52tospdif]) - VLC_ADD_PLUGIN([dtstospdif]) ALIASES="${ALIASES} rvlc" fi -if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGIN([chain]) - VLC_ADD_PLUGIN([aout_file]) - VLC_ADD_PLUGIN([linear_resampler]) - VLC_ADD_PLUGIN([bandlimited_resampler]) - VLC_ADD_PLUGIN([float32_mixer]) - VLC_ADD_PLUGIN([spdif_mixer]) - 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]) - VLC_ADD_PLUGIN([i422_yuy2]) - VLC_ADD_PLUGIN([i422_i420]) - VLC_ADD_PLUGIN([yuy2_i422]) - VLC_ADD_PLUGIN([yuy2_i420]) -fi - dnl dnl Some plugins aren't useful on some platforms dnl @@ -2470,32 +2344,6 @@ dnl gnomeVFS access module dnl PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS access module], [auto]) - -dnl Need to test libcdio and libvcdinfo for a number of things. Do it now. -AC_ARG_ENABLE(libcdio, - [ --enable-libcdio CD input and control library support (default enabled)]) - -AC_ARG_ENABLE(libvcdinfo, - [ --enable-libvcdinfo VCD information library support (default enabled)]) - -have_libcdio=no -have_libvcdinfo=no -if test "${enable_libcdio}" != "no" -then - PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2, - have_libcdio=yes - AC_DEFINE(HAVE_LIBCDIO, 1, - [Define if you have libcdio 0.78.2 or greater installed]), - [AC_MSG_WARN(CD Reading and information library not found)]) - - if test "${enable_libvcdinfo}" != "no" - then - PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22, - [have_libvcdinfo=yes], - [AC_MSG_WARN(VCD information library not found)]) - fi -fi - dnl dnl VCDX modules dnl @@ -2504,32 +2352,15 @@ AC_ARG_ENABLE(vcdx, if test "${enable_vcdx}" = "yes" then - if test "${have_libvcdinfo}" = "yes" - then - VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS]) - else - AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled]) - HAVE_VCDX=no - fi - - PKG_CHECK_MODULES(LIBCDIO, libiso9660 >= 0.72, - [VLC_ADD_LIBS([vcdx],[$LIBISO9660_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBISO9660_CFLAGS])], - [AC_MSG_WARN([vcdx plugin disabled because ok libiso9660 library not found]) - HAVE_VCDX=no]) - - if test "$have_libvcdinfo" = "yes" - then - AC_DEFINE(HAVE_VCDX, 1, - [Define for the VCD plugin using libcdio/libvcdinfo]) - VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS]) - VLC_ADD_PLUGIN([vcdx]) - else - AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found]) - HAVE_VCDX=no - fi + PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72], + [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])], + [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])]) + PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22, + [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])], + [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])]) + VLC_ADD_PLUGIN([vcdx]) fi dnl @@ -2971,6 +2802,9 @@ AS_IF([test "${enable_libva}" != "no"], [ AS_IF([test "x${have_avcodec}" = "xyes"], [ PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" + CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" AC_CHECK_HEADERS(libavcodec/vaapi.h, [ VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS]) VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS]) @@ -2981,6 +2815,7 @@ AS_IF([test "${enable_libva}" != "no"], [ [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])], [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])]) ]) + VLC_RESTORE_FLAGS ],[ AS_IF([test "${enable_libva}" == "yes"], [AC_MSG_ERROR([Could not find required libva.])], @@ -3197,7 +3032,6 @@ dnl AC_ARG_ENABLE(real, [ --enable-real Real media module (default disabled)]) if test "${enable_real}" = "yes"; then - VLC_ADD_PLUGIN([realaudio]) VLC_ADD_PLUGIN([realvideo]) fi @@ -4217,12 +4051,6 @@ dnl AC_ARG_WITH(,[Interface plugins:]) -dnl special case for BeOS -if test "${SYS}" = "beos" -then - VLC_ADD_PLUGIN([beos]) -fi - dnl dnl Skins2 module dnl @@ -4503,11 +4331,11 @@ dnl PKG_ENABLE_MODULES_VLC([PROJECTM], [], [libprojectM], [projectM visualization plugin], [auto]) dnl -dnl AtmoLight (homebrew AmbiLight) +dnl AtmoLight (homemade Philips Ambilight clone) dnl AC_ARG_ENABLE(atmo, -AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew Philips ambilight) - (broken, default disabled)]),, [enable_atmo="no"]) +AS_HELP_STRING([--disable-atmo],[AtmoLight (homemade Philips Ambilight clone) + (default enabled)]),, [enable_atmo="yes"]) AS_IF([test "${enable_atmo}" != no], [ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "linux"], [ AC_LANG_PUSH(C++) @@ -4729,8 +4557,6 @@ AS_IF([test "${enable_loader}" = "yes"], VLC_ADD_LIBS([dmo],[\\\${top_builddir}/libs/loader/libloader.la -lpthread]) VLC_ADD_CPPFLAGS([quicktime],[-I\\\${top_srcdir}/libs/loader]) VLC_ADD_LIBS([quicktime],[\\\${top_builddir}/libs/loader/libloader.la -lpthread]) - VLC_ADD_CPPFLAGS([realaudio],[-I\\\${top_srcdir}/libs/loader -DLOADER]) - VLC_ADD_LIBS([realaudio],[\\\${top_builddir}/libs/loader/libloader.la]) VLC_ADD_CPPFLAGS([realvideo],[-I\\\${top_srcdir}/libs/loader -DLOADER]) VLC_ADD_LIBS([realvideo],[\\\${top_builddir}/libs/loader/libloader.la]) ]) @@ -5032,8 +4858,7 @@ AC_SUBST(VERSION_REVISION) AC_SUBST(VERSION_EXTRA) AC_SUBST(COPYRIGHT_YEARS) AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) -AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s 2>/dev/null || hostname`", [host which ran configure]) -AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) +AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) dnl Win32 need s a numerical version_extra. case $( echo ${VERSION_EXTRA}|wc -m ) in @@ -5156,7 +4981,6 @@ AC_CONFIG_FILES([ modules/demux/mpeg/Makefile modules/demux/playlist/Makefile modules/gui/Makefile - modules/gui/beos/Makefile modules/gui/macosx/Makefile modules/gui/hildon/Makefile modules/gui/minimal_macosx/Makefile @@ -5210,7 +5034,10 @@ 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 +if test -n $SHELL; then + SHELL=${CONFIG_SHELL-/bin/sh} +fi +echo '#! '$SHELL >compile echo rm -f .error\$\$ >>compile echo ERROR=0 >>compile echo export PATH=$PATH LANG=C >>compile