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>
This commit is contained in:
parent
90576f95f3
commit
ebb7aca667
16
configure.ac
16
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue