diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-02-11 01:02:00 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-13 07:25:24 +0200 |
| commit | 21b41eea4724c57d2b6e5998cf38255046e43ad3 (patch) | |
| tree | d1f78d7c2e77323c951b6675a5c1bb8a0c71f5c3 /configure.ac | |
| parent | 9a8c77fc8df3155747c34dcea79b7834a2a9a40a (diff) | |
Combine IP{,6}T_LIB_DIR into XTABLES_LIBDIR
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c816b2e1..5aa0557a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,11 +22,11 @@ AC_ARG_WITH([ksource], AS_HELP_STRING([--with-ksource=PATH], [Path to kernel source directory [[/lib/modules/CURRENT/source]]]), [ksourcedir="$withval"]) -AC_ARG_WITH([iptdir], - AS_HELP_STRING([--with-iptdir=PATH], +AC_ARG_WITH([xtlibdir], + AS_HELP_STRING([--with-xtlibdir=PATH], [Path to iptables modules [[LIBEXECDIR/iptables]]]), - [iptdir="$withval"], - [iptdir="${libexecdir}/iptables"]) + [xtlibdir="$withval"], + [xtlibdir="${libexecdir}/iptables"]) AC_ARG_ENABLE([devel], AS_HELP_STRING([--enable-devel], [Build and install development files (libipq, libipq-devel, iptables-devel)])) @@ -40,12 +40,11 @@ regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \ -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -Winline -pipe -DIPTABLES_VERSION=\\\"$PACKAGE_VERSION\\\" \ - -DIPT_LIB_DIR=\\\"\${iptdir}\\\" -DIP6T_LIB_DIR=\\\"\${iptdir}\\\""; -regular_CFLAGS="$regular_CFLAGS -DXTABLES_INTERNAL" + -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL"; kinclude_CFLAGS="-I\"$kbuilddir/include\" -I\"$ksourcedir/include\""; AC_SUBST([regular_CFLAGS kinclude_CFLAGS]) AC_SUBST([kbuilddir]) AC_SUBST([ksourcedir]) -AC_SUBST([iptdir]) +AC_SUBST([xtlibdir]) AC_OUTPUT([Makefile extensions/GNUmakefile libipq/Makefile]) |