Merge branch 'stable'

diff --git a/ChangeLog b/ChangeLog
index eb14045..71d19cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-24  Ian Beckwith  <ianb@erislabs.net>
+
+       make check: avoid an error when no .git dir present.
+       * Makefile (sc_prefer_ac_check_funcs_once): Don't run git grep
+       if .git directory is not present (e.g. in stable snapshot tarballs).
+
 2010-04-24  Bruno Haible  <bruno@clisp.org>
 
        vasnprintf: Correct errno value in case of out-of-memory.

diff --git a/Makefile b/Makefile
index d2878d6..9ddfadc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ info html dvi pdf:
 check: sc_prefer_ac_check_funcs_once
 
 sc_prefer_ac_check_funcs_once:
+       [ -d .git ] && \
        git grep -w -l AC_CHECK_FUNCS modules && \
          { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS in modules/ 1>&2; \
            exit 1; } || :

diff --git a/NEWS.stable b/NEWS.stable
index 6b853e9..ae4b15c 100644 (file)
--- a/NEWS.stable
+++ b/NEWS.stable
@@ -47,6 +47,10 @@ with the following additional commits:
     * [cea53ef]->[5428678] bootstrap: use "git -h" instead of "git --help"
     * [e51d12c]->[528ab01] vasnprintf: Correct errno value in case of out-of-memory.
 
+    and one local commit, submitted upstream:
+
+    * [7ffc813]->[b219cbd] make check: avoid an error when no .git dir present.
+
 ----------------------------------------------------------------------
 
   * 20100308-stable