Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / modules / strtoimax

diff --git a/modules/strtoimax b/modules/strtoimax
index c4e8982..36a96de 100644 (file)
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -3,17 +3,21 @@ strtoimax() function: convert string to 'intmax_t'.
 
 Files:
 lib/strtoimax.c
-m4/longlong.m4
 m4/strtoimax.m4
+m4/longlong.m4
 
 Depends-on:
-strtoll
-verify
 inttypes-incomplete
-stdint
+verify          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
+stdint          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
+strtoll         [{ test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes]
 
 configure.ac:
 gl_FUNC_STRTOIMAX
+if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
+  AC_LIBOBJ([strtoimax])
+  gl_PREREQ_STRTOIMAX
+fi
 gl_INTTYPES_MODULE_INDICATOR([strtoimax])
 
 Makefile.am:
@@ -22,7 +26,7 @@ Include:
 <inttypes.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Paul Eggert