From f1167112d926b189fe189599576e8588923f036c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Aug 2005 21:31:30 +0000
Subject: * cleanup build system a little * strip remaining glib usage * -fPIC
 build fix for x86-64 (thanks tvainika)

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@336 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-dnsconfd/Makefile.am | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'avahi-dnsconfd')

diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index 4f75ece..18b3adf 100644
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -17,6 +17,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+if HAVE_EXPAT
+if HAVE_LIBDAEMON
+
 pkgsysconfdir=$(sysconfdir)/avahi
 
 AM_CFLAGS= \
@@ -25,22 +28,18 @@ AM_CFLAGS= \
 	-DAVAHI_SOCKET=\"$(avahi_socket)\" \
 	-DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/avahi-dnsconfd.action\"
 
-# libdaemon
-AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
-AM_LDADD=$(LIBDAEMON_LIBS)
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-sbin_PROGRAMS = \
-	avahi-dnsconfd
+sbin_PROGRAMS = avahi-dnsconfd
 
-avahi_dnsconfd_SOURCES = \
-	main.c 
-
-avahi_dnsconfd_CFLAGS = $(AM_CFLAGS)
-avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+avahi_dnsconfd_SOURCES = main.c 
+avahi_dnsconfd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
+avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS)
 
 pkgsysconf_SCRIPTS=avahi-dnsconfd.action
 
+endif
+endif
+
 EXTRA_DIST=avahi-dnsconfd.action
-- 
cgit