xf86-video-intel: configure.ac src/intel_module.c

[Chris Wilson]

 configure.ac       |    3 +++
 src/intel_module.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit bcad5b21fef4573f3144608364cf5b1ea6d241e3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 10 21:27:38 2011 +0100

    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 at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 5f193b3..bfd6e99 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 63a63b8..f6561bf 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);