diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-10 21:27:38 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-10 21:29:59 +0100 |
| commit | bcad5b21fef4573f3144608364cf5b1ea6d241e3 (patch) | |
| tree | 331baf6032f1029be50dbe54d296e6d6a06cfbd5 | |
| parent | d0d65940b4f4d4993eccb8c66ec7e8b633b331da (diff) | |
sna: Unbreak configure after last commit
I went a step too far... I still need some define in order to switch
between uxa/sna at compile time.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/intel_module.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5f193b37..bfd6e993 100644 --- a/configure.ac +++ b/configure.ac @@ -188,6 +188,9 @@ fi AM_CONDITIONAL(SNA, test x$SNA != xno) AC_MSG_CHECKING([whether to include SNA support]) +if test "x$SNA" != "xno"; then + AC_DEFINE(USE_SNA, 1, [Enable SNA support]) +fi AC_MSG_RESULT([$SNA]) AM_CONDITIONAL(DEBUG, test x$DEBUG != xno) diff --git a/src/intel_module.c b/src/intel_module.c index 63a63b8e..f6561bf3 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -335,7 +335,7 @@ static Bool intel_pci_probe(DriverPtr driver, #endif default: -#if SNA +#if USE_SNA sna_init_scrn(scrn, entity_num); #else intel_init_scrn(scrn); @@ -376,7 +376,7 @@ intel_available_options(int chipid, int busid) #endif default: -#if SNA +#if USE_SNA return sna_available_options(chipid, busid); #else return intel_uxa_available_options(chipid, busid); |