From ededdce3c11d8e767d136130a15afe5941a1010c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Nov 2019 18:31:16 +0000
Subject: [PATCH] autogen: Fix detection of gnulib submodule status.

Don't require a rebuild every time the common module changes status.
---
 autogen.sh | 2 +-
 cfg.mk     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index fcdd0ce5d..6f0cbbcfe 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ set -v
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status
-t=$(git submodule status|sed 's/^[ +-]//;s/ .*//')
+t=$(git submodule status | grep gnulib | sed 's/^[ +-]//;s/ .*//')
 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else
diff --git a/cfg.mk b/cfg.mk
index 8ad9b9580..a303ee728 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -132,7 +132,7 @@ ifeq (0,$(MAKELEVEL))
   # b653eda3ac4864de205419d9f41eec267cb89eeb
   _submodule_hash = sed 's/^[ +-]//;s/ .*//'
   _update_required := $(shell						\
-      actual=$$(git submodule status | $(_submodule_hash));		\
+      actual=$$(git submodule status | grep gnulib | $(_submodule_hash));		\
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";	\
       test "$$stamp" = "$$actual"; echo $$?)
   ifeq (1,$(_update_required))