xf86-video-intel: src/sna/sna_driver.c

[Chris Wilson]

 src/sna/sna_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d754bc3435889b5d19085588c9c888dc08f9522e
Author: Cyril Brulebois <kibi at debian.org>
Date:   Mon Nov 7 23:29:29 2011 +0100

    Fix build failure when passing --with-builderstring.
    
    If --with-builderstring="foo" is passed to configure (and sna enabled):
      CC     sna_driver.lo
    src/sna/sna_driver.c: In function 'sna_init_scrn':
    src/sna/sna_driver.c:1023:7: error: token ""foo"" is not valid in preprocessor expressions
    
    Fix the missing defined() around the BUILDER_DESCRIPTION variable.
    
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 2ccad59..5d2915f 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -1071,7 +1071,7 @@ Bool sna_init_scrn(ScrnInfoPtr scrn, int entity_num)
 #if defined(USE_GIT_DESCRIBE)
 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "SNA compiled from %s\n", git_version);
-#elif BUILDER_DESCRIPTION
+#elif defined(BUILDER_DESCRIPTION)
 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "SNA compiled: %s\n", BUILDER_DESCRIPTION);
 #endif