diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-22 16:53:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-22 16:53:21 -0700 |
| commit | c38918db05bb8df4619bff27d04a0dc48202b647 (patch) | |
| tree | 32627a31919dbfa46c7f9463b5c1765ecdd5c808 /m4 | |
| parent | 03eb7af5765b8921f1724813908ae823ff35baaa (diff) | |
| download | emacs-c38918db05bb8df4619bff27d04a0dc48202b647.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gl-comp.m4 | 11 | ||||
| -rw-r--r-- | m4/strtoumax.m4 | 17 |
2 files changed, 5 insertions, 23 deletions
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4 index 4ab10b54e8a..16f62236e27 100644 --- a/m4/gl-comp.m4 +++ b/m4/gl-comp.m4 @@ -43,9 +43,8 @@ AC_DEFUN([gl_EARLY], # Code from module ignore-value: # Code from module include_next: # Code from module intprops: - # Code from module inttypes: + # Code from module inttypes-h: # Code from module lstat: - # Code from module manywarnings: # Code from module mktime: # Code from module multiarch: # Code from module readlink: @@ -66,7 +65,6 @@ AC_DEFUN([gl_EARLY], # Code from module unistd: # Code from module verify: # Code from module warn-on-use: - # Code from module warnings: ]) # This macro should be invoked from ./configure.in, in the section @@ -113,12 +111,11 @@ AC_DEFUN([gl_INIT], AC_REQUIRE([AC_C_INLINE]) # Code from module include_next: # Code from module intprops: - # Code from module inttypes: + # Code from module inttypes-h: gl_INTTYPES_H # Code from module lstat: gl_FUNC_LSTAT gl_SYS_STAT_MODULE_INDICATOR([lstat]) - # Code from module manywarnings: # Code from module mktime: gl_FUNC_MKTIME gl_TIME_MODULE_INDICATOR([mktime]) @@ -164,8 +161,6 @@ AC_DEFUN([gl_INIT], gl_UNISTD_H # Code from module verify: # Code from module warn-on-use: - # Code from module warnings: - AC_SUBST([WARN_CFLAGS]) # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -364,7 +359,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/inttypes.m4 m4/longlong.m4 m4/lstat.m4 - m4/manywarnings.m4 m4/md5.m4 m4/mktime.m4 m4/multiarch.m4 @@ -388,6 +382,5 @@ AC_DEFUN([gl_FILE_LIST], [ m4/tm_gmtoff.m4 m4/unistd_h.m4 m4/warn-on-use.m4 - m4/warnings.m4 m4/wchar_t.m4 ]) diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index f8075945a3c..3ca38cdbc93 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -12,20 +12,9 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], if test "$ac_cv_have_decl_strtoumax" != yes; then HAVE_DECL_STRTOUMAX=0 - AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro], - gl_cv_func_strtoumax_macro, - [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h> - #ifdef strtoumax - inttypes_h_defines_strtoumax - #endif], - gl_cv_func_strtoumax_macro=yes, - gl_cv_func_strtoumax_macro=no)]) - - if test "$gl_cv_func_strtoumax_macro" != yes; then - AC_REPLACE_FUNCS([strtoumax]) - if test $ac_cv_func_strtoumax = no; then - gl_PREREQ_STRTOUMAX - fi + AC_REPLACE_FUNCS([strtoumax]) + if test $ac_cv_func_strtoumax = no; then + gl_PREREQ_STRTOUMAX fi fi ]) |