diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2009-01-27 20:56:23 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2009-01-30 03:27:42 +0100 |
| commit | dacafa55379fd98212031d8c559096c91d7ce93b (patch) | |
| tree | 9a2e6dd3eda76dbcc22d6c74377889bca7223c41 /configure.ac | |
| parent | 5f2922cfc0bbfbeb878f5c12e9fb3eb602ae5507 (diff) | |
libxtables: prefix/order - program_name
Split XTABLES_VERSION into xtables and iptables, and encode the
xtables soversion into the extensions instead. This makes it possible
to upgrade iptables without having to recompile 3rd-party extensions
(if the libxtables version matches, of course).
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 8c9c30de..bb32130c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,10 @@ -define([_XTABLES_VERSION_MAJOR], 1) -define([_XTABLES_VERSION_MINOR], 4) -define([_XTABLES_VERSION_PATCH], 3) -define([_XTABLES_VERSION_EXTRA], -rc1) -define([_XTABLES_VERSION],_XTABLES_VERSION_MAJOR._XTABLES_VERSION_MINOR._XTABLES_VERSION_PATCH[]_XTABLES_VERSION_EXTRA) +AC_INIT([iptables], [1.4.3-rc1]) + +# See libtool.info "Libtool's versioning system" +libxtables_vcurrent=1 +libxtables_vage=0 -AC_INIT([iptables], _XTABLES_VERSION) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_INSTALL @@ -74,16 +73,11 @@ AC_SUBST([kbuilddir]) AC_SUBST([ksourcedir]) AC_SUBST([xtlibdir]) AC_SUBST([pkgconfigdir]) - -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_SUBST([libxtables_vcurrent]) +AC_SUBST([libxtables_vage]) +libxtables_vmajor=$(($libxtables_vcurrent - $libxtables_vage)); +AC_SUBST([libxtables_vmajor]) AC_CONFIG_FILES([Makefile extensions/GNUmakefile libipq/Makefile - include/xtables.h xtables.pc]) + include/xtables.h include/xtables/internal.h xtables.pc]) AC_OUTPUT |