From 2c564c04bcde88d730ca111acfb6798bdf0d66da Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 31 Aug 2014 18:48:56 +1000 Subject: configure: check for cpuid.h Instead of checking for a particular version of GCC check for a cpuid.h with __cpuid_count. This allows cpuid.h to be provided for older/different compilers. Signed-off-by: Jonathan Gray [ickle: Delete the bare and redundant config.h] --- configure.ac | 18 ++++++++++++++++++ src/sna/sna_cpuid.h | 4 +--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4f1cff71..c24b369e 100644 --- a/configure.ac +++ b/configure.ac @@ -208,6 +208,24 @@ fi PKG_CHECK_MODULES(X11, [x11 xrender xrandr xext xfixes cairo cairo-xlib-xrender pixman-1 libpng], [x11="yes"], [x11="no"]) AM_CONDITIONAL(HAVE_X11, test "x$x11" = "xyes") +cpuid="yes" +AC_TRY_LINK([ + #include + #include + ], + [ + int eax, ebx, ecx, edx; + if (__get_cpuid_max(0, NULL) < 4) + return 0; + __cpuid_count(4, 0, eax, ebx, ecx, edx); + ], + [cpuid="yes"], + [cpuid="no"] +) +if test "x$cpuid" = "xyes"; then + AC_DEFINE(HAVE_CPUID_H,1,[Found a useable cpuid.h]) +fi + shm=yes AC_CHECK_HEADERS([sys/ipc.h sys/ipc.h], [], [shm="no"]) AC_CHECK_HEADERS([X11/extensions/XShm.h], [], [shm="no"], [ diff --git a/src/sna/sna_cpuid.h b/src/sna/sna_cpuid.h index ed28a0ae..430cc64f 100644 --- a/src/sna/sna_cpuid.h +++ b/src/sna/sna_cpuid.h @@ -30,9 +30,7 @@ #ifndef SNA_CPUID_H #define SNA_CPUID_H -#include "compiler.h" - -#if HAS_GCC(4, 4) /* for __cpuid_count() */ +#ifdef HAVE_CPUID_H #include #else #define __get_cpuid_max(x, y) 0 -- cgit v1.2.3