X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=f3d58e51f3f07a52d479284deb3058e74f28bc5f;hb=895c05d72e5c8d75ca016e06a377cd55aa86f9af;hp=ae5db9e514d4c544dfa21da60d3872b0b8a41b4c;hpb=5801a8c41b16e796f9995cf6fa1a4cc054064523;p=vlc diff --git a/configure.ac b/configure.ac index ae5db9e514..f3d58e51f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1254,7 +1254,7 @@ dnl Check for fully working MMX intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) AC_ARG_ENABLE(mmx, -[ --disable-mmx disable MMX optimizations (default auto)],,[ +[ --disable-mmx disable MMX optimizations (default auto)],,[ case "${host_cpu}" in i?86|x86_64) enable_mmx="yes" @@ -1321,7 +1321,8 @@ dnl Check for fully workin SSE2 intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) AC_ARG_ENABLE(sse, -[ --disable-sse disable SSE (1 and 2) optimizations (default auto)],, [ +[ --disable-sse disable SSE (1 and 2) optimizations (default auto)] +,, [ case "${host_cpu}" in i686|x86_64) enable_sse=yes @@ -1664,6 +1665,21 @@ then fi AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) +dnl +dnl libproxy support +dnl +AC_ARG_ENABLE(libproxy, + [ --enable-libproxy libproxy support (default auto)]) +AS_IF([test "${enable_libproxy}" != "no"], [ + AC_CHECK_HEADERS(proxy.h, [ + VLC_ADD_LIBS([access_http],[-lproxy]) + ], [ + AS_IF([test "x${enable_libproxy}" != "x"], [ + AC_MSG_ERROR([libproxy could not be found on your system]) + ]) + ]) +]) + dnl dnl VideoLAN manager dnl @@ -2887,7 +2903,7 @@ dnl dnl libid3tag support (FIXME!!! doesn't work with new input) dnl AC_ARG_ENABLE( id3tag, - [ --disable-id3tag id3tag metadata reader plugin (default enabled)]) +[ --disable-id3tag id3tag metadata reader plugin (default enabled)]) AS_IF([test "${enable_id3tag}" != "no"], [ AC_CHECK_HEADERS(id3tag.h, [ AC_CHECK_HEADERS(zlib.h, [ @@ -2902,7 +2918,7 @@ dnl avcodec decoder/encoder plugin dnl AC_ARG_ENABLE(avcodec, -[ --enable-avcodec libavcodec codec (default enabled)]) +[ --enable-avcodec libavcodec codec (default enabled)]) if test "${enable_avcodec}" != "no" then PKG_CHECK_MODULES(AVCODEC,[libavcodec libavutil], @@ -2926,7 +2942,7 @@ dnl avformat demuxer/muxer plugin dnl AC_ARG_ENABLE(avformat, -[ --enable-avformat libavformat containers (default enabled)]) +[ --enable-avformat libavformat containers (default enabled)]) if test "${enable_avformat}" != "no" then PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil], @@ -2950,7 +2966,7 @@ dnl swscale image scaling and conversion plugin dnl AC_ARG_ENABLE(swscale, -[ --enable-swscale libswscale image scaling and conversion (default enabled)]) +[ --enable-swscale libswscale image scaling and conversion (default enabled)]) if test "${enable_swscale}" != "no" then PKG_CHECK_MODULES(SWSCALE,[libswscale], @@ -2978,7 +2994,7 @@ dnl from VLC. dnl AC_ARG_ENABLE(imgresample, -[ --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)]) +[ --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)]) if test "${enable_imgresample}" = "yes" then PKG_CHECK_MODULES(IMGRESAMPLE,[libavcodec], @@ -3014,7 +3030,7 @@ dnl postproc plugin dnl AC_ARG_ENABLE(postproc, -[ --enable-postproc libpostproc image post-processing (default enabled)]) +[ --enable-postproc libpostproc image post-processing (default enabled)]) if test "${enable_postproc}" != "no" then PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil], @@ -3686,7 +3702,7 @@ dnl dnl asa/csri subtitle rendering module dnl AC_ARG_ENABLE(csri, - [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) + [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) AS_IF( [test "${enable_csri}" = "yes"], [ PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, @@ -3703,7 +3719,7 @@ dnl dnl asa demuxer dnl AC_ARG_ENABLE(asademux, - [ --enable-asademux asa subtitle demuxing (default disabled)]) + [ --enable-asademux asa subtitle demuxing (default disabled)]) AS_IF( [test "${enable_asademux}" = "yes"], [ PKG_CHECK_MODULES(PCRE, libpcre >= 6.5, @@ -4552,7 +4568,8 @@ AC_ARG_ENABLE(portaudio, fi]) dnl -dnl aRts module -- broken (freeze wxWidgets) +dnl aRts module +dnl broken? (froze wxWidgets back then) dnl AC_ARG_ENABLE(arts, [ --enable-arts aRts sound server (default disabled)], @@ -4728,7 +4745,7 @@ dnl dnl UPnP Plugin (Intel SDK) dnl AC_ARG_ENABLE(upnp, - [ --enable-upnp Intel UPnP SDK (default enabled)]) + [AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])]) VLC_ADD_CXXFLAGS([upnp_intel], [ ]) AS_IF([test "x${enable_upnp}" != "xno"], [ @@ -4764,7 +4781,8 @@ dnl dnl Skins2 module dnl AC_ARG_ENABLE(skins2, - [ --enable-skins2 Skins2 interface module (default disabled)]) + [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default + enabled except on MacOSX, BeOS and WinCE)])]) if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS}" != "beos" && test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no"); then @@ -4802,7 +4820,9 @@ if test "${enable_skins2}" = "yes" || VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) fi fi fi fi -AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" || + (test "${SYS}" != "darwin" && test "${SYS}" != "beos" && + test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")]) dnl dnl PDA Gtk+2 module @@ -4826,138 +4846,37 @@ then fi AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"]) -dnl -dnl wxWidgets module -dnl -AC_ARG_ENABLE(wxwidgets, - [ --enable-wxwidgets wxWidgets support (default disabled)]) - -if test "${enable_wxwidgets}" = "yes" -then - AC_MSG_WARN([wxWidgets support is deprecated and will be removed. Consider using Qt4 instead.]) - WXWIDGETS_PATH="${PATH}" - AC_ARG_WITH(wx-config-path, - [ --with-wx-config-path=PATH wx-config path (default search in \$PATH)], - [ if test "${with_wx_config_path}" != "no" - then - WXWIDGETS_PATH="${with_wx_config_path}:${PATH}" - fi ]) - WXWIDGETS_NAME="wx-config" - AC_ARG_WITH(wx-config, - [ --with-wx-config=NAME wx-config name (default is wx-config)], - [ if test "${with_wx_config}" != "no" - then - WXWIDGETS_NAME="${with_wx_config}" - fi ]) - # look for wx-config - AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH}) - if test "${WX_CONFIG}" != "no" -a "${CXX}" != "" - then - if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null - then - AC_MSG_ERROR([You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again.]) - fi - AC_LANG_PUSH(C++) - # Turn this error: - # playlist.cpp:1351: error: ISO C++ forbids cast to non-reference type - # into a warning. However better would be to fix playlist.cpp - AC_CACHE_CHECK([if \$CXX accepts -fpermissive], - [ac_cv_cxx_fpermissive], - [CXXFLAGS="${CXXFLAGS_save} -fpermissive" - AC_TRY_COMPILE([],,ac_cv_cxx_fpermissive=yes, - ac_cv_cxx_fpermissive=no)]) - if test "${ac_cv_cxx_fpermissive}" = "yes"; then - VLC_ADD_CXXFLAGS([wxwidgets],-fpermissive) - fi - VLC_ADD_LIBS([wxwidgets],[`${WX_CONFIG} --libs`]) - VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`]) - # check if we must link against gtk2 libs - # if __WXGTK20__ && __WXGTK__ are defined - # for modules/gui/wxwidgets/video.cpp - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -#include -#ifdef __WXGTK20__ -#error ok, we need to link against gtk2 -#endif - ])],[WXGTK=no],[WXGTK=yes]) - if test "$WXGTK" = "yes"; then - ${PKG_CONFIG} --exists gtk+-2.0 && VLC_ADD_LIBS([wxwidgets],[`$PKG_CONFIG --libs gtk+-2.0`]) - fi - if ${WX_CONFIG} --unicode - then - # wxwidgets should provide the following flags but does not - # the following is required to compile for win32 - VLC_ADD_CXXFLAGS([wxwidgets],[-D_UNICODE -DUNICODE]) - else - AC_MSG_ERROR([You need a unicode build of wxWidgets. Please fix that and try again. Better yet, you can configure with --disable-wxwidgets.]) - fi - if test "$have_libcdio" = "yes" - then - VLC_ADD_LIBS([wxwidgets],[$LIBCDIO_LIBS]) - VLC_ADD_CXXFLAGS([wxwidgets],[$LIBCDIO_CFLAGS]) - else - AC_MSG_WARN([Probe disc disabled because ok libcdio library not found]) - fi - - if test "$have_libvcdinfo" = "yes" - then - VLC_ADD_LIBS([wxwidgets],[$VCDINFO_LIBS]) - VLC_ADD_CXXFLAGS([wxwidgets],[$VCDINFO_CFLAGS]) - else - AC_MSG_WARN([VCD information on Probe disc disabled because ok libvcdinfo not found]) - fi - - # now look for the wxprec.h header - CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwidgets}" - ac_cv_wx_headers=yes - AC_CHECK_HEADERS(wx/wxprec.h, , [ - ac_cv_wx_headers=no - echo "Cannot find wxWidgets development headers." - ]) - if test "${ac_cv_wx_headers}" = "yes" - then - VLC_ADD_PLUGIN([wxwidgets]) - AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.]) - ALIASES="${ALIASES} wxvlc" - fi - CPPFLAGS="${CPPFLAGS_save}" - AC_LANG_POP(C++) - fi - dnl WxWidgets plugin will yield incorrect code without this - VLC_ADD_CXXFLAGS([wxwidgets], [-fno-strict-aliasing]) -fi - dnl dnl QT 4 dnl -enableqt4=false AC_ARG_ENABLE(qt4, - [ --enable-qt4 QT 4 support (default enabled) ]) -AS_IF([test "${enable_qt4}" != "no" && - (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [ - PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0], - [ VLC_ADD_PLUGIN([qt4]) - AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) - ALIASES="${ALIASES} qvlc" - enableqt4=true - if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"; then - VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11]) - else - VLC_ADD_LIBS([qt4],[$QT4_LIBS]) - fi - VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"]) - 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) - ], - AS_IF([test "${enable_qt4}" = "yes"],[ - AC_MSG_ERROR(QT4 library not found) - ],[ - AC_MSG_WARN(QT4 library not found) - ]) - ) + [ --enable-qt4 QT 4 support (default enabled) ],, [ + AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no]) ]) -AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true") +AS_IF([test "${enable_qt4}" != "no"], [ + PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.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}" != "cygwin" -a "${SYS}" != "darwin"], [ + VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11]) + ], [ + VLC_ADD_LIBS([qt4],[$QT4_LIBS]) + ]) + VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"]) + 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) + ], [ + AS_IF([test "${enable_qt4}" = "yes"],[ + AC_MSG_ERROR([Qt 4 library not found]) + ],[ + AC_MSG_WARN([Qt 4 library not found]) + ]) + enable_qt4="no" + ]) +]) +AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"]) dnl dnl WinCE GUI module @@ -4982,7 +4901,7 @@ fi dnl dnl Simple test for skins2 dependency dnl -AS_IF([test "${enable_skins2}" != "no"], [ +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.]) ]) @@ -5227,7 +5146,7 @@ dnl AtmoLight (homebrew AmbiLight) dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then AC_ARG_ENABLE(atmo, -[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) +[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) VLC_ADD_PLUGIN([atmo]) @@ -5280,7 +5199,7 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [ ]) if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_LIBS([rtp], [${LIBGCRYPT_LIBS}]) + VLC_ADD_LIBS([rtp stream_out_rtp], [${LIBGCRYPT_LIBS}]) ]) fi AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) @@ -5318,7 +5237,7 @@ dnl dnl RemoteOSD plugin (VNC client as video filter) dnl AC_ARG_ENABLE(remoteosd, - [ --disable-remoteosd RemoteOSD plugin (default enabled)]) + [ --disable-remoteosd RemoteOSD plugin (default enabled)]) AS_IF([test "${enable_remoteosd}" != "no"], [ AS_IF([test "${have_libgcrypt}" = "yes"],[ @@ -5415,13 +5334,13 @@ then AC_CHECK_HEADERS(objsafe.h, VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, [ - #if HAVE_OLE2_H + #if HAVE_OLE2_H # include #endif - ] + ] ) activex=: - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex" + PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex" ], [ AC_MSG_ERROR([required OLE headers are missing from your system]) ] )], @@ -5865,7 +5784,6 @@ AC_CONFIG_FILES([ modules/gui/qnx/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile - modules/gui/wxwidgets/Makefile modules/gui/wince/Makefile modules/meta_engine/Makefile modules/misc/Makefile