[Mesa-dev] [PATCH 04/17] configure.ac: Rename the gallium_require_llvm helper

[Tobias Droste]

Reviewed-by: Tobias Droste <tdroste at gmx.de>

Am Dienstag, 7. Februar 2017, 22:44:46 CET schrieb Emil Velikov:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Drop the gallium prefix since we're about it use it throughout the
> configure.
> 
> Note we do want to check for enable_gallium_llvm check since (as
> explicitly requested) the toggle should mean --enable-llvm. We cannot do
> the latter for stable so it will come with later patch.
> 
> Cc: Dave Airlie <airlied at redhat.com>
> CC: Tobias Droste <tdroste at gmx.de>
> Cc: "17.0" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  configure.ac | 19 ++++++++-----------
>  1 file changed, 8 insertions(+), 11 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 0c15c3f51d..525c8d2a91 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -960,6 +960,12 @@ llvm_set_environment_variables() {
>      fi
>  }
> 
> +require_llvm() {
> +    if test "x$enable_gallium_llvm" != "xyes"; then
> +        AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
> +    fi
> +}
> +
>  llvm_check_version_for() {
>      if test "x$MESA_LLVM" = x0; then
>          AC_MSG_ERROR([LLVM $1 or newer is required for $2])
> @@ -2189,15 +2195,6 @@ AC_ARG_WITH([d3d-libdir],
>  AC_SUBST([D3D_DRIVER_INSTALL_DIR])
> 
>  dnl
> -dnl Gallium helper functions
> -dnl
> -gallium_require_llvm() {
> -    if test "x$enable_gallium_llvm" != "xyes"; then
> -        AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
> -    fi
> -}
> -
> -dnl
>  dnl r300 doesn't strictly require LLVM, but for performance reasons we
>  dnl highly recommend LLVM usage. So require it at least on x86 and x86_64
>  dnl architectures.
> @@ -2205,7 +2202,7 @@ dnl
>  r300_require_llvm() {
>      case "$host" in *gnux32) return;; esac
>      case "$host_cpu" in
> -    i*86|x86_64|amd64) gallium_require_llvm $1
> +    i*86|x86_64|amd64) require_llvm $1
>          ;;
>      esac
>  }
> @@ -2338,7 +2335,7 @@ if test -n "$with_gallium_drivers"; then
>              ;;
>          xswr)
>              llvm_check_version_for $LLVM_REQUIRED_SWR "swr"
> -            gallium_require_llvm "swr"
> +            require_llvm "swr"
> 
>              swr_require_cxx_feature_flags "C++11" "__cplusplus >= 201103L"
> \ ",-std=c++11" \