diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2009-04-29 06:49:27 -0700 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-04-29 12:15:07 -0700 |
commit | 356f311c4a3ee91a4afe33d210dd4c5fdc897ea3 (patch) | |
tree | e9fa055e3747da3c432de8c9b88c11c63ee8a744 /configure.ac | |
parent | 8fa6c1ac9299402c1faf75b264cf70b1b83d1eff (diff) | |
download | external_mesa3d-356f311c4a3ee91a4afe33d210dd4c5fdc897ea3.zip external_mesa3d-356f311c4a3ee91a4afe33d210dd4c5fdc897ea3.tar.gz external_mesa3d-356f311c4a3ee91a4afe33d210dd4c5fdc897ea3.tar.bz2 |
autoconf: Clean up some m4 usage
m4_fatal is equivalent to m4_errprint + m4_exit.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 7b07f0f..154f6e6 100644 --- a/configure.ac +++ b/configure.ac @@ -5,12 +5,8 @@ AC_PREREQ([2.59]) 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'])]) -m4_ifval(mesa_version,[],[ - m4_errprint([Error: Failed to get the Mesa version from the output of - running `make -f bin/version.mk version' -]) - m4_exit([1]) -]) +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], [ @@ -58,15 +54,11 @@ fi AC_SUBST([MKDEP_OPTIONS]) dnl Make sure the pkg-config macros are defined -m4_ifdef([PKG_PROG_PKG_CONFIG],[],[ - m4_errprint([Error: Could not locate the pkg-config autoconf macros. - These are usually located in /usr/share/aclocal/pkg.m4. If your - macros are in a different location, try setting the environment - variable ACLOCAL="aclocal -I/other/macro/dir" before running - autoreconf. -]) - m4_exit([1]) -]) +m4_ifndef([PKG_PROG_PKG_CONFIG], + [m4_fatal([Could not locate the pkg-config autoconf macros. + These are usually located in /usr/share/aclocal/pkg.m4. If your macros + are in a different location, try setting the environment variable + ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) PKG_PROG_PKG_CONFIG() dnl LIB_DIR - library basename |