Permalink
Browse files

build: allow build without dbus

  • Loading branch information...
1 parent 21cce9e commit eb3b6c1d256929fefefe208c61cd59416e92fe53 theuni committed Aug 13, 2011
Showing with 13 additions and 3 deletions.
  1. +11 −3 configure.in
  2. +2 −0 xbmc/system.h
View
@@ -97,6 +97,7 @@ librtmp_disabled="== RTMP support disabled. =="
libnfs_not_found="== Could not find libnfs. NFS support disabled. =="
libnfs_disabled="== NFS support disabled. =="
alsa_not_found="== Could not find ALSA. ALSA support disabled. =="
+dbus_not_found="== Could not find DBUS. DBUS support disabled. =="
# External library message strings
@@ -687,9 +688,10 @@ else
PKG_CHECK_MODULES([ALSA], [alsa],
[INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"; use_alsa=yes],
AC_MSG_NOTICE($alsa_not_found); use_alsa=no)
- PKG_CHECK_MODULES([DBUS], [dbus-1],
- [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"],
- AC_MSG_ERROR($missing_library))
+ PKG_CHECK_MODULES([DBUS], [dbus-1],
+ [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"; use_dbus=yes]; \
+ AC_DEFINE([HAVE_DBUS],[1],["Define to 1 if dbus is installed"]),
+ AC_MSG_NOTICE($missing_library); use_dbus=no)
PKG_CHECK_MODULES([SDL], [sdl],
[INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"],
AC_MSG_ERROR($missing_library))
@@ -1243,6 +1245,12 @@ else
final_message="$final_message\n ALSA:\t\tNo"
fi
+if test "$use_dbus" = "yes"; then
+ final_message="$final_message\n DBUS:\t\tYes"
+else
+ final_message="$final_message\n DBUS:\t\tNo"
+fi
+
if test "x$use_vdpau" != "xno"; then
final_message="$final_message\n VDPAU:\tYes"
else
View
@@ -133,8 +133,10 @@
#define HAS_AVAHI
#endif
#define HAS_LCD
+#ifdef HAVE_DBUS
#define HAS_DBUS
#define HAS_DBUS_SERVER
+#endif
#define HAS_GL
#ifdef HAVE_X11
#define HAS_GLX

0 comments on commit eb3b6c1

Please sign in to comment.