autoconf: Clean up some m4 usage
m4_fatal is equivalent to m4_errprint + m4_exit.
This commit is contained in:
parent
8fa6c1ac92
commit
356f311c4a
22
configure.ac
22
configure.ac
|
@ -5,12 +5,8 @@ AC_PREREQ([2.59])
|
||||||
dnl Versioning - scrape the version from configs/default
|
dnl Versioning - scrape the version from configs/default
|
||||||
m4_define([mesa_version],
|
m4_define([mesa_version],
|
||||||
[m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n'])])
|
[m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n'])])
|
||||||
m4_ifval(mesa_version,[],[
|
m4_ifval(mesa_version,,
|
||||||
m4_errprint([Error: Failed to get the Mesa version from the output of
|
[m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
|
||||||
running `make -f bin/version.mk version'
|
|
||||||
])
|
|
||||||
m4_exit([1])
|
|
||||||
])
|
|
||||||
|
|
||||||
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], [
|
||||||
|
@ -58,15 +54,11 @@ fi
|
||||||
AC_SUBST([MKDEP_OPTIONS])
|
AC_SUBST([MKDEP_OPTIONS])
|
||||||
|
|
||||||
dnl Make sure the pkg-config macros are defined
|
dnl Make sure the pkg-config macros are defined
|
||||||
m4_ifdef([PKG_PROG_PKG_CONFIG],[],[
|
m4_ifndef([PKG_PROG_PKG_CONFIG],
|
||||||
m4_errprint([Error: Could not locate the pkg-config autoconf macros.
|
[m4_fatal([Could not locate the pkg-config autoconf macros.
|
||||||
These are usually located in /usr/share/aclocal/pkg.m4. If your
|
These are usually located in /usr/share/aclocal/pkg.m4. If your macros
|
||||||
macros are in a different location, try setting the environment
|
are in a different location, try setting the environment variable
|
||||||
variable ACLOCAL="aclocal -I/other/macro/dir" before running
|
ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
|
||||||
autoreconf.
|
|
||||||
])
|
|
||||||
m4_exit([1])
|
|
||||||
])
|
|
||||||
PKG_PROG_PKG_CONFIG()
|
PKG_PROG_PKG_CONFIG()
|
||||||
|
|
||||||
dnl LIB_DIR - library basename
|
dnl LIB_DIR - library basename
|
||||||
|
|
Loading…
Reference in New Issue