gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / strtoumax

diff --git a/modules/strtoumax b/modules/strtoumax
index c2d615e..725f523 100644 (file)
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -8,13 +8,17 @@ m4/longlong.m4
 m4/strtoumax.m4
 
 Depends-on:
-strtoull
-verify
 inttypes-incomplete
-stdint
+verify          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+stdint          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+strtoull        [{ test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes]
 
 configure.ac:
 gl_FUNC_STRTOUMAX
+if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
+  AC_LIBOBJ([strtoumax])
+  gl_PREREQ_STRTOUMAX
+fi
 gl_INTTYPES_MODULE_INDICATOR([strtoumax])
 
 Makefile.am:
@@ -23,7 +27,7 @@ Include:
 <inttypes.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Paul Eggert