From: Roland McGrath Date: Sun, 19 Apr 2009 23:07:45 +0000 (-0700) Subject: Fiddle version.h magic back, so all the computation is in configure. X-Git-Tag: elfutils-0.141~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=105e3984c2dc5f8f60875dc80e9e06480e186900;p=thirdparty%2Felfutils.git Fiddle version.h magic back, so all the computation is in configure. --- diff --git a/ChangeLog b/ChangeLog index c0e71bd70..7b8c4438b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-04-19 Roland McGrath + + * configure.ac (eu_version): Round down here, not in version.h macros. + 2009-04-17 Roland McGrath * configure.ac (eu_version): Compute number 1000 times larger, diff --git a/config/ChangeLog b/config/ChangeLog index 327e5c1c9..798a2f93c 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2009-04-19 Roland McGrath + + * version.h.in: Revert last change. + 2009-04-17 Roland McGrath * version.h.in (_ELFUTILS_PREREQ): Multiple major by 1000000 and minor diff --git a/config/version.h.in b/config/version.h.in index f678c6963..82c846e9d 100644 --- 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 c074e9739..aeb40d117 100644 --- 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