diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-21 22:23:24 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-21 22:35:49 +0000 |
| commit | ebb7aca66785730737bc739624006e55d43dfe1b (patch) | |
| tree | 3ad451de7a7bfe06ae64d0593eeb7c54eb9e8883 | |
| parent | 90576f95f35e528fa2c667df162c5dc7ec98975d (diff) | |
Suggest where to find xorg-macros in case it's missing
[Modified version of U. Artie Eoff's commit to remove the duplicated
string. The paraphrased commit message is repeated below for clarity.]
xorg-macros is often package under an unusual name, so provide some
clues as to what name to try on the user's distribution. Installing
build-deps would be just too easy...
Also include a check for the existence of the XORG_DRIVER_CHECK_EXT
macro, otherwise configure might continue in spite of the missing macro
and cause obtuse syntax errors.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index e6517e65..5eaf0e5f 100644 --- a/configure.ac +++ b/configure.ac @@ -35,17 +35,17 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen. - Try "apt-get install xutils-dev" or "yum install xorg-x11-util-macros"])]) +m4_define(xorg_macros_help, +[[must install xorg-macros 1.8 or later before running autoconf/autogen. +Either install xorg-macros from source, +git://anongit.freedesktop.org/xorg/util/macros, or try +"apt-get install xutils-dev" or "yum install xorg-x11-util-macros".]]) +m4_ifndef([XORG_MACROS_VERSION], [m4_fatal(xorg_macros_help)]) +m4_ifndef([XORG_DRIVER_CHECK_EXT], [m4_fatal(xorg_macros_help)]) + XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -# Require X.Org server macros (i.e. XORG_DRIVER_CHECK_EXT) to check for required modules -m4_ifndef([XORG_DRIVER_CHECK_EXT], - [m4_fatal([must install xorg-server macros before running autoconf/autogen. - Try "apt-get install xserver-xorg-dev" or "yum install xorg-x11-server-devel"])]) - # Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL |