diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-02-11 15:01:03 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-13 07:32:06 +0200 |
| commit | 77f15384d768b1735a180d0c8e2b5934a94d02e4 (patch) | |
| tree | e0efcf1a5b2fd5b89f55d7f1b9e4b72ab9a9236d | |
| parent | 9df688566bd53f489c75b5dda84582361fec1ab7 (diff) | |
configure: split --enable-libipq from --enable-devel
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 112b5525..0a282419 100644 --- 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 5aa0557a..9c426818 100644 --- 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 \ |