# HG changeset patch # User Bruno Haible # Date 1304764110 -7200 # Node ID 69610f25d34fe80074211de2b0062afac41eb114 # Parent 6e62e423a53b4af45c9b3517cab8ace7f1139dab 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 --- 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_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 @@ [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 --- a/modules/fpurge +++ b/modules/fpurge @@ -11,6 +11,9 @@ 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: