X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=e1624525f47c468867facab52798d8b16822ca69;hb=38b45921cd1d33119f1c06979a57bcfe982e22da;hp=a141ad6822592851260635639996daec5315f1a1;hpb=99ad32213bca66d3350de6bbb0ef69102eb2fd7b;p=catta

diff --git a/configure.ac b/configure.ac
index a141ad6..e162452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,12 @@ fi
 
 # Checks for programs.
 AC_PROG_CC
+AC_GNU_SOURCE
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PROG_GCC_TRADITIONAL
 
 # libtool stuff
 AC_PROG_LIBTOOL
@@ -51,11 +53,12 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stdlib.h
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
+AC_HEADER_SYS_WAIT
 
 # Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strerror strrchr strstr uname setresuid setreuid])
+AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid])
 
 AC_FUNC_CHOWN
 AC_FUNC_STAT
@@ -87,30 +90,21 @@ if test "x$ENABLE_GTK" = "xyes"; then
         AC_SUBST(GLADE20_CFLAGS)
         AC_SUBST(GLADE20_LIBS)
 
-	DATADIRNAME=share
-	if test "x${prefix}" = "xNONE"; then
-	   AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/", [path where glade files will be installed])
-	   interfacesdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/"
-	   AC_SUBST(interfacesdir)
-	else
-	   AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/", [path where glade files will be installed])
-	   interfacesdir="${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/"
-	   AC_SUBST(interfacesdir)
-	fi
+	interfacesdir="${datadir}/${PACKAGE}/interfaces/"
+	AC_SUBST(interfacesdir)
 
 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")
+DX_HTML_FEATURE(ON)
+DX_CHM_FEATURE(OFF)
+DX_CHI_FEATURE(OFF)
+DX_MAN_FEATURE(OFF)
+DX_RTF_FEATURE(OFF)
+DX_XML_FEATURE(OFF)
+DX_PDF_FEATURE(ON)
+DX_PS_FEATURE(OFF)
+DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen-doc)
 
 AC_ARG_ENABLE(dbus,
         AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
@@ -124,7 +118,7 @@ AC_ARG_ENABLE(dbus,
 
 if test "x$ENABLE_DBUS" = "xyes"; then
 	AC_DEFINE(ENABLE_DBUS, 1, [Whether to use DBUS or not])
-        PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.23])
+        PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.30])
 
 	AC_ARG_WITH(dbus-sys, [  --with-dbus-sys=<dir>   where D-BUS system.d directory is])
 
@@ -134,11 +128,6 @@ if test "x$ENABLE_DBUS" = "xyes"; then
 	   DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
 	fi
 	AC_SUBST(DBUS_SYS_DIR)
-	AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
-
-	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
 
         AC_SUBST(DBUS_CFLAGS)
 	AC_SUBST(DBUS_LIBS)
@@ -184,13 +173,10 @@ if test "z$with_distro" = "z"; then
    exit 1
 else
 case $with_distro in
-   debian)
-     ;;
-   gentoo)
+   debian|gentoo|suse)
      ;;
    *)
-     echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
-     exit 1
+     echo "Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)"
      ;;
 esac
 
@@ -222,11 +208,17 @@ fi
 AC_SUBST(AVAHI_GROUP)
 AC_DEFINE_UNQUOTED(AVAHI_GROUP,"$AVAHI_GROUP", [Group for Avahi])
 
+#
+# Avahi runtime dir
+#
+avahi_runtime_dir="${localstatedir}/run"
+avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
+AC_SUBST(avahi_runtime_dir)
+AC_SUBST(avahi_socket)
+
 AC_CONFIG_FILES([
 Makefile 
 avahi-core.pc 
-doxygen/Makefile 
-doxygen/doxygen.conf 
 avahi-common/Makefile 
 avahi-core/Makefile 
 avahi-daemon/Makefile 
@@ -235,9 +227,8 @@ avahi-discover/Makefile
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/Debian/Makefile
-initscript/Debian/75avahi
 initscript/Gentoo/Makefile
-initscript/Gentoo/avahi
+initscript/SUSE/Makefile
 avahi-dnsconfd/Makefile
 ])
 AC_OUTPUT