From a7d659efb40f34533716fd8c1ff90a5a5f208b16 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 6 May 2011 00:59:02 +0200 Subject: [PATCH 1/8] alphasort: Move AC_LIBOBJ invocations to module description. * m4/alphasort.m4 (gl_FUNC_ALPHASORT): Move AC_LIBOBJ and gl_PREREQ_ALPHASORT invocations from here... * modules/alphasort (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/alphasort.m4 | 4 +--- modules/alphasort | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c60a4e..635d739 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-05 Bruno Haible + alphasort: Move AC_LIBOBJ invocations to module description. + * m4/alphasort.m4 (gl_FUNC_ALPHASORT): Move AC_LIBOBJ and + gl_PREREQ_ALPHASORT invocations from here... + * modules/alphasort (configure.ac): ... to here. + +2011-05-05 Bruno Haible + fclose, fflush: Respect rules for use of AC_LIBOBJ. * m4/fflush.m4 (gl_FUNC_FFLUSH): Don't invoke gl_REPLACE_FCLOSE. * m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_FFLUSH_STDIN and diff --git a/m4/alphasort.m4 b/m4/alphasort.m4 index 3863f39..e59aa74 100644 --- a/m4/alphasort.m4 +++ b/m4/alphasort.m4 @@ -1,4 +1,4 @@ -# alphasort.m4 serial 1 +# alphasort.m4 serial 2 dnl Copyright (C) 2009-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, @@ -14,8 +14,6 @@ AC_DEFUN([gl_FUNC_ALPHASORT], AC_CHECK_FUNCS([alphasort]) if test $ac_cv_func_alphasort = no; then HAVE_ALPHASORT=0 - AC_LIBOBJ([alphasort]) - gl_PREREQ_ALPHASORT fi ]) diff --git a/modules/alphasort b/modules/alphasort index 319eccc..e567057 100644 --- a/modules/alphasort +++ b/modules/alphasort @@ -11,6 +11,10 @@ extensions configure.ac: gl_FUNC_ALPHASORT +if test $HAVE_ALPHASORT = 0; then + AC_LIBOBJ([alphasort]) + gl_PREREQ_ALPHASORT +fi gl_DIRENT_MODULE_INDICATOR([alphasort]) Makefile.am: -- 1.6.3.2