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

strchrnul: Move AC_LIBOBJ invocations to module description.

* m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Move AC_LIBOBJ and
gl_PREREQ_STRCHRNUL invocations from here...
* modules/strchrnul (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 0a89001a45..8d781339ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	strchrnul: Move AC_LIBOBJ invocations to module description.
+	* m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Move AC_LIBOBJ and
+	gl_PREREQ_STRCHRNUL invocations from here...
+	* modules/strchrnul (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strcasestr*: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index fbfd5aebd5..d89a062461 100644
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -1,4 +1,4 @@
-# strchrnul.m4 serial 8
+# strchrnul.m4 serial 9
 dnl Copyright (C) 2003, 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,
@@ -44,10 +44,6 @@ AC_DEFUN([gl_FUNC_STRCHRNUL],
       *) REPLACE_STRCHRNUL=1 ;;
     esac
   fi
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-    AC_LIBOBJ([strchrnul])
-    gl_PREREQ_STRCHRNUL
-  fi
 ])
 
 # Prerequisites of lib/strchrnul.c.
diff --git a/modules/strchrnul b/modules/strchrnul
index 59c4cc68ab..98a3d8c58a 100644
--- a/modules/strchrnul
+++ b/modules/strchrnul
@@ -14,6 +14,10 @@ rawmemchr       [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1]
 
 configure.ac:
 gl_FUNC_STRCHRNUL
+if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
+  AC_LIBOBJ([strchrnul])
+  gl_PREREQ_STRCHRNUL
+fi
 gl_STRING_MODULE_INDICATOR([strchrnul])
 
 Makefile.am: