From b3ea28bfac25caa635ef2eb1b224446ae59407b5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 17:08:59 +0200 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ m4/tsearch.m4 | 6 +----- modules/tsearch | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e3863c59..f7dc3c1b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-22 Bruno Haible + 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 + 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 4bd0c4ae4..9d1a1adfd 100644 --- 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 ad1bbefe0..ffb952b8c 100644 --- 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: -- 2.11.0