X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Fxstrtol.m4;h=99b7db42f8625630eb1816050399a837dc4fac4f;hb=2f681c52f62c1bb9c9dd3fe5cd7a32ec384c34c7;hp=a18b51ff7d3d1badf6c1a20c3be0a1d15c7635e4;hpb=23fe10e274cf20fb2cb75ea1da9556a733106657;p=gnulib.git

diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index a18b51ff7..99b7db42f 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,35 +1,12 @@
-# xstrtol.m4 serial 4
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+#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_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_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_FUNCS_ONCE(isascii)
-  AC_CHECK_DECLS([strtoimax, strtoumax])
-])
-
-# Prerequisites of lib/xstrtoul.c.
-AC_DEFUN([gl_PREREQ_XSTRTOUL],
-[
-  AC_REQUIRE([gl_PREREQ_XSTRTOL])
+  AC_LIBOBJ([xstrtol])
+  AC_LIBOBJ([xstrtoul])
+  AC_LIBOBJ([xstrtol-error])
 ])