Mercurial > hg > octave-lyh > gnulib-hg

changeset 15101:f583623a374b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strcasestr*: Move AC_LIBOBJ invocations to module description. * m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE, gl_FUNC_STRCASESTR): Move AC_LIBOBJ and gl_PREREQ_STRCASESTR invocations from here... * modules/strcasestr-simple (configure.ac): ... to here. * modules/strcasestr (configure.ac): ... and here.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 13:04:54 +0200
parents cd153bca26fc
children 941b55762d4d
files ChangeLog m4/strcasestr.m4 modules/strcasestr modules/strcasestr-simple
diffstat 4 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	strcasestr*: Move AC_LIBOBJ invocations to module description.
+	* m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE, gl_FUNC_STRCASESTR):
+	Move AC_LIBOBJ and gl_PREREQ_STRCASESTR invocations from here...
+	* modules/strcasestr-simple (configure.ac): ... to here.
+	* modules/strcasestr (configure.ac): ... and here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strcase: Move AC_LIBOBJ invocations to module description.
--- a/m4/strcasestr.m4
+++ b/m4/strcasestr.m4
@@ -1,4 +1,4 @@
-# strcasestr.m4 serial 19
+# strcasestr.m4 serial 20
 dnl Copyright (C) 2005, 2007-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,
@@ -60,14 +60,9 @@
         ])
       if test "$gl_cv_func_strcasestr_works_always" != yes; then
         REPLACE_STRCASESTR=1
-        AC_LIBOBJ([strcasestr])
       fi
     fi
   fi
-  if test $HAVE_STRCASESTR = 0 || test $REPLACE_STRCASESTR = 1; then
-    AC_LIBOBJ([strcasestr])
-    gl_PREREQ_STRCASESTR
-  fi
 ]) # gl_FUNC_STRCASESTR_SIMPLE
 
 dnl Additionally, check that strcasestr is efficient.
@@ -131,8 +126,6 @@
       ])
     if test "$gl_cv_func_strcasestr_linear" != yes; then
       REPLACE_STRCASESTR=1
-      AC_LIBOBJ([strcasestr])
-      gl_PREREQ_STRCASESTR
     fi
   fi
 ]) # gl_FUNC_STRCASESTR
--- a/modules/strcasestr
+++ b/modules/strcasestr
@@ -8,6 +8,10 @@
 
 configure.ac:
 gl_FUNC_STRCASESTR
+if test $HAVE_STRCASESTR = 0 || test $REPLACE_STRCASESTR = 1; then
+  AC_LIBOBJ([strcasestr])
+  gl_PREREQ_STRCASESTR
+fi
 
 Makefile.am:
 
--- a/modules/strcasestr-simple
+++ b/modules/strcasestr-simple
@@ -16,6 +16,10 @@
 
 configure.ac:
 gl_FUNC_STRCASESTR_SIMPLE
+if test $HAVE_STRCASESTR = 0 || test $REPLACE_STRCASESTR = 1; then
+  AC_LIBOBJ([strcasestr])
+  gl_PREREQ_STRCASESTR
+fi
 gl_STRING_MODULE_INDICATOR([strcasestr])
 
 Makefile.am: