diff options
author | Thomas Jarosch <thomas.jarosch@intra2net.com> | 2008-06-03 15:02:18 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-06-03 15:02:18 +0200 |
commit | c634cb9cb13d6e1b6fd661b426363431f7ef321a (patch) | |
tree | 2df19948f82151fc58135c244836bb08d86a6356 | |
parent | 510aef98a56cdbfdb147f78b05d7554bb91770a9 (diff) |
Add xtables version defines.
Attached is a patch to add the new defines. The macro XTABLES_VERSION
is already in use, so I named it XTABLES_VERSION_CHECK. I've also tested
that an empty XTABLES_VERSION_EXTRA in configure.ac works.
Now we can write code like this:
#warning You are obselete and will be assimilated.
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | configure.ac | 18 | ||||
-rw-r--r-- | include/xtables.h.in | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b32349a4..e718effc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,11 @@ +define([_XTABLES_VERSION_MAJOR], 1) +define([_XTABLES_VERSION_MINOR], 4) +define([_XTABLES_VERSION_PATCH], 1) +define([_XTABLES_VERSION_EXTRA], -rc2) -AC_INIT([iptables], [1.4.1-rc2]) +define([_XTABLES_VERSION],_XTABLES_VERSION_MAJOR._XTABLES_VERSION_MINOR._XTABLES_VERSION_PATCH[]_XTABLES_VERSION_EXTRA) + +AC_INIT([iptables], _XTABLES_VERSION) AC_CONFIG_HEADERS([config.h]) AC_PROG_INSTALL AM_INIT_AUTOMAKE @@ -56,4 +62,14 @@ AC_SUBST([kinclude_CFLAGS]) AC_SUBST([kbuilddir]) AC_SUBST([ksourcedir]) AC_SUBST([xtlibdir]) + +XTABLES_VERSION_MAJOR=_XTABLES_VERSION_MAJOR +XTABLES_VERSION_MINOR=_XTABLES_VERSION_MINOR +XTABLES_VERSION_PATCH=_XTABLES_VERSION_PATCH +XTABLES_VERSION_EXTRA=_XTABLES_VERSION_EXTRA +AC_SUBST([XTABLES_VERSION_MAJOR]) +AC_SUBST([XTABLES_VERSION_MINOR]) +AC_SUBST([XTABLES_VERSION_PATCH]) +AC_SUBST([XTABLES_VERSION_EXTRA]) + AC_OUTPUT([Makefile extensions/GNUmakefile libipq/Makefile include/xtables.h]) diff --git a/include/xtables.h.in b/include/xtables.h.in index c8a8746f..4ce73e97 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -18,6 +18,9 @@ #endif #define XTABLES_VERSION "@PACKAGE_VERSION@" +#define XTABLES_VERSION_CODE (0x10000 * @XTABLES_VERSION_MAJOR@ + 0x100 * @XTABLES_VERSION_MINOR@ + @XTABLES_VERSION_PATCH@) + +#define XTABLES_API_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) /* Include file for additions: new matches and targets. */ struct xtables_match |