changeset 13160:0b76eb201e75

strtok_r: Improve idiom.
author Bruno Haible <bruno@clisp.org>
date Mon, 05 Apr 2010 12:53:27 +0200
parents b6a5437d4591
children c4c537d4c2f0
files ChangeLog m4/strtok_r.m4
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 05 12:51:03 2010 +0200
+++ b/ChangeLog	Mon Apr 05 12:53:27 2010 +0200
@@ -1,3 +1,9 @@
+2010-04-05  Bruno Haible  <bruno@clisp.org>
+
+	strtok_r: Improve idiom.
+	* m4/strtok_r.m4 (gl_FUNC_STRTOK_R): Invoke gl_PREREQ_STRDUP only when
+	AC_LIBOBJ is used.
+
 2010-04-05  Bruno Haible  <bruno@clisp.org>
 
 	strdup: Improve idiom.
--- a/m4/strtok_r.m4	Mon Apr 05 12:51:03 2010 +0200
+++ b/m4/strtok_r.m4	Mon Apr 05 12:53:27 2010 +0200
@@ -1,5 +1,5 @@
-# strtok_r.m4 serial 9
-dnl Copyright (C) 2002, 2003, 2004, 2007, 2009, 2010 Free Software Foundation,
+# strtok_r.m4 serial 10
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2010 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -59,12 +59,12 @@
     esac
   else
     AC_LIBOBJ([strtok_r])
+    gl_PREREQ_STRTOK_R
   fi
   AC_CHECK_DECLS_ONCE([strtok_r])
   if test $ac_cv_have_decl_strtok_r = no; then
     HAVE_DECL_STRTOK_R=0
   fi
-  gl_PREREQ_STRTOK_R
 ])
 
 # Prerequisites of lib/strtok_r.c.