[pacman-dev] [PATCH 1/3] configure.ac: cleanup duplication in --enable-git-version

[Allan McRae]

On 23/09/12 02:17, Dave Reisner wrote:
> Avoid adding our own messaging, as autoconf will add this for us with
> the result of the AC_CHECK_FILE test. Reuse the cache variable from
> autoconf to set our local variable.
> 
> Signed-off-by: Dave Reisner <dreisner at archlinux.org>
> ---
>  configure.ac | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 7fe696a..7c65a75 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -424,13 +424,9 @@ AC_MSG_CHECKING(whether to use git version if available)
>  if test "x$wantgitver" = "xyes" ; then
>  	AC_CHECK_PROGS([GIT], [git])
>  	AC_CHECK_FILE([.git/], hasgitdir=yes)
> +	usegitver=$ac_cv_file__git

That should be:

$ac_cv_file__git_

>  	if test $GIT -a "x$hasgitdir" = "xyes"; then
> -		AC_MSG_RESULT([yes])
> -		usegitver=yes
>  		AC_DEFINE([USE_GIT_VERSION], , [Use GIT version in version string])
> -	else
> -		AC_MSG_RESULT([no, git or .git dir missing])
> -		usegitver=no
>  	fi
>  else
>  	AC_MSG_RESULT([no, disabled by configure])
>