X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=e64fcdeacace80e333c96ce4d0b6c04e1611af8a;hb=86c3e9b7575e5d27f167fc3207fa3936240e8ecd;hp=5e823275dbffbbff35b4e7ecca32d5b94b6c7fbb;hpb=9bc2eb5311514a53243c9e771658779524e70b9a;p=catta

diff --git a/configure.ac b/configure.ac
index 5e82327..e64fcde 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,16 +90,8 @@ 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")
@@ -121,10 +116,10 @@ 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_DEFINE(ENABLE_DBUS, 1, [Whether to use DBUS or not])
+        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 +129,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,11 +174,10 @@ if test "z$with_distro" = "z"; then
    exit 1
 else
 case $with_distro in
-   debian)
+   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
 
@@ -220,6 +209,14 @@ 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 
@@ -233,25 +230,25 @@ avahi-discover/Makefile
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/Debian/Makefile
-initscript/Debian/15avahi
+initscript/Gentoo/Makefile
+initscript/SUSE/Makefile
+avahi-dnsconfd/Makefile
 ])
 AC_OUTPUT
 
 dnl ==========================================================================
 echo "
-                   $PACKAGE_NAME $VERSION
-                  ============
-
-        prefix:                   ${prefix}
-        sysconfdir:               ${sysconfdir}
-        dbus-1 system.d dir:      ${DBUS_SYS_DIR}
-	dbus-1 version:           `pkg-config dbus-1 --modversion`
-        compiler:                 ${CC}
-        cflags:                   ${CFLAGS}
-	Linux Distro:             ${with_distro}
-        User for Avahi:           ${AVAHI_USER}
-        Group for Avahi:          ${AVAHI_GROUP}
+ ---{ $PACKAGE_NAME $VERSION }---
+
+    prefix:                 ${prefix}
+    sysconfdir:             ${sysconfdir}
+    dbus-1 system.d dir:    ${DBUS_SYS_DIR}
+    dbus-1 version:         `pkg-config dbus-1 --modversion`
+    compiler:               ${CC}
+    cflags:                 ${CFLAGS}
+    Linux Distro:           ${with_distro}
+    User for Avahi:         ${AVAHI_USER}
+    Group for Avahi:        ${AVAHI_GROUP}
+
+ NOTE: Remember to create user ${AVAHI_USER} and group ${AVAHI_GROUP} before make install
 "
-
-echo "NOTE: Remember to create user ${AVAHI_USER} and group ${AVAHI_GROUP} before make install"
-echo