From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 12:13:13 +0000 (+0200)
Subject: strtoull: Move AC_LIBOBJ invocations to module description.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4719686bcfc05ba733a98f4602901102b1425d8e;p=pspp

strtoull: Move AC_LIBOBJ invocations to module description.

* m4/strtoull.m4 (gl_FUNC_STRTOULL): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOULL invocations
from here...
* modules/strtoull (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 7e94d6366d..9f8fcbd706 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	strtoull: Move AC_LIBOBJ invocations to module description.
+	* m4/strtoull.m4 (gl_FUNC_STRTOULL): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOULL invocations
+	from here...
+	* modules/strtoull (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strtoll: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index abf607fd7b..57ef75423d 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,4 +1,4 @@
-# strtoull.m4 serial 6
+# strtoull.m4 serial 7
 dnl Copyright (C) 2002, 2004, 2006, 2008-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,
@@ -11,10 +11,9 @@ AC_DEFUN([gl_FUNC_STRTOULL],
   dnl unless the type 'unsigned long long int' exists.
   AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
   if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-    AC_REPLACE_FUNCS([strtoull])
+    AC_CHECK_FUNCS([strtoull])
     if test $ac_cv_func_strtoull = no; then
       HAVE_STRTOULL=0
-      gl_PREREQ_STRTOULL
     fi
   fi
 ])
diff --git a/modules/strtoull b/modules/strtoull
index 97ce1fd850..6bb66fea22 100644
--- a/modules/strtoull
+++ b/modules/strtoull
@@ -13,6 +13,10 @@ stdlib
 
 configure.ac:
 gl_FUNC_STRTOULL
+if test $HAVE_STRTOULL = 0; then
+  AC_LIBOBJ([strtoull])
+  gl_PREREQ_STRTOULL
+fi
 gl_STDLIB_MODULE_INDICATOR([strtoull])
 
 Makefile.am: