* Re-enable use of gentoo initscripts

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@416 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/configure.ac b/configure.ac
index cc66f6d0b8d9df18a0b111f4e3ea0059993a960c..993a4ea71c01f69d7833759c27776df7c45da5c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,10 +49,10 @@ AC_PROG_LIBTOOL
 #
 # Detecting the linux distro for specific things like initscripts.
 #
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux distribution to target: One of debian, archlinux or none]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux distribution to target: One of debian, gentoo, archlinux or none]))
 if test "z$with_distro" = "z"; then
    #AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-   #AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
+   AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
    AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
    AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
 fi
@@ -63,7 +63,7 @@ if test "z$with_distro" = "z"; then
    exit 1
 else
 case $with_distro in
-   debian|archlinux)
+   debian|gentoo|archlinux)
      ;;
    *)
      echo "Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)"
@@ -349,6 +349,7 @@ avahi-discover-standalone/Makefile
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/debian/Makefile
+initscript/gentoo/Makefile
 initscript/archlinux/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile

diff --git a/initscript/Makefile.am b/initscript/Makefile.am
index c54b2d0dcc997ce2bf64068616fa2f3a8f87d670..16bbbf046fdd94edc5090b42ec768b19dbf5db03 100644 (file)
--- a/initscript/Makefile.am
+++ b/initscript/Makefile.am
@@ -27,11 +27,11 @@ if TARGET_ARCHLINUX
 SUBDIRS += archlinux
 endif
 
-# We disable shipping of Gentoo and SUSE init scripts for now as they are out of date
+if TARGET_GENTOO
+SUBDIRS += gentoo
+endif
 
-#if TARGET_GENTOO
-#SUBDIRS += gentoo
-#endif
+# We disable shipping of these init scripts for now as they are out of date
 
 #if TARGET_SUSE
 #SUBDIRS += suse

diff --git a/initscript/gentoo/avahi-daemon.in b/initscript/gentoo/avahi-daemon.in
index a4b25db60af78a86734df90c5cfdcc8edf9486c2..88d0be02b976fd5522d44db861eba3a4b4393192 100644 (file)
--- a/initscript/gentoo/avahi-daemon.in
+++ b/initscript/gentoo/avahi-daemon.in
@@ -2,7 +2,6 @@
 # $Id$
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/www.gentoo.org/raw_cvs/gentoo-x86/net-dns/avahi/files/avahi.initd,v 1.2 2005/08/22 03:47:19 swegener Exp $
 
 opts="${opts} reload"
 

diff --git a/initscript/gentoo/avahi-dnsconfd.in b/initscript/gentoo/avahi-dnsconfd.in
index 98556e80b7bf1accd0296c44f0dd21e8c10831ce..54c2aa632217dac85297c9898aeae61e87804c3e 100644 (file)
--- a/initscript/gentoo/avahi-dnsconfd.in
+++ b/initscript/gentoo/avahi-dnsconfd.in
@@ -2,7 +2,6 @@
 # $Id$
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/www.gentoo.org/raw_cvs/gentoo-x86/net-dns/avahi/files/avahi-dnsconfd.initd,v 1.1 2005/08/22 03:47:19 swegener Exp $
 
 opts="${opts} reload"