From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Mon, 15 Mar 2010 15:08:05 +0000 (+0000)
Subject: Compatible with OpenBSD m4.
X-Git-Tag: release-1.6.5~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bf82bcf558d11d758dc2a543beea38798b636fe;p=thirdparty%2Fldns.git

Compatible with OpenBSD m4.
---

diff --git a/configure.ac b/configure.ac
index e375f101..0a891889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,17 @@
 AC_PREREQ(2.56)
 sinclude(acx_nlnetlabs.m4)
 
-AC_INIT(ldns, 1.6.5, libdns@nlnetlabs.nl, libdns)
+# must be numbers. ac_defun because of later processing.
+AC_DEFUN(VERSION_MAJOR,[1])
+AC_DEFUN(VERSION_MINOR,[6])
+AC_DEFUN(VERSION_MICRO,[5])
+AC_INIT(ldns, [VERSION_MAJOR].[VERSION_MINOR].[VERSION_MICRO], libdns@nlnetlabs.nl, libdns)
 AC_CONFIG_SRCDIR([packet.c])
 # needed to build correct soname
-AC_SUBST(LIBTOOL_VERSION_INFO, "1:6:5")
-
-PACKAGE_VERSION="$PACKAGE_VERSION"
-PACKAGE_REVISION=m4_format(0x%02x%02x%02x, 1, 6, 5)
-AC_SUBST(PACKAGE_REVISION)
+AC_SUBST(LIBTOOL_VERSION_INFO, VERSION_MAJOR:VERSION_MINOR:VERSION_MICRO)
+AC_SUBST(LDNS_VERSION_MAJOR, [VERSION_MAJOR])
+AC_SUBST(LDNS_VERSION_MINOR, [VERSION_MINOR])
+AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO])
 
 OURCPPFLAGS=''
 CPPFLAGS=${CPPFLAGS:-${OURCPPFLAGS}}
diff --git a/ldns/util.h.in b/ldns/util.h.in
index d63d617f..eb231b92 100644
--- a/ldns/util.h.in
+++ b/ldns/util.h.in
@@ -22,7 +22,7 @@
 /* #define	dprintf(X, Y)  */
 
 #define LDNS_VERSION "@PACKAGE_VERSION@"
-#define LDNS_REVISION @PACKAGE_REVISION@
+#define LDNS_REVISION ((@LDNS_VERSION_MAJOR@<<16)|(@LDNS_VERSION_MINOR@<<8)|(@LDNS_VERSION_MICRO@))
 
 /**
  * splint static inline workaround