X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstrtoimax;h=36a96de4b5a48bfcbd841816adca849b2d27d38f;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=155affe53b17486575307b23f0a3557983997ca1;hpb=7cbbd8a31a3be111f26d87fb8e55f4438f9c885f;p=gnulib.git

diff --git a/modules/strtoimax b/modules/strtoimax
index 155affe53..36a96de4b 100644
--- 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:
 inttypes-incomplete
-verify          [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no]
-stdint          [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no]
-strtoll         [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no && test $ac_cv_type_long_long_int = yes]
+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