X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=18653372e17b5373e27b67d2fa0ff247835b18d8;hb=a1bf965dd5248902f24b0d0ee5279b5f758db02d;hp=624752c25d920c087d6ee1da5c9b58b8232e53ac;hpb=9f13848c8fa513d1bf2944cc81bd291bbc80fd35;p=vlc diff --git a/configure.ac b/configure.ac index 624752c25d..18653372e1 100644 --- a/configure.ac +++ b/configure.ac @@ -14,9 +14,7 @@ AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_SYSTEM -dnl XXX: we don't put any flags here, because automake 1.5 doesn't support -dnl them. And we need the comma otherwize automake will choke on it. -AM_INIT_AUTOMAKE(vlc,0.8.6-svn) +AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2]) AM_CONFIG_HEADER(config.h) dnl Too many people are not aware of maintainer mode: @@ -79,7 +77,7 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AC_ARG_ENABLE(libtool, - [ --enable-libtool use libtool (default disabled, EXPERIMENTAL)], + [ --enable-libtool use libtool (default disabled)], [],[enable_libtool="no"]) AM_CONDITIONAL(USE_LIBTOOL, [test "${enable_libtool}" != "no"]) @@ -310,7 +308,7 @@ AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl) - INCLUDES="${INCLUDES} -I\$(top_builddir)/intl" + AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl" AS_IF([test "${enable_libtool}" != "no"], [ INCLUDED_LIBINTL="${LTLIBINTL}" ],[ @@ -841,7 +839,7 @@ fi dnl Check for dbus AC_ARG_ENABLE(dbus, - [ --enable-dbus Linux D-BUS message bus system (default enabled)]) + [ --enable-dbus Linux D-BUS message bus system (default enabled)]) if test "${enable_dbus}" != "no" then @@ -1441,7 +1439,6 @@ test "${enable_release}" != "yes" && enable_release="no" dnl dnl Is the shared libvlc forced ? dnl -build_pic=no AC_ARG_ENABLE(shared-libvlc, [ --enable-shared-libvlc Win32 libvlc.dll build (default disabled)]) AS_IF([test "${enable_libtool}" != "no" && test "${enable_shared_libvlc}"], [ @@ -1509,6 +1506,26 @@ AS_IF([test "${enable_growl}" != "no"], [ ] ) +dnl +dnl Libnotify notification plugin +dnl + +AC_ARG_ENABLE(notify, + [ --enable-notify libnotify notification plugin (default enabled)]) +AS_IF([test "${enable_notify}" != "no"], [ + PKG_CHECK_MODULES(NOTIFY, libnotify, + [ + VLC_ADD_PLUGINS([notify]) + VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS]) + VLC_ADD_LDFLAGS(notify, [$NOTIFY_LIBS]) + ],[ + AS_IF([test "${enable_notify}" = "yes"],[ + AC_MSG_WARN( libnotify not found) ]) + ]) + ]) + + + dnl dnl Input plugins @@ -1528,7 +1545,7 @@ then enable_live555="yes" fi AC_ARG_ENABLE(live555, -[ --enable-live555 live555 RTSP input plugin (default disabled)]) +[ --enable-live555 live555 RTSP input plugin (default disabled)]) if test "${enable_live555}" = "yes"; then AC_ARG_WITH(live555-tree, [ --with-live555-tree=PATH live.com tree for static linking]) @@ -2592,10 +2609,13 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a]) + elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}]) else dnl The given libavcodec wasn't built with --enable-pp AC_MSG_RESULT(no) - AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp]) fi fi dnl Use a custom libffmpeg @@ -3572,12 +3592,12 @@ AC_ARG_ENABLE(opengl, if test "${enable_opengl}" != "no" && test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "darwin"; then - AC_CHECK_HEADERS(GL/gl.h, [ + AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ VLC_ADD_PLUGINS([opengl]) if test "${SYS}" != "mingw32"; then VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU]) else - VLC_ADD_LDFLAGS([opengl],[-lopengl32]) + VLC_ADD_LDFLAGS([opengl],[-lopengl32 -lglu32]) fi ]) else @@ -4608,7 +4628,7 @@ dnl QT 4 dnl enableqt4=false AC_ARG_ENABLE(qt4, - [ --enable-qt4 QT 4 support (default disabled) ], + [ --enable-qt4 QT 4 support (default disabled) ], [if test "${enable_qt4}" = "yes"; then PKG_CHECK_MODULES(QT4, QtCore QtGui, [ VLC_ADD_PLUGINS([qt4]) @@ -4752,11 +4772,11 @@ AC_ARG_ENABLE(macosx, [if test "${enable_macosx}" = "yes" then VLC_ADD_BUILTINS([macosx]) - VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) + VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL]) fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, VLC_ADD_BUILTINS([macosx]) - VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) + VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL]) )]) CFLAGS=$ORIGCFLAGS @@ -5142,6 +5162,7 @@ then ]) LDFLAGS="${LDFLAGS_save}" fi + fi mozilla=: dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) @@ -5162,7 +5183,6 @@ then else xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" fi - fi dnl End of moz_sdk = "" else dnl special case for mingw32 @@ -5202,9 +5222,8 @@ then CPPFLAGS="${CPPFLAGS_save}" fi - if test "${mozilla}" != "false" + if test "${enable_mozilla}" != "false" then - build_pic=yes AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner) if test "${XPIDL}" = "no"; then AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.]) @@ -5220,22 +5239,19 @@ AC_ARG_ENABLE(mediacontrol-python-bindings, [ --enable-mediacontrol-python-bindings Enable Python bindings for MediaControl (default disabled)]) dnl TODO: look for python dev headers AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"]) -if test "${enable_mediacontrol_python_bindings}" = "yes" -then - build_pic=yes -fi dnl dnl Java bindings dnl AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) -AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) -if test "${enable_java_bindings}" = "yes" +if test "${enable-java-bindings}" = "yes" then - build_pic=yes + AC_PROG_JAVA_CC(javac) + AC_PROG_JAVAC + AC_PROG_JAVA fi - +AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) dnl dnl test plugins @@ -5369,14 +5385,6 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"], FILE_LIBVLC_DLL="" ) -pic=no -AS_IF([test "${build_pic}" = "yes"], [pic=pic]) -AS_IF([test "${SYS}" = "mingw32"], [pic=no]) -AS_IF([test "${pic}" = "no"], [pic=]) -AC_SUBST(pic) - -AM_CONDITIONAL(BUILD_PIC, [test "${build_pic}" = "yes" && test "x${pic}" = "xpic"]) - dnl Import conditional variables generated by bootstrap VLC_CONDITIONALS @@ -5403,8 +5411,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions]) dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions]) -dnl New definitions with value matching 0.8.5 release -module_symbol="0_8_5" +dnl New definitions with value matching 0.8.6 release +module_symbol="0_8_6" AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions]) VLC_ENTRY="vlc_entry__${module_symbol}" @@ -5442,7 +5450,7 @@ AC_SUBST(MOZILLA_SDK_PATH) AC_SUBST(XPIDL) AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) -AC_SUBST(INCLUDES) +AC_SUBST(AM_CPPFLAGS) AC_SUBST(ALL_LINGUAS) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(FILE_LIBVLC_DLL)