------------------------------------------------------------ revno: 653 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Mon 2007-10-15 14:37:54 +1000 message: improved handling of systems without libipq.h modified: Makefile.in makefile.in-20061117234101-o3qt14umlg9en8z0-1 configure.ac configure.ac-20061117234101-o3qt14umlg9en8z0-10 utils/ipmux/ipmux.c ipmux.c-20071008000130-dli3s00uaraama1y-2 === modified file 'Makefile.in' --- a/Makefile.in 2007-10-15 04:29:47 +0000 +++ b/Makefile.in 2007-10-15 04:37:54 +0000 @@ -54,7 +54,7 @@ TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store bin/ctdb_persistent bin/rb_test \ @INFINIBAND_BINS@ -BINS = bin/ctdb @CTDB_SCSI_IO@ bin/smnotify +BINS = bin/ctdb @CTDB_SCSI_IO@ bin/ctdb_ipmux bin/smnotify SBINS = bin/ctdbd DIRS = lib bin
=== modified file 'configure.ac' --- a/configure.ac 2007-10-08 04:05:22 +0000 +++ b/configure.ac 2007-10-15 04:37:54 +0000 @@ -18,13 +18,11 @@ Linux*) CTDB_SYSTEM_OBJ=common/system_linux.o CTDB_SCSI_IO=bin/scsi_io - CTDB_IPMUX=bin/ctdb_ipmux CTDB_PCAP_LDFLAGS= ;; AIX*) CTDB_SYSTEM_OBJ=common/system_aix.o CTDB_SCSI_IO= - CTDB_IPMUX= CTDB_PCAP_LDFLAGS=-lpcap ;; *) @@ -49,6 +47,8 @@ m4_include(libevents.m4) m4_include(ib/config.m4) +AC_CHECK_HEADERS(libipq.h linux/netfilter.h) + AC_CHECK_HEADERS(sched.h) AC_CHECK_FUNCS(sched_setscheduler) @@ -65,7 +65,6 @@ AC_SUBST(EXTRA_OBJ) AC_SUBST(CTDB_SYSTEM_OBJ) AC_SUBST(CTDB_SCSI_IO) -AC_SUBST(CTDB_IPMUX) AC_SUBST(CTDB_PCAP_LDFLAGS) AC_OUTPUT(Makefile) === modified file 'utils/ipmux/ipmux.c' --- a/utils/ipmux/ipmux.c 2007-10-08 04:05:22 +0000 +++ b/utils/ipmux/ipmux.c 2007-10-15 04:37:54 +0000 @@ -25,6 +25,8 @@ #include "cmdline.h" #include "ctdb.h" #include "ctdb_private.h" + +#if defined(HAVE_LINUX_NETFILTER_H) && defined(HAVE_LIBIPQ_H) #include <linux/netfilter.h> #include <libipq.h> @@ -227,3 +229,11 @@ return 0; } + +#else +int main(void) +{ + printf("ipmux tool disabled - lacking netfilter and libipq development libs\n"); + return 1; +} +#endif