[Mesa-dev] [PATCH] loader: decouple USE_DRICONF from HAVE_LIBDRM

[Qiang Yu]

For user can use dri_driver drirc option even on
environment without libdrm.

Tested on build with and without libdrm.

Signed-off-by: Qiang Yu <Qiang.Yu at amd.com>
---
 src/loader/loader.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 2e37d11..22cf320 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -45,11 +45,12 @@
 
 #ifdef HAVE_LIBDRM
 #include <xf86drm.h>
+#endif
+
 #ifdef USE_DRICONF
 #include "util/xmlconfig.h"
 #include "util/xmlpool.h"
 #endif
-#endif
 
 #define __IS_LOADER
 #include "pci_id_driver_map.h"
@@ -102,7 +103,6 @@ static char *loader_get_kernel_driver_name(int fd)
 #endif
 }
 
-#if defined(HAVE_LIBDRM)
 #ifdef USE_DRICONF
 static const char __driConfigOptionsLoader[] =
 DRI_CONF_BEGIN
@@ -134,7 +134,10 @@ static char *loader_get_dri_config_driver(int fd)
    free(kernel_driver);
    return dri_driver;
 }
+#endif
 
+#if defined(HAVE_LIBDRM)
+#ifdef USE_DRICONF
 static char *loader_get_dri_config_device_id(void)
 {
    driOptionCache defaultInitOptions;
@@ -382,7 +385,7 @@ loader_get_driver_for_fd(int fd)
          return strdup(driver);
    }
 
-#if defined(HAVE_LIBDRM) && defined(USE_DRICONF)
+#ifdef USE_DRICONF
    driver = loader_get_dri_config_driver(fd);
    if (driver)
       return driver;
-- 
2.7.4