Commit 3501cab9 authored by Rafaël Carré's avatar Rafaël Carré

Disable D-Bus if installed version is < 1.0.0 and warns the user.

Adds an option to force D-Bus support to be enabled anyway.
parent 7cf5fbe8
...@@ -864,28 +864,49 @@ then ...@@ -864,28 +864,49 @@ then
VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS]) VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS])
VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
fi], fi],
dnl not too old dbus
[ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.92, if ${PKG_CONFIG} --exists dbus-1
[ AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] ) then
AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30] ) [AC_ARG_ENABLE(old-dbus,
AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) [ --enable-old-dbus Deprecated D-Bus support (default disabled)])]
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], if test "${enable_old_dbus}" != "yes"
dnl older dbus then
[ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30, echo ""
[ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30 ] ) echo "****** WARNING **** WARNING ***** WARNING *************"
AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) echo "*** Your D-Bus version is < 1.0.0"
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) echo "*** You are using old and buggy software and so"
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], echo "*** D-Bus support has been disabled."
dnl much older dbus echo "*** Please upgrade D-Bus : http://dbus.freedesktop.org"
[ PKG_CHECK_MODULES( DBUS, dbus-1, echo "*** Alternatively you can force the use of your old and"
[AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library]) echo "*** buggy D-Bus version by specifying --enable-old-dbus"
echo "*******************************************************"
echo ""
else
dnl not too old dbus
[ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.92,
[ AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] )
AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30] )
AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] )
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
[AC_MSG_WARN(DBUS library not found)]) dnl older dbus
] [ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
)] [ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30 ] )
)] AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] )
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
dnl much older dbus
[ PKG_CHECK_MODULES( DBUS, dbus-1,
[AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library])
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
[AC_MSG_WARN(DBUS library not found)])
]
)]
)]
fi
fi
) )
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment