# HG changeset patch
# User Eric Blake <eblake@redhat.com>
# Date 1295649209 25200
# Node ID 59d4ae9d48d6a0ae58c0180a070f20327829a3b3
# Parent  43ca99200f71fbae9309eba8859df863b40e9b6c
maintainer-makefile: work with older git for submodule check

* top/maint.mk (public-submodule-commit): Rewrite to avoid
merge-base --independent, which Ubuntu 10.04 git 1.7.0.4 lacks.
Reported by Matthias Bolte.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-01-21  Eric Blake  <eblake@redhat.com>
 
+	maintainer-makefile: work with older git for submodule check
+	* top/maint.mk (public-submodule-commit): Rewrite to avoid
+	merge-base --independent, which Ubuntu 10.04 git 1.7.0.4 lacks.
+	Reported by Matthias Bolte.
+
 	bootstrap: minor portability fixes
 	* build-aux/bootstrap (me): Use $me instead of $0 in functions.
 	(usage): Omit leading capital and trailing . on help phrases, per
diff --git a/top/maint.mk b/top/maint.mk
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1127,8 +1127,8 @@
 public-submodule-commit:
 	$(AM_V_GEN)if test -d $(srcdir)/.git; then			\
 	  cd $(srcdir) &&						\
-	  git submodule --quiet foreach 'test $$(git rev-parse origin)'	\
-	      = '"$$(git merge-base --independent origin $$sha1)"'	\
+	  git submodule --quiet foreach test '$$(git rev-parse $$sha1)'	\
+	      = '$$(git merge-base origin $$sha1)'			\
 	    || { echo '$(ME): found non-public submodule commit' >&2;	\
 		 exit 1; };						\
 	else								\