diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-14 18:43:15 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-06-11 09:28:00 -0700 |
| commit | 4038dda6cd84395cb033f0d01bb7b2ba4d09e19d (patch) | |
| tree | b1f88b8a62b616ec3cf41edffed398e3598258f5 | |
| parent | 0cc216676c96efacb0e1eb82457e6a83920ae704 (diff) | |
| download | external_mesa3d-4038dda6cd84395cb033f0d01bb7b2ba4d09e19d.zip external_mesa3d-4038dda6cd84395cb033f0d01bb7b2ba4d09e19d.tar.gz external_mesa3d-4038dda6cd84395cb033f0d01bb7b2ba4d09e19d.tar.bz2 | |
mesa: Move the version information right into configure.ac.
Nothing else called version.mk.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rwxr-xr-x | bin/version.mk | 17 | ||||
| -rw-r--r-- | 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 |