From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 13:28:17 +0000 (+0200)
Subject: memset: Move AC_LIBOBJ invocations to module description.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=656ac4f19e99484737effb760b30d192b4fa25e1;p=pspp

memset: Move AC_LIBOBJ invocations to module description.

* m4/memset.m4 (gl_FUNC_MEMSET): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMSET invocations from
here...
* modules/memset (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 889830905c..66a64312ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	memset: Move AC_LIBOBJ invocations to module description.
+	* m4/memset.m4 (gl_FUNC_MEMSET): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMSET invocations from
+	here...
+	* modules/memset (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	memrchr: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/memset.m4 b/m4/memset.m4
index f0afb3c9bf..faebfa8687 100644
--- a/m4/memset.m4
+++ b/m4/memset.m4
@@ -1,4 +1,4 @@
-# memset.m4 serial 3
+# memset.m4 serial 4
 dnl Copyright (C) 2002, 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,
@@ -6,10 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMSET],
 [
-  AC_REPLACE_FUNCS([memset])
-  if test $ac_cv_func_memset = no; then
-    gl_PREREQ_MEMSET
-  fi
+  AC_CHECK_FUNCS([memset])
 ])
 
 # Prerequisites of lib/memset.c.
diff --git a/modules/memset b/modules/memset
index 9b2a89d94f..9fb1a5d2ac 100644
--- a/modules/memset
+++ b/modules/memset
@@ -15,6 +15,10 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_MEMSET
+if test $ac_cv_func_memset = no; then
+  AC_LIBOBJ([memset])
+  gl_PREREQ_MEMSET
+fi
 
 Makefile.am: