HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org
[bpt/emacs.git]
/
m4
/
gnulib-comp.m4
diff --git
a/m4/gnulib-comp.m4
b/m4/gnulib-comp.m4
index
534d56f
..
c707e34
100644
(file)
--- a/
m4/gnulib-comp.m4
+++ b/
m4/gnulib-comp.m4
@@
-348,13
+348,13
@@
AC_DEFUN([gl_INIT],
gl_FUNC_GNU_STRFTIME
gl_HEADER_STRING_H
gl_FUNC_STRTOIMAX
gl_FUNC_GNU_STRFTIME
gl_HEADER_STRING_H
gl_FUNC_STRTOIMAX
- if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
+ if test $HAVE_
DECL_
STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
AC_LIBOBJ([strtoimax])
gl_PREREQ_STRTOIMAX
fi
gl_INTTYPES_MODULE_INDICATOR([strtoimax])
gl_FUNC_STRTOUMAX
AC_LIBOBJ([strtoimax])
gl_PREREQ_STRTOIMAX
fi
gl_INTTYPES_MODULE_INDICATOR([strtoimax])
gl_FUNC_STRTOUMAX
- if test $
ac_cv_func_strtoumax = no
; then
+ if test $
HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1
; then
AC_LIBOBJ([strtoumax])
gl_PREREQ_STRTOUMAX
fi
AC_LIBOBJ([strtoumax])
gl_PREREQ_STRTOUMAX
fi
@@
-622,10
+622,10
@@
AC_DEFUN([gl_INIT],
if test $HAVE_READLINKAT = 0; then
func_gl_gnulib_m4code_03e0aaad4cb89ca757653bd367a6ccb7
fi
if test $HAVE_READLINKAT = 0; then
func_gl_gnulib_m4code_03e0aaad4cb89ca757653bd367a6ccb7
fi
- if { test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then
+ if { test $HAVE_
DECL_
STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then
func_gl_gnulib_m4code_strtoll
fi
func_gl_gnulib_m4code_strtoll
fi
- if
test $ac_cv_func_strtoumax = no
&& test $ac_cv_type_unsigned_long_long_int = yes; then
+ if
{ test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; }
&& test $ac_cv_type_unsigned_long_long_int = yes; then
func_gl_gnulib_m4code_strtoull
fi
m4_pattern_allow([^gl_GNULIB_ENABLED_])
func_gl_gnulib_m4code_strtoull
fi
m4_pattern_allow([^gl_GNULIB_ENABLED_])