From 9d125e3a3ae8a3bc4150756294226b3feb95799e Mon Sep 17 00:00:00 2001
From: Trent Lloyd <lathiat@bur.st>
Date: Tue, 23 Aug 2005 11:59:02 +0000
Subject:  * Re-enable use of gentoo initscripts

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@416 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 configure.ac                        | 7 ++++---
 initscript/Makefile.am              | 8 ++++----
 initscript/gentoo/avahi-daemon.in   | 1 -
 initscript/gentoo/avahi-dnsconfd.in | 1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index cc66f6d..993a4ea 100644
--- 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 c54b2d0..16bbbf0 100644
--- 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 a4b25db..88d0be0 100644
--- 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 98556e8..54c2aa6 100644
--- 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"
 
-- 
cgit