Rev 654: only link to -lipq if needed in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 654
revision-id: tridge at samba.org-20071015044406-ez36w6umscpfpi79
parent: tridge at samba.org-20071015043754-pzx3thosxlunfwmk
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Mon 2007-10-15 14:44:06 +1000
message:
  only link to -lipq if needed
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  configure.ac                   configure.ac-20061117234101-o3qt14umlg9en8z0-10
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-10-15 04:37:54 +0000
+++ b/Makefile.in	2007-10-15 04:44:06 +0000
@@ -23,6 +23,8 @@
 POPT_CFLAGS = @POPT_CFLAGS@
 POPT_OBJ = @POPT_OBJ@
 
+IPQ_LIBS = @IPQ_LIBS@
+
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I at tallocdir@ -I at tdbdir@/include -I at libreplacedir@ \
 	-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
@@ -86,7 +88,7 @@
 
 bin/ctdb_ipmux: $(CTDB_CLIENT_OBJ) utils/ipmux/ipmux.o 
 	@echo Linking $@
-	@$(CC) $(CFLAGS) -o $@ utils/ipmux/ipmux.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) -lipq
+	@$(CC) $(CFLAGS) -o $@ utils/ipmux/ipmux.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) $(IPQ_LIBS)
 
 bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o 
 	@echo Linking $@

=== modified file 'configure.ac'
--- a/configure.ac	2007-10-15 04:37:54 +0000
+++ b/configure.ac	2007-10-15 04:44:06 +0000
@@ -49,6 +49,12 @@
 
 AC_CHECK_HEADERS(libipq.h linux/netfilter.h)
 
+IPQ_LIBS=""
+if test x"$ac_cv_header_libipq_h" = x"yes"; then
+   IPQ_LIBS="-lipq"
+fi
+AC_SUBST(IPQ_LIBS)
+
 AC_CHECK_HEADERS(sched.h)
 AC_CHECK_FUNCS(sched_setscheduler)