diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,5 +1,7 @@ 2016-06-01 Ulrich Müller <ulm@gentoo.org> + * 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" |