From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 22 Apr 2011 23:53:21 +0000 (-0700)
Subject: Merge from gnulib.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~223
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c38918db05bb8df4619bff27d04a0dc48202b647;p=emacs.git

Merge from gnulib.
---

diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index 4da8bb89733..d79f3c2b571 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime readlink socklen stdio strftime strtoumax symlink sys_stat warnings
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdio strftime strtoumax symlink sys_stat
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -174,7 +174,7 @@ EXTRA_DIST += intprops.h
 
 ## end   gnulib module intprops
 
-## begin gnulib module inttypes
+## begin gnulib module inttypes-h
 
 BUILT_SOURCES += inttypes.h
 
@@ -214,7 +214,7 @@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 
 EXTRA_DIST += inttypes.in.h
 
-## end   gnulib module inttypes
+## end   gnulib module inttypes-h
 
 ## begin gnulib module lstat
 
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 6a8f46dddc2..7abf39403f0 100644
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -1076,6 +1076,7 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - "
 
 #if @GNULIB_STRTOIMAX@
 # if !@HAVE_DECL_STRTOIMAX@
+#  undef strtoimax
 extern intmax_t strtoimax (const char *, char **, int) _GL_ARG_NONNULL ((1));
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1088,6 +1089,7 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
 
 #if @GNULIB_STRTOUMAX@
 # if !@HAVE_DECL_STRTOUMAX@
+#  undef strtoumax
 extern uintmax_t strtoumax (const char *, char **, int) _GL_ARG_NONNULL ((1));
 # endif
 #elif defined GNULIB_POSIXCHECK
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
 ])