strtok_r: Improve idiom.

diff --git a/ChangeLog b/ChangeLog
index f4f3c7e0e46715851b5b87875e3ffe2e998b3162..ca3c474b06f706de0100e4e5d25b6aacc44bbddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index f9847da07ce0f04ec4c8b3cd50e5c55b78b127ef..cbd47775afed071dca16903c4645e0a0c8d79256 100644 (file)
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -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 @@ changequote([,])dnl
     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.