mesa/program: Add _mesa_symbol_table_replace_symbol()

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8e779d4de9d28f944944ec7aa289603aa51b7b51..30817d867f9a55f4aa42119f41af82ca6a3967fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -955,9 +955,16 @@ AC_ARG_ENABLE([xa],
     [enable_xa=no])
 AC_ARG_ENABLE([gbm],
    [AS_HELP_STRING([--enable-gbm],
-         [enable gbm library @<:@default=auto@:>@])],
+         [enable gbm library @<:@default=yes except cygwin@:>@])],
    [enable_gbm="$enableval"],
-   [enable_gbm=auto])
+   [case "$host_os" in
+       cygwin*)
+          enable_gbm=no
+          ;;
+       *)
+          enable_gbm=yes
+          ;;
+    esac])
 AC_ARG_ENABLE([nine],
     [AS_HELP_STRING([--enable-nine],
         [enable build of the nine Direct3D9 API @<:@default=no@:>@])],
@@ -1667,13 +1674,6 @@ AC_ARG_WITH([vulkan-icddir],
     [VULKAN_ICD_INSTALL_DIR='${datarootdir}/vulkan/icd.d'])
 AC_SUBST([VULKAN_ICD_INSTALL_DIR])
 
-AC_ARG_ENABLE([vulkan-icd-full-driver-path],
-   [AS_HELP_STRING([--disable-vulkan-icd-full-driver-path],
-                   [create Vulkan ICD files with just a .so name and no path])],
-   [vulkan_icd_driver_path="$enableval"],
-   [vulkan_icd_driver_path="yes"])
-AM_CONDITIONAL(VULKAN_ICD_DRIVER_PATH, test "x$vulkan_icd_driver_path" = xyes)
-
 if test -n "$with_vulkan_drivers"; then
     VULKAN_DRIVERS=`IFS=', '; echo $with_vulkan_drivers`
     for driver in $VULKAN_DRIVERS; do
@@ -1755,14 +1755,6 @@ AC_SUBST([OSMESA_PC_LIB_PRIV])
 dnl
 dnl gbm configuration
 dnl
-if test "x$enable_gbm" = xauto; then
-    case "$with_egl_platforms" in
-        *drm*)
-            enable_gbm=yes ;;
-         *)
-            enable_gbm=no ;;
-    esac
-fi
 if test "x$enable_gbm" = xyes; then
     if test "x$enable_dri" = xyes; then
         if test "x$enable_shared_glapi" = xno; then
@@ -2018,9 +2010,13 @@ AC_ARG_WITH([egl-platforms],
         "x11,drm" @<:@default=auto@:>@])],
     [with_egl_platforms="$withval"],
     [if test "x$enable_egl" = xyes; then
-       with_egl_platforms="x11"
+        if test "x$enable_gbm" = xyes; then
+           with_egl_platforms="x11,drm"
+        else
+           with_egl_platforms="x11"
+        fi
     else
-       with_egl_platforms=""
+        with_egl_platforms=""
     fi])
 
 if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
@@ -2631,6 +2627,8 @@ VA_MINOR=`$PKG_CONFIG --modversion libva | $SED -n 's/.*\.\(.*\)\..*$/\1/p'`
 AC_SUBST([VA_MAJOR], $VA_MAJOR)
 AC_SUBST([VA_MINOR], $VA_MINOR)
 
+AM_CONDITIONAL(HAVE_VULKAN_COMMON, test "x$VULKAN_DRIVERS" != "x")
+
 AC_SUBST([XVMC_MAJOR], 1)
 AC_SUBST([XVMC_MINOR], 0)
 
@@ -2789,7 +2787,8 @@ AC_CONFIG_FILES([Makefile
                src/mesa/drivers/x11/Makefile
                src/mesa/main/tests/Makefile
                src/util/Makefile
-               src/util/tests/hash_table/Makefile])
+               src/util/tests/hash_table/Makefile
+               src/vulkan/wsi/Makefile])
 
 AC_OUTPUT
 
@@ -2867,6 +2866,11 @@ if test "$enable_egl" = yes; then
 
     echo "        EGL drivers:    $egl_drivers"
 fi
+if test "x$enable_gbm" = xyes; then
+    echo "        GBM:             yes"
+else
+    echo "        GBM:             no"
+fi
 
 # Vulkan
 echo ""