build: separate AC variable replacements from xtables.h

It was/is a bit annoying that modifying xtables.h.in causes configure
to rerun. Split the @foo@ things into a separate file to bypass this.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>

diff --git a/.gitignore b/.gitignore
index b7c3dfb861ba7c74d175548af960ee1ae2ad660b..fa86c4824c2e4db46bd429a2b5ae84303b1b3a85 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 Makefile
 Makefile.in
 
-/include/xtables.h
+/include/xtables-version.h
 /include/iptables/internal.h
 
 /aclocal.m4

diff --git a/Makefile.am b/Makefile.am
index 4eb63ebe173bff839ad9a5f35cd56ae56a1a49e0..6400ba41e50791045054716a7bc609ecb1251be2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,4 +27,4 @@ tarball:
        rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
 
 config.status: extensions/GNUmakefile.in \
-       include/xtables.h.in include/iptables/internal.h.in
+       include/xtables-version.h.in include/iptables/internal.h.in

diff --git a/configure.ac b/configure.ac
index 861f5b3e7d06e97f294f47bc8ee66d47532e16d8..4060f901187dc4d442944df643075b4434e75555 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -127,5 +127,5 @@ AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile
        libiptc/Makefile libiptc/libiptc.pc
        libiptc/libip4tc.pc libiptc/libip6tc.pc
        libxtables/Makefile utils/Makefile
-       include/xtables.h include/iptables/internal.h])
+       include/xtables-version.h include/iptables/internal.h])
 AC_OUTPUT

diff --git a/include/Makefile.am b/include/Makefile.am
index 6f7da5984fe656575451c029834405956df7c2b2..e69512092253a7267a6a084030032603fc057207 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 
 include_HEADERS =
-nobase_include_HEADERS = xtables.h
+nobase_include_HEADERS = xtables.h xtables-version.h
 
 if ENABLE_LIBIPQ
 include_HEADERS += libipq/libipq.h

diff --git a/include/xtables-version.h.in b/include/xtables-version.h.in
new file mode 100644 (file)
index 0000000..cb13827
--- /dev/null
+++ b/include/xtables-version.h.in
@@ -0,0 +1,2 @@
+#define XTABLES_VERSION "libxtables.so.@libxtables_vmajor@"
+#define XTABLES_VERSION_CODE @libxtables_vmajor@

diff --git a/include/xtables.h.in b/include/xtables.h
similarity index 99%
rename from include/xtables.h.in
rename to include/xtables.h
index db69c03b4c4ff7d0011bf340ddb3de9fc339c58b..3b15e67e435e40e8fd5e1a3c567279c20b130fde 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h
@@ -31,8 +31,7 @@
 #define IPPROTO_UDPLITE        136
 #endif
 
-#define XTABLES_VERSION "libxtables.so.@libxtables_vmajor@"
-#define XTABLES_VERSION_CODE @libxtables_vmajor@
+#include <xtables-version.h>
 
 struct in_addr;