>From 740fedbf05525a860161f21ce92ea140fb576031 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sat, 2 Jan 2016 16:19:53 -0800
Subject: [PATCH] msvc-inval: fix problem with unset shell var

Problem reported by Karl Berry in:
http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00004.html
* modules/msvc-inval (Depends-on):
AC_REQUIRE gl_MSVC_INVAL instead of merely calling it.
* modules/msvc-nothrow (Depends-on): Likewise for gl_MSVC_NOTHROW.
---
 ChangeLog            | 9 +++++++++
 modules/msvc-inval   | 2 +-
 modules/msvc-nothrow | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c41b27d..2c60bc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-02  Paul Eggert  <address@hidden>
+
+	msvc-inval: fix problem with unset shell var
+	Problem reported by Karl Berry in:
+	http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00004.html
+	* modules/msvc-inval (Depends-on):
+	AC_REQUIRE gl_MSVC_INVAL instead of merely calling it.
+	* modules/msvc-nothrow (Depends-on): Likewise for gl_MSVC_NOTHROW.
+
 2016-01-01  Pádraig Brady  <address@hidden>
 
 	tests: for compare_(), use cmp -s where available
diff --git a/modules/msvc-inval b/modules/msvc-inval
index 7eb030a..ea1a7af 100644
--- a/modules/msvc-inval
+++ b/modules/msvc-inval
@@ -9,7 +9,7 @@ m4/msvc-inval.m4
 Depends-on:
 
 configure.ac:
-gl_MSVC_INVAL
+AC_REQUIRE([gl_MSVC_INVAL])
 if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
   AC_LIBOBJ([msvc-inval])
 fi
diff --git a/modules/msvc-nothrow b/modules/msvc-nothrow
index 076bb86..2e670f9 100644
--- a/modules/msvc-nothrow
+++ b/modules/msvc-nothrow
@@ -11,7 +11,7 @@ Depends-on:
 msvc-inval
 
 configure.ac:
-gl_MSVC_NOTHROW
+AC_REQUIRE([gl_MSVC_NOTHROW])
 if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
   AC_LIBOBJ([msvc-nothrow])
 fi
-- 
2.5.0