[Mesa-dev] [PATCH] configure.ac: make grep tests more portable

[Vinson Lee]

On Thu, Jun 20, 2013 at 3:14 AM, Jonathan Gray <jsg at jsg.id.au> wrote:
> Use grep -w instead of the empty string escape sequences
> which are less portable.  Makes the grep tests
> function as intended on OpenBSD.
>
> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
> ---
>  configure.ac | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git configure.ac configure.ac
> index 6832b0d..45d9b1c 100644
> --- configure.ac
> +++ configure.ac
> @@ -1580,14 +1580,14 @@ if test "x$enable_gallium_llvm" = xyes; then
>         LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
>         LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'`
>          LLVM_COMPONENTS="engine bitwriter"
> -        if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then
> +        if $LLVM_CONFIG --components | grep -qw 'mcjit'; then
>              LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit"
>          fi
>
>          if test "x$enable_opencl" = xyes; then
>              LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation"
>              # LLVM 3.3 >= 177971 requires IRReader
> -            if $LLVM_CONFIG --components | grep -q '\<irreader\>'; then
> +            if $LLVM_CONFIG --components | grep -qw 'irreader'; then
>                  LLVM_COMPONENTS="${LLVM_COMPONENTS} irreader"
>              fi
>          fi
> @@ -1709,7 +1709,7 @@ radeon_llvm_check() {
>      if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
>          AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required for r600g and radeonsi.])
>      fi
> -    if test true && $LLVM_CONFIG --targets-built | grep -qv '\<R600\>' ; then
> +    if test true && $LLVM_CONFIG --targets-built | grep -qvw 'R600' ; then
>          AC_MSG_ERROR([LLVM R600 Target not enabled.  You can enable it when building the LLVM
>                        sources with the --enable-experimental-targets=R600
>                        configure flag])
> --
> 1.8.3.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Patch applied to master.