From 8555b378596b19c122fa29a22f77a576a211c1fc Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 11 Feb 2014 19:28:33 +0100
Subject: [PATCH] normalize values of SYSTEM_BLUEZ, SYSTEM_MESA_HEADERS

Change-Id: I166de66dd8cd58a05e1a9e8d2f25bf95b98297fb
---
 RepositoryExternal.mk |  8 ++++----
 configure.ac          | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d85e4bc3e277..9a38e31ad2ae 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -29,11 +29,11 @@
 
 # External headers
 
-ifeq ($(SYSTEM_MESA_HEADERS),YES)
+ifneq ($(SYSTEM_MESA_HEADERS),)
 
 gb_LinkTarget__use_mesa_headers :=
 
-else
+else # !SYSTEM_MESA_HEADERS
 
 define gb_LinkTarget__use_mesa_headers
 $(call gb_LinkTarget_set_include,$(1),\
@@ -43,7 +43,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 endef
 
-endif
+endif # SYSTEM_MESA_HEADERS
 
 ifneq ($(SYSTEM_NPAPI_HEADERS),)
 
@@ -159,7 +159,7 @@ gb_LinkTarget__use_sane_headers :=
 
 endif
 
-ifeq ($(SYSTEM_BLUEZ),YES)
+ifneq ($(SYSTEM_BLUEZ),)
 
 gb_LinkTarget__use_bluez_bluetooth_headers :=
 
diff --git a/configure.ac b/configure.ac
index eb8bee527084..e16508a13c8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10193,29 +10193,29 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
                     AC_MSG_RESULT([external])
                     AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
                         [AC_MSG_ERROR(bluetooth.h not found. install bluez)], [])
-                    SYSTEM_BLUEZ=YES
+                    SYSTEM_BLUEZ=TRUE
                 else
                     AC_MSG_RESULT([internal])
-                    SYSTEM_BLUEZ=NO
+                    SYSTEM_BLUEZ=
                 fi
             else
                 AC_MSG_RESULT([no, dbus disabled])
                 ENABLE_SDREMOTE_BLUETOOTH=
-                SYSTEM_BLUEZ=NO 
+                SYSTEM_BLUEZ=
             fi
         else
             AC_MSG_RESULT([yes])
             ENABLE_SDREMOTE_BLUETOOTH=TRUE
-            SYSTEM_BLUEZ=NO
+            SYSTEM_BLUEZ=
         fi
     else
         AC_MSG_RESULT([no])
         ENABLE_SDREMOTE_BLUETOOTH=
-        SYSTEM_BLUEZ=NO
+        SYSTEM_BLUEZ=
     fi
 else
     ENABLE_SDREMOTE=
-    SYSTEM_BLUEZ=NO
+    SYSTEM_BLUEZ=
     AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_SDREMOTE)
@@ -10437,14 +10437,14 @@ elif test "$_os" = "Darwin"; then
     ENABLE_OPENGL=TRUE
     ENABLE_OPENGL_CANVAS=
     add_warning "openGL canvas not adapted for Mac yet - disabling"
-    SYSTEM_MESA_HEADERS=YES
+    SYSTEM_MESA_HEADERS=TRUE
     AC_MSG_RESULT([yes])
 elif test $_os = WINNT; then
     # Experimental: try to use OpenGL on Windows
     ENABLE_OPENGL=TRUE
     ENABLE_OPENGL_CANVAS=TRUE
     # We need the internal "Mesa" headers.
-    SYSTEM_MESA_HEADERS=NO
+    SYSTEM_MESA_HEADERS=
     BUILD_TYPE="$BUILD_TYPE MESA"
     AC_MSG_RESULT([yes])
 else
@@ -10469,7 +10469,7 @@ else
     AC_MSG_CHECKING([which Mesa headers to use])
     if test "$with_system_mesa_headers" = "yes"; then
         AC_MSG_RESULT([external])
-        SYSTEM_MESA_HEADERS=YES
+        SYSTEM_MESA_HEADERS=TRUE
         AC_LANG_PUSH(C)
         AC_CHECK_HEADER(GL/glxext.h, [],
            [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
@@ -10478,7 +10478,7 @@ else
         AC_LANG_POP(C)
     else
         AC_MSG_RESULT([internal])
-        SYSTEM_MESA_HEADERS=NO
+        SYSTEM_MESA_HEADERS=
         BUILD_TYPE="$BUILD_TYPE MESA"
     fi
 fi