mesa: Move the version information right into configure.ac.
Nothing else called version.mk. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
@@ -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)
|
|
@@ -2,17 +2,11 @@ dnl Process this file with autoconf to create configure.
|
|||||||
|
|
||||||
AC_PREREQ([2.60])
|
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
|
dnl Tell the user about autoconf.html in the --help output
|
||||||
m4_divert_once([HELP_END], [
|
m4_divert_once([HELP_END], [
|
||||||
See docs/autoconf.html for more details on the options for Mesa.])
|
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])
|
[https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
|
||||||
AC_CONFIG_AUX_DIR([bin])
|
AC_CONFIG_AUX_DIR([bin])
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
Reference in New Issue
Block a user