tsearch: Move AC_LIBOBJ invocations to module description.

* m4/tsearch.m4 (gl_FUNC_TSEARCH): Move AC_LIBOBJ and gl_PREREQ_TSEARCH
invocations from here...
* modules/tsearch (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 5e3863c..f7dc3c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
+       tsearch: Move AC_LIBOBJ invocations to module description.
+       * m4/tsearch.m4 (gl_FUNC_TSEARCH): Move AC_LIBOBJ and gl_PREREQ_TSEARCH
+       invocations from here...
+       * modules/tsearch (configure.ac): ... to here.
+
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
        towctrans: Move AC_LIBOBJ invocations to module description.
        * m4/towctrans.m4 (gl_FUNC_TOWCTRANS): Set HAVE_TOWCTRANS. Move
        AC_LIBOBJ invocation from here...

diff --git a/m4/tsearch.m4 b/m4/tsearch.m4
index 4bd0c4a..9d1a1ad 100644 (file)
--- a/m4/tsearch.m4
+++ b/m4/tsearch.m4
@@ -1,4 +1,4 @@
-# tsearch.m4 serial 5
+# tsearch.m4 serial 6
 dnl Copyright (C) 2006-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,
@@ -46,14 +46,10 @@ main ()
     case "$gl_cv_func_tdelete_works" in
       *no)
         REPLACE_TSEARCH=1
-        AC_LIBOBJ([tsearch])
-        gl_PREREQ_TSEARCH
         ;;
     esac
   else
     HAVE_TSEARCH=0
-    AC_LIBOBJ([tsearch])
-    gl_PREREQ_TSEARCH
   fi
 ])
 

diff --git a/modules/tsearch b/modules/tsearch
index ad1bbef..ffb952b 100644 (file)
--- a/modules/tsearch
+++ b/modules/tsearch
@@ -10,6 +10,10 @@ search
 
 configure.ac:
 gl_FUNC_TSEARCH
+if test $HAVE_TSEARCH = 0 || test $REPLACE_TSEARCH = 1; then
+  AC_LIBOBJ([tsearch])
+  gl_PREREQ_TSEARCH
+fi
 gl_SEARCH_MODULE_INDICATOR([tsearch])
 
 Makefile.am: