doc: improve documentation for using non-standard location of libxtables

How to use PKG_CONFIG_PATH. Get rid of remaining references to
recently removed --with-xtables flag.

diff --git a/INSTALL b/INSTALL
index fb2e47b3ec5d475cc3ff184e9af974badc0fb945..71d4741cd2e2ac7ce48a1ddb3c53ec2c39b45475 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -64,8 +64,13 @@ If you want to enable debugging, use
 (-O0 is used to turn off instruction reordering, which makes debugging
 much easier.)
 
-To make use of a libxtables that is not in the default path, override
-the pkgconfig variables, for example:
+To make use of a libxtables that is not in the default path, either
+
+  a) append the location of the pkg-config files like:
+
+       PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+
+  b) override the default pkg-config variables, for example:
 
        ./configure libxtables_CFLAGS="-I../iptables/include" \
                libxtables_LIBS="-L../iptables/.libs \
@@ -86,5 +91,6 @@ Note to distribution packagers
 Except for --with-kbuild, distributions should not have a need to
 supply any other flags (besides --prefix=/usr and perhaps
 --libdir=/usr/lib64, etc.) to configure when all prerequired packages
-are installed. If iptables-devel is installed, necessary headers should
-be in /usr/include, so --with-xtables is not needed.
+are installed. If iptables-devel is installed, necessary headers
+should be in /usr/include, so PKG_CONFIG_PATH, libxtables_CFLAGS and
+libxtables_LIBS variables are not needed.

diff --git a/configure.ac b/configure.ac
index 7edd4b5fe1e134b7cdfc207136d55c112bea0e85..6a456013621b249635ef4b4c54b48105d184a75f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_ARG_WITH([xtlibdir],
 
 PKG_CHECK_MODULES([libxtables], [xtables >= 1.4.3])
 AC_CHECK_HEADERS([linux/netfilter/x_tables.h], [],
-       [AC_MSG_ERROR([You need to have linux/netfilter/x_tables.h, either through /usr/include or the iptables directory (--with-xtables=)])])
+       [AC_MSG_ERROR([You need to have linux/netfilter/x_tables.h, see INSTALL file for details])])
 
 regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \
        -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \