AC_FUNC_SELECT_ARGTYPES
AC_CHECK_FUNCS([gethostname memset select socket strchr strcspn strerror uname])
+AC_CHECK_FUNCS(setresuid)
+AC_CHECK_FUNCS(setreuid)
+
# Check for GLIB 2.0
PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ])
AC_SUBST(GLIB20_CFLAGS)
AC_SUBST(GLIB20_LIBS)
-# Check for DBUS
-PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.23, dbus-glib-1 >= 0.23 ])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
AC_ARG_ENABLE(gtk,
AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
[case "${enableval}" in
AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes")
+AC_ARG_ENABLE(dbus,
+ AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
+ [case "${enableval}" in
+ yes) ENABLE_DBUS=yes ;;
+ no) ENABLE_DBUS=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --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
CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"