From 3e7d30c22f8b7e42ddf20afa299169fdf70eb7e3 Mon Sep 17 00:00:00 2001 From: Tobias Droste Date: Wed, 8 Feb 2017 09:35:06 +0100 Subject: [PATCH] configure.ac: Check for --enable-llvm before --enable-gallium-llvm Signed-off-by: Tobias Droste --- configure.ac | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 76c8be5148..d41b939d57 100644 --- a/configure.ac +++ b/configure.ac @@ -1727,22 +1727,6 @@ if test -n "$with_dri_drivers"; then DRI_DIRS=`echo $DRI_DIRS|tr " " "\n"|sort -u|tr "\n" " "` fi - -dnl -dnl Gallium LLVM -dnl Deprecated: kept for backwards compatibility -dnl -AC_ARG_ENABLE([gallium-llvm], - [AS_HELP_STRING([--enable-gallium-llvm], - [DEPRECATED: use --enable-llvm instead])], - [enable_gallium_llvm="$enableval"], - [enable_gallium_llvm=auto]) - -if test "x$enable_gallium_llvm" != xauto; then - AC_MSG_WARN([The --enable-gallium-llvm option has been deprecated. Use --enable-llvm instead.]) - enable_llvm=$enable_gallium_llvm -fi - dnl dnl LLVM dnl @@ -1759,6 +1743,21 @@ if test "x$enable_llvm" = xauto -a "x$FOUND_LLVM" = xyes; then esac fi +dnl +dnl Gallium LLVM +dnl Deprecated: kept for backwards compatibility +dnl +AC_ARG_ENABLE([gallium-llvm], + [AS_HELP_STRING([--enable-gallium-llvm], + [DEPRECATED: use --enable-llvm instead])], + [enable_gallium_llvm="$enableval"], + [enable_gallium_llvm=auto]) + +if test "x$enable_gallium_llvm" != xauto; then + AC_MSG_WARN([The --enable-gallium-llvm option has been deprecated. Use --enable-llvm instead.]) + enable_llvm=$enable_gallium_llvm +fi + # # Vulkan driver configuration # -- 2.11.0