X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=bcdb411685dcd827899187515024c7e60afe4ea8;hb=78fb052e89e9063ab985c1ad3c3ce10e47d1621d;hp=721be8199d8caf784d1af263d62e054988e01358;hpb=c5544522f6409095627dc3d1129560195ab4ec40;p=catta

diff --git a/configure.ac b/configure.ac
index 721be81..bcdb411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,25 +57,79 @@ AC_FUNC_MEMCMP
 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 GTK 2.0
-PKG_CHECK_MODULES(GLIB20, [ gtk+-2.0 >= 2.4.0 ])
-AC_SUBST(GTK20_CFLAGS)
-AC_SUBST(GTK20_LIBS)
+AC_ARG_ENABLE(gtk,
+        AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
+        [case "${enableval}" in
+                yes) ENABLE_GTK=yes ;;
+                no)  ENABLE_GTK=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;;
+        esac],
+        [ENABLE_GTK=yes]) dnl Default value
+
+if test "x$ENABLE_GTK" = "xyes"; then
+        # Check for GTK 2.0
+        PKG_CHECK_MODULES(GTK20, [ gtk+-2.0 >= 2.4.0 ])
+        AC_SUBST(GTK20_CFLAGS)
+        AC_SUBST(GTK20_LIBS)
+        
+        # Check for GLADE 2.0
+        PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ])
+        AC_SUBST(GLADE20_CFLAGS)
+        AC_SUBST(GLADE20_LIBS)
+fi
+AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
+
+AC_ARG_ENABLE(doxygen,
+        AC_HELP_STRING([--enable-doxygen],[use doxygen to generate API docs (default=yes)]),
+        [case "${enableval}" in
+                yes) ENABLE_DOXYGEN=yes ;;
+                no)  ENABLE_DOXYGEN=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;;
+        esac],
+        [ENABLE_DOXYGEN=yes]) dnl Default value
+
+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)
 
-# Check for GLADE 2.0
-PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ])
-AC_SUBST(GLADE20_CFLAGS)
-AC_SUBST(GLADE20_LIBS)
+if ! $have_expat ; then
+   AC_MSG_ERROR([*** libexpat not found ***])
+fi
 
-# Check for DBUS
-PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.23, dbus-glib-1 >= 0.23 ])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
+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
@@ -86,5 +140,5 @@ if test "x$GCC" = "xyes" ; then
    rm -f conftest.o
 fi
 
-AC_CONFIG_FILES([Makefile avahi-core.pc doxygen/Makefile doxygen/doxygen.conf avahi-common/Makefile avahi-core/Makefile daemon/Makefile avahi-discover/Makefile])
+AC_CONFIG_FILES([Makefile avahi-core.pc doxygen/Makefile doxygen/doxygen.conf avahi-common/Makefile avahi-core/Makefile avahi-daemon/Makefile avahi-discover/Makefile avahi-client/Makefile])
 AC_OUTPUT