Fiddle version.h magic back, so all the computation is in configure.

diff --git a/ChangeLog b/ChangeLog
index c0e71bd701af108d66a4c5727f815f8084eca9ea..7b8c4438b396c9376759ab18a1b3685bd26e5574 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-19  Roland McGrath  <roland@redhat.com>
+
+       * configure.ac (eu_version): Round down here, not in version.h macros.
+
 2009-04-17  Roland McGrath  <roland@redhat.com>
 
        * configure.ac (eu_version): Compute number 1000 times larger,

diff --git a/config/ChangeLog b/config/ChangeLog
index 327e5c1c9f52fd1e3d18558671ddd0e43c273ede..798a2f93c0920b487b84376e3d0bc6e492aed404 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-19  Roland McGrath  <roland@redhat.com>
+
+       * version.h.in: Revert last change.
+
 2009-04-17  Roland McGrath  <roland@redhat.com>
 
        * version.h.in (_ELFUTILS_PREREQ): Multiple major by 1000000 and minor

diff --git a/config/version.h.in b/config/version.h.in
index f678c6963006d5515e9dfb1fc52c0b2fdfacfac4..82c846e9dd98fcf786eca336a7d9ee381156a7a1 100644 (file)
--- a/config/version.h.in
+++ b/config/version.h.in
@@ -1,5 +1,5 @@
 /* Version information about elfutils development libraries.
-   Copyright (C) 2008-2009 Red Hat, Inc.
+   Copyright (C) 2008 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -53,6 +53,6 @@
 #define _ELFUTILS_VERSION      @eu_version@
 
 #define _ELFUTILS_PREREQ(major, minor) \
-  ((_ELFUTILS_VERSION + 999) / 1000 >= ((major) * 1000 + (minor)))
+  (_ELFUTILS_VERSION >= ((major) * 1000 + (minor)))
 
 #endif /* elfutils/version.h */

diff --git a/configure.ac b/configure.ac
index c074e9739b3ace44816405a7dd482accc283797f..aeb40d11752de7ba666900c5971e8d50e1931db7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -290,4 +290,7 @@ case "$eu_version" in
 *) AC_MSG_ERROR([confused by version number '$PACKAGE_VERSION']) ;;
 esac
 
+# Round up to the next release API (x.y) version.
+[eu_version=$[($eu_version + 999) / 1000]]
+
 AC_OUTPUT