From 00bc6dadedcf62fe00c85f4967d24a3dbffd0bd0 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 13 Aug 2020 10:00:34 +0200 Subject: Simplify configure check for fmin AC_TRY_LINK is deprecated and users are encouraged to replace it with AC_LINK_IFELSE. However, AC_SEARCH_LIBS uses AC_LINK_IFELSE internally and does exactly what we need here: test whether an `fmin` symbol is already resolved or if libm will resolve it, neatly avoiding autoconf caching and AC_TRY_LINK/AC_LINK_IFELSE pitfalls. So just use that. --- configure.ac | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 08825be..f4e89a1 100644 --- a/configure.ac +++ b/configure.ac @@ -79,19 +79,7 @@ case ${host_os} in esac AM_CONDITIONAL(WIN32, test x$win32 = xtrue) -# Check if we need libm for fmin -CACHED_CFLAGS="$CFLAGS" -CFLAGS="-O0" -AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin, - AC_TRY_LINK([ - #include - #include - ], [ - double val = 3.1415f * 0.55555f; - double diff = fmin(val, DBL_MAX); - if (diff > 0) return 1; - ], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no)) -CFLAGS="$CACHED_CFLAGS" +AC_SEARCH_LIBS([fmin],[m]) # Check if struct tm has a tm_gmtoff member AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff, @@ -153,10 +141,6 @@ AM_CONDITIONAL([HAVE_CYTHON],[test "x$cython_python_bindings" = "xyes"]) AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS") GLOBAL_LDFLAGS="$PTHREAD_LIBS" -if test "x$ac_cv_fmin_builtin" != "xyes"; then - GLOBAL_LDFLAGS+=" -lm" -fi - AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [build debug message output code (default is no)]), -- cgit v1.1-32-gdbae