configure: split --enable-libipq from --enable-devel

diff --git a/Makefile.am b/Makefile.am
index 112b552502b8db1de6c45af17f0faecac2304ca2..0a28241906363526fbd5fadcc5ad8004cd2b3abc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ regular_CFLAGS  := @regular_CFLAGS@
 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
 

diff --git a/configure.ac b/configure.ac
index 5aa0557a120edf7d30aff16274744f0128157462..9c426818fd6763adf6645f70cfd7c577f96d8d03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,12 +29,16 @@ AC_ARG_WITH([xtlibdir],
        [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 \