From 38abcdba8a59e88a91d598951323b977fb3fa1ad Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 7 Feb 2017 20:48:12 +0000 Subject: [PATCH] configure.ac: move AC_ARG_ENABLE([gallium-llvm] hunk further up With next commits we'll require --enable-gallium-llvm (en route to a greater good later on) for RADV. The latter is required to ensure that as otherwise we'll fail to build. Cc: Dave Airlie Cc: "17.0" Signed-off-by: Emil Velikov Reviewed-by: Tobias Droste --- configure.ac | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 8844ece..788561d 100644 --- a/configure.ac +++ b/configure.ac @@ -1725,6 +1725,24 @@ if test -n "$with_dri_drivers"; then fi +dnl +dnl Gallium LLVM +dnl +AC_ARG_ENABLE([gallium-llvm], + [AS_HELP_STRING([--enable-gallium-llvm], + [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])], + [enable_gallium_llvm="$enableval"], + [enable_gallium_llvm=auto]) + +if test -z "$with_gallium_drivers"; then + enable_gallium_llvm=no +fi +if test "x$enable_gallium_llvm" = xauto; then + case "$host_cpu" in + i*86|x86_64|amd64) enable_gallium_llvm=yes;; + esac +fi + # # Vulkan driver configuration # @@ -2131,24 +2149,6 @@ if ! echo "$egl_platforms" | grep -q 'x11'; then GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS" fi -dnl -dnl Gallium LLVM -dnl -AC_ARG_ENABLE([gallium-llvm], - [AS_HELP_STRING([--enable-gallium-llvm], - [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])], - [enable_gallium_llvm="$enableval"], - [enable_gallium_llvm=auto]) - -if test -z "$with_gallium_drivers"; then - enable_gallium_llvm=no -fi -if test "x$enable_gallium_llvm" = xauto; then - case "$host_cpu" in - i*86|x86_64|amd64) enable_gallium_llvm=yes;; - esac -fi - dnl Directory for XVMC libs AC_ARG_WITH([xvmc-libdir], [AS_HELP_STRING([--with-xvmc-libdir=DIR], -- 2.7.4