diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2012-01-03 21:12:22 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-01-04 10:47:10 +0100 |
| commit | 1722b781286bbb7d98a90fa789d56219fd907ce7 (patch) | |
| tree | ff4479cf677edae31ec7852701d854ec39befc30 /configure.ac | |
| parent | 4435791013a7172a06a17e5656a5e6007f5a2d89 (diff) | |
config: remove duplicate AC_PROG_CC and AC_PROG__CC_99
The compiler was configured three times.
It is done once by XORG_DEFAULT_OPTIONS in util-macros.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 185433c8..3e3e7d46 100644 --- a/configure.ac +++ b/configure.ac @@ -34,19 +34,16 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) AM_MAINTAINER_MODE([enable]) -# Support silent build rules, requires at least automake-1.11. Disable -# by either passing --disable-silent-rules to configure or passing V=1 -# to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_CC_C99 - # Initialize libtool LT_PREREQ([2.2]) LT_INIT([disable-static]) +# 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])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS + PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23 libdrm]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) @@ -96,12 +93,6 @@ if test "x$SHADER_DEBUGGER" = xyes; then fi fi -# 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])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS - AC_CONFIG_FILES([ Makefile benchmarks/Makefile |