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.

diff --git a/ChangeLog b/ChangeLog
index b55e628..0a89001 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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.
        * m4/strcase.m4 (gl_FUNC_STRNCASECMP): Set HAVE_STRNCASECMP.
        (gl_FUNC_STRCASECMP, gl_FUNC_STRNCASECMP): Call AC_CHECK_FUNCS instead

diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4
index 2ab7cf7..09692a7 100644 (file)
--- 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 @@ AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE],
         ])
       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 @@ static void quit (int sig) { exit (sig + 128); }
       ])
     if test "$gl_cv_func_strcasestr_linear" != yes; then
       REPLACE_STRCASESTR=1
-      AC_LIBOBJ([strcasestr])
-      gl_PREREQ_STRCASESTR
     fi
   fi
 ]) # gl_FUNC_STRCASESTR

diff --git a/modules/strcasestr b/modules/strcasestr
index ea0ed1c..9a299e9 100644 (file)
--- a/modules/strcasestr
+++ b/modules/strcasestr
@@ -8,6 +8,10 @@ strcasestr-simple
 
 configure.ac:
 gl_FUNC_STRCASESTR
+if test $HAVE_STRCASESTR = 0 || test $REPLACE_STRCASESTR = 1; then
+  AC_LIBOBJ([strcasestr])
+  gl_PREREQ_STRCASESTR
+fi
 
 Makefile.am:
 

diff --git a/modules/strcasestr-simple b/modules/strcasestr-simple
index 0f6c692..011e602 100644 (file)
--- a/modules/strcasestr-simple
+++ b/modules/strcasestr-simple
@@ -16,6 +16,10 @@ extensions
 
 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: