Update gnulib files.

4 files changed, 25 insertions, 15 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 31bd873fad..ea5e72c44e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -55,12 +55,22 @@ _have-git-version-gen := \
 ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
     $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
-  ifneq (,$(_is-dist-target))
+  _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
+  ifneq (,$(_is-dist-target)$(_is-install-target))
     _curr-ver := $(shell cd $(srcdir) \
                    && $(_build-aux)/git-version-gen .tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       ifeq ($(_curr-ver),UNKNOWN)
         $(info WARNING: unable to verify if $(VERSION) is correct version)
+      else ifneq (,$(_is-install-target))
+        # GNU Coding Standards state that 'make install' should not cause
+        # recompilation after 'make all'.  But as long as changing the version
+        # string alters config.h, the cost of having 'make all' always have an
+        # up-to-date version is prohibitive.  So, as a compromise, we merely
+        # warn when installing a version string that is out of date; the user
+        # should run 'autoreconf' (or something like 'make distcheck') to
+        # fix the version, 'make all' to propagate it, then 'make install'.
+        $(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it)
       else
         $(info INFO: running autoreconf for new version string: $(_curr-ver))
         _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index d09efd5eaf..08a3258462 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -85,10 +85,10 @@ AC_DEFUN([gl_INIT],
   gl_FUNC_STRERROR
   gl_STRING_MODULE_INDICATOR([strerror])
   m4_ifval(gl_LIBSOURCES_LIST, [
-    m4_syscmd([test ! -d ]gl_LIBSOURCES_DIR[ ||
+    m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
       for gl_file in ]gl_LIBSOURCES_LIST[ ; do
-        if test ! -r ]gl_LIBSOURCES_DIR[/$gl_file ; then
-          echo "missing file ]gl_LIBSOURCES_DIR[/$gl_file" >&2
+        if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
           exit 1
         fi
       done])dnl
@@ -124,10 +124,10 @@ AC_DEFUN([gl_INIT],
   gl_COMMON
   gl_source_base='gl/tests'
   m4_ifval(gltests_LIBSOURCES_LIST, [
-    m4_syscmd([test ! -d ]gltests_LIBSOURCES_DIR[ ||
+    m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
       for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
-        if test ! -r ]gltests_LIBSOURCES_DIR[/$gl_file ; then
-          echo "missing file ]gltests_LIBSOURCES_DIR[/$gl_file" >&2
+        if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
           exit 1
         fi
       done])dnl
diff --git a/lgl/m4/gnulib-comp.m4 b/lgl/m4/gnulib-comp.m4
index 16713e7ea2..0321df886b 100644
--- a/lgl/m4/gnulib-comp.m4
+++ b/lgl/m4/gnulib-comp.m4
@@ -92,10 +92,10 @@ AC_DEFUN([lgl_INIT],
   gl_WCHAR_H
   gl_XSIZE
   m4_ifval(lgl_LIBSOURCES_LIST, [
-    m4_syscmd([test ! -d ]lgl_LIBSOURCES_DIR[ ||
+    m4_syscmd([test ! -d ]m4_defn([lgl_LIBSOURCES_DIR])[ ||
       for gl_file in ]lgl_LIBSOURCES_LIST[ ; do
-        if test ! -r ]lgl_LIBSOURCES_DIR[/$gl_file ; then
-          echo "missing file ]lgl_LIBSOURCES_DIR[/$gl_file" >&2
+        if test ! -r ]m4_defn([lgl_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([lgl_LIBSOURCES_DIR])[/$gl_file" >&2
           exit 1
         fi
       done])dnl
@@ -134,10 +134,10 @@ AC_DEFUN([lgl_INIT],
   gt_TYPE_WINT_T
   AC_CHECK_FUNCS([shutdown])
   m4_ifval(lgltests_LIBSOURCES_LIST, [
-    m4_syscmd([test ! -d ]lgltests_LIBSOURCES_DIR[ ||
+    m4_syscmd([test ! -d ]m4_defn([lgltests_LIBSOURCES_DIR])[ ||
       for gl_file in ]lgltests_LIBSOURCES_LIST[ ; do
-        if test ! -r ]lgltests_LIBSOURCES_DIR[/$gl_file ; then
-          echo "missing file ]lgltests_LIBSOURCES_DIR[/$gl_file" >&2
+        if test ! -r ]m4_defn([lgltests_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([lgltests_LIBSOURCES_DIR])[/$gl_file" >&2
           exit 1
         fi
       done])dnl
diff --git a/lgl/vasnprintf.c b/lgl/vasnprintf.c
index a63e7a080c..495f9ad82e 100644
--- a/lgl/vasnprintf.c
+++ b/lgl/vasnprintf.c
@@ -95,7 +95,7 @@
 
 #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
-# include "isnand.h"
+# include "isnand-nolibm.h"
 #endif
 
 #if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL
@@ -106,7 +106,7 @@
 
 #if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
-# include "isnand.h"
+# include "isnand-nolibm.h"
 # include "printf-frexp.h"
 #endif