From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7675713829C for ; Wed, 1 Jun 2016 19:50:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76A3D21C01D; Wed, 1 Jun 2016 19:50:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2313421C01D for ; Wed, 1 Jun 2016 19:50:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FE4634099A for ; Wed, 1 Jun 2016 19:50:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0059342 for ; Wed, 1 Jun 2016 19:50:23 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1464810561.67bcfe4cf1874a8571255a9612da75c5c9d1afde.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: / X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog configure.ac X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 67bcfe4cf1874a8571255a9612da75c5c9d1afde X-VCS-Branch: master Date: Wed, 1 Jun 2016 19:50:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cc95bede-3999-4e6e-8182-9233cc3b0c70 X-Archives-Hash: 45e76966ae78e0482645fd48302b2d8d commit: 67bcfe4cf1874a8571255a9612da75c5c9d1afde Author: Ulrich Müller gentoo org> AuthorDate: Wed Jun 1 19:49:21 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Jun 1 19:49:21 2016 +0000 URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=67bcfe4c Make configure test for git more robust. * configure.ac: Make testing for git repository more robust. ChangeLog | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c166ad0..087baae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-06-01 Ulrich Müller + * configure.ac: Make testing for git repository more robust. + * configure.ac: Where possible, use AC_CHECK_PROGS instead of AC_PATH_PROGS, in order to avoid absolute paths, bug 122260. * libs/core.bash.in (sed): diff --git a/configure.ac b/configure.ac index 6fce662..9a72546 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ AC_SUBST(EPREFIX) AC_MSG_CHECKING([whether building from git]) EXTRAVERSION="" eselect_git_dir=${GIT_DIR:-${srcdir}/.git} -if test -d "${eselect_git_dir}"; then +if GIT_DIR="${eselect_git_dir}" git rev-parse >/dev/null 2>&1; then COMMIT=`GIT_DIR="${eselect_git_dir}" git describe --long --always HEAD` if test x$COMMIT != x; then EXTRAVERSION=", git commit $COMMIT"