[netfilter-cvslog] r7475 - trunk/iptables

[kaber at trash.net]

Author: kaber at trash.net
Date: 2008-04-13 07:32:06 +0200 (Sun, 13 Apr 2008)
New Revision: 7475

Modified:
   trunk/iptables/Makefile.am
   trunk/iptables/configure.ac
Log:
[PATCH 13/13] configure: split --enable-libipq from --enable-devel


Modified: trunk/iptables/Makefile.am
===================================================================
--- trunk/iptables/Makefile.am	2008-04-13 05:29:27 UTC (rev 7474)
+++ trunk/iptables/Makefile.am	2008-04-13 05:32:06 UTC (rev 7475)
@@ -6,7 +6,7 @@
 kinclude_CFLAGS := @kinclude_CFLAGS@
 AM_CFLAGS        = ${regular_CFLAGS} -I${top_srcdir}/include ${kinclude_CFLAGS}
 SUBDIRS         := extensions
-if ENABLE_DEVEL
+if ENABLE_LIBIPQ
 SUBDIRS         += libipq
 endif
 

Modified: trunk/iptables/configure.ac
===================================================================
--- trunk/iptables/configure.ac	2008-04-13 05:29:27 UTC (rev 7474)
+++ trunk/iptables/configure.ac	2008-04-13 05:32:06 UTC (rev 7475)
@@ -29,12 +29,16 @@
 	[xtlibdir="${libexecdir}/iptables"])
 AC_ARG_ENABLE([devel],
 	AS_HELP_STRING([--enable-devel],
-	[Build and install development files (libipq, libipq-devel, iptables-devel)]))
+	[Install Xtables development headers]),
+	[enable_devel="$enableval"], [enable_devel="yes"])
+AC_ARG_ENABLE([libipq],
+	AS_HELP_STRING([--enable-libipq], [Build and install libipq]))
 
 AC_CHECK_HEADER([netinet/ip6.h], [], [AC_MSG_ERROR(but we need that for IPv6)])
 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" == "yes"])
 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" == "yes"])
 AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" == "yes"])
+AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" == "yes"])
 
 regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \
 	-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \