Mesa (master): mesa: Move the version information right into configure.ac.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 4038dda6cd84395cb033f0d01bb7b2ba4d09e19d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4038dda6cd84395cb033f0d01bb7b2ba4d09e19d

Author: Eric Anholt <eric at anholt.net>
Date:   Mon May 14 18:43:15 2012 -0700

mesa: Move the version information right into configure.ac.

Nothing else called version.mk.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 bin/version.mk |   17 -----------------
 configure.ac   |    8 +-------
 2 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/bin/version.mk b/bin/version.mk
deleted file mode 100755
index ab20d79..0000000
--- a/bin/version.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -sf
-# Print the various Mesa version fields. This is mostly used to add the
-# version to configure.
-
-# This reflects that this script is usually called from the toplevel
-TOP = .
-
-include $(TOP)/configs/default
-
-version:
-	@echo $(MESA_VERSION)
-major:
-	@echo $(MESA_MAJOR)
-minor:
-	@echo $(MESA_MINOR)
-tiny:
-	@echo $(MESA_TINY)
diff --git a/configure.ac b/configure.ac
index fb7c4a6..ec4fa43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,17 +2,11 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
 
-dnl Versioning - scrape the version from configs/default
-m4_define([mesa_version],
-    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
-m4_ifval(mesa_version,,
-    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
-
 dnl Tell the user about autoconf.html in the --help output
 m4_divert_once([HELP_END], [
 See docs/autoconf.html for more details on the options for Mesa.])
 
-AC_INIT([Mesa],[mesa_version],
+AC_INIT([Mesa], [8.1.0],
     [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
 AC_CONFIG_AUX_DIR([bin])
 AC_CANONICAL_HOST