From: Bruno Haible Date: Sat, 7 May 2011 10:28:30 +0000 (+0200) Subject: fpurge: Move AC_LIBOBJ invocations to module description. X-Git-Tag: v0.1~2582 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=916f8f8df299ae8d1fac87b6b6b3354478536068;p=gnulib.git fpurge: Move AC_LIBOBJ invocations to module description. * m4/fpurge.m4 (gl_FUNC_FPURGE): Set HAVE_FPURGE. Move AC_LIBOBJ invocations from here... * modules/fpurge (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index 081539740..520b57339 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-07 Bruno Haible + fpurge: Move AC_LIBOBJ invocations to module description. + * m4/fpurge.m4 (gl_FUNC_FPURGE): Set HAVE_FPURGE. Move AC_LIBOBJ + invocations from here... + * modules/fpurge (configure.ac): ... to here. + +2011-05-07 Bruno Haible + fpending: Move AC_LIBOBJ invocations to module description. * m4/fpending.m4 (gl_PREREQ_FPENDING): New macro, extracted from gl_FUNC_FPENDING. diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 index a62c2fef2..234f563f8 100644 --- a/m4/fpurge.m4 +++ b/m4/fpurge.m4 @@ -1,4 +1,4 @@ -# fpurge.m4 serial 6 +# fpurge.m4 serial 7 dnl Copyright (C) 2007, 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, @@ -11,6 +11,7 @@ AC_DEFUN([gl_FUNC_FPURGE], AC_CHECK_FUNCS_ONCE([__fpurge]) AC_CHECK_DECLS([fpurge], , , [[#include ]]) if test "x$ac_cv_func_fpurge" = xyes; then + HAVE_FPURGE=1 # Detect BSD bug. Only cygwin 1.7 is known to be immune. AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include @@ -34,10 +35,9 @@ AC_DEFUN([gl_FUNC_FPURGE], [gl_cv_func_fpurge_works='guessing no'])]) if test "x$gl_cv_func_fpurge_works" != xyes; then REPLACE_FPURGE=1 - AC_LIBOBJ([fpurge]) fi else - AC_LIBOBJ([fpurge]) + HAVE_FPURGE=0 fi if test "x$ac_cv_have_decl_fpurge" = xno; then HAVE_DECL_FPURGE=0 diff --git a/modules/fpurge b/modules/fpurge index 6cebcff1c..241abeb2f 100644 --- a/modules/fpurge +++ b/modules/fpurge @@ -11,6 +11,9 @@ stdio configure.ac: gl_FUNC_FPURGE +if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then + AC_LIBOBJ([fpurge]) +fi gl_STDIO_MODULE_INDICATOR([fpurge]) Makefile.am: