X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=e0f35cfdd6ed1f2f0c6b7e1f0aa006549fa9987e;hb=964e9764b0ea8a7580bbdecb40ac2b89f4d2858c;hp=1a295d4c61d61cc463baea05b3b08d23472a062d;hpb=ce170511234a040ea6f418b168beb3a6e51a1f2c;p=catta

diff --git a/configure.ac b/configure.ac
index 1a295d4..e0f35cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,14 +104,29 @@ AC_ARG_ENABLE(dbus,
         esac],
 	[ENABLE_DBUS=yes]) dnl Default value
 
+AC_DEFINE(ENABLE_DBUS, 1, [Whether to use DBUS or not])
+
 if test "x$ENABLE_DBUS" = "xyes"; then
         PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.23])
         AC_SUBST(DBUS_CFLAGS)
 	AC_SUBST(DBUS_LIBS)
+
+	if pkg-config dbus-1 --atleast-version=0.30 ; then
+		AC_DEFINE(DBUS_USE_NEW_API, 1, [Whether to use the new API for DBUS 0.30])
+	fi
 fi
 
 AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" = "xyes")
 
+AC_CHECK_LIB(expat, XML_ParserCreate, [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], have_expat=false)
+
+if ! $have_expat ; then
+   AC_MSG_ERROR([*** libexpat not found ***])
+fi
+
+PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.5 ])
+AC_SUBST(LIBDAEMON_CFLAGS)
+AC_SUBST(LIBDAEMON_LIBS)
 
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then