X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstrtoimax;h=36a96de4b5a48bfcbd841816adca849b2d27d38f;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=0a299c8931794172283d90d46a52e50f02c4cf6f;hpb=738e912a0f97a43c2b195bcec6fe34512208e81f;p=gnulib.git

diff --git a/modules/strtoimax b/modules/strtoimax
index 0a299c893..36a96de4b 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -3,25 +3,30 @@ 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
-stdint
+inttypes-incomplete
+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:
 
 Include:
+<inttypes.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Paul Eggert