X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtol.m4;h=99b7db42f8625630eb1816050399a837dc4fac4f;hb=ef3ff90a39110bde148b63b18b997c317eee9751;hp=fa6e5c40710de17a46d3c57408b56267226eca1f;hpb=4fde4952d5a3db51a122f96a31bfcd6879399fea;p=gnulib.git

diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index fa6e5c407..99b7db42f 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,36 +1,12 @@
-#serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#serial 10
+dnl Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XSTRTOL],
 [
-  AC_LIBSOURCES([xstrtol.c, xstrtol.h, xstrtoul.c, intprops.h])
   AC_LIBOBJ([xstrtol])
   AC_LIBOBJ([xstrtoul])
-
-  AC_REQUIRE([gl_PREREQ_XSTRTOL])
-  AC_REQUIRE([gl_PREREQ_XSTRTOUL])
-])
-
-# Prerequisites of lib/xstrtol.h.
-AC_DEFUN([gl_PREREQ_XSTRTOL_H],
-[
-  AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
-])
-
-# Prerequisites of lib/xstrtol.c.
-AC_DEFUN([gl_PREREQ_XSTRTOL],
-[
-  AC_REQUIRE([gl_PREREQ_XSTRTOL_H])
-  AC_CHECK_DECLS_ONCE([strtoimax])
-  AC_CHECK_DECLS_ONCE([strtoumax])
-])
-
-# Prerequisites of lib/xstrtoul.c.
-AC_DEFUN([gl_PREREQ_XSTRTOUL],
-[
-  AC_REQUIRE([gl_PREREQ_XSTRTOL])
+  AC_LIBOBJ([xstrtol-error])
 ])