X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtol.m4;h=25ab9b3fa10747a9ce9cc3cbd2f8778bb985821f;hb=ee9faa0f2ee44b45ecddbe513c4c5f206552b708;hp=86d14b68c009e68054ba9caa03b61d3e515a75c9;hpb=552a680fa612218b68d4ef2f49bc276b95f6677b;p=gnulib.git

diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index 86d14b68c..25ab9b3fa 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,37 +1,12 @@
-# xstrtol.m4 serial 2
-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-2010 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([jm_AC_TYPE_INTMAX_T])
-  AC_REQUIRE([jm_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_HEADERS_ONCE(string.h)
-  AC_CHECK_FUNCS_ONCE(isascii)
-  AC_CHECK_DECLS_ONCE(strtol strtoul)
-  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])
 ])