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 b55e62811cb0825d6ac4e8491b9d96055ba3bea6..0a89001a454b80645144aaf5619434b9dd3ba7b8 100644 (file)
--- 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.

diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4
index 2ab7cf72ce5bb2118cc6ea3013fed82a1002579b..09692a790b670545c10863f789e5a59d8bbd191d 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 ea0ed1cc8238d6406ff732b7195043dc644465a3..9a299e93fb03243e2b6324b52a5c644e2e26893c 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 0f6c6922eb35b593fa85e142eae4bf89cef93131..011e602897a62bbda94376d33785deeeedd4bc7a 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: