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:
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"])
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}"
],[
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
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}"], [
]
)
+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
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])
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
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
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])
enableqt4=true
VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
- MOC=moc],
+ MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
+ UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
[AC_MSG_WARN(QT4 library not found)])
fi])
AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
[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
])
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`]])
else
xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
fi
- fi
dnl End of moz_sdk = ""
else
dnl special case for mingw32
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.])
[ --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
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
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}"
AC_SUBST(ALIASES)
AC_SUBST(ASM)
AC_SUBST(MOC)
+AC_SUBST(UIC)
AC_SUBST(WINDRES)
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)
projects / vlc / blobdiff