X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxstrtol.m4;h=95bd9a66446a23831bf58f7a88e042fcd281949f;hb=d8c878368309fa0255b79d90bc773e63e8260053;hp=f69680cb5e23fbeccba182432a1c098f4f210cb2;hpb=5e6853b8099815e07211720d30b2db1f26d8440a;p=gnulib.git

diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index f69680cb5..95bd9a664 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,13 +1,15 @@
-# xstrtol.m4 serial 1
-dnl Copyright (C) 2002 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 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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])
 ])
@@ -15,8 +17,8 @@ AC_DEFUN([gl_XSTRTOL],
 # 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])
+  AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
 ])
 
 # Prerequisites of lib/xstrtol.c.
@@ -24,9 +26,7 @@ AC_DEFUN([gl_PREREQ_XSTRTOL],
 [
   AC_REQUIRE([gl_PREREQ_XSTRTOL_H])
   AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(limits.h string.h)
   AC_CHECK_FUNCS_ONCE(isascii)
-  AC_CHECK_DECLS_ONCE(strtol strtoul)
   AC_CHECK_DECLS([strtoimax, strtoumax])
 ])