X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsinl.m4;h=c70ac776efaeeeb8f481e658026a19d0b4b58164;hb=c9ff025783e5374226ffbf7940f40ce7db6852ed;hp=12393264b680c0961432b3069fcf2e57b0136a9c;hpb=73e329f11142c2804e42825e1590041d68dbb6e9;p=gnulib.git diff --git a/m4/sinl.m4 b/m4/sinl.m4 index 12393264b..c70ac776e 100644 --- a/m4/sinl.m4 +++ b/m4/sinl.m4 @@ -1,5 +1,5 @@ -# sinl.m4 serial 1 -dnl Copyright (C) 2010 Free Software Foundation, Inc. +# sinl.m4 serial 3 +dnl Copyright (C) 2010-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, dnl with or without modifications, as long as this notice is preserved. @@ -14,12 +14,14 @@ AC_DEFUN([gl_FUNC_SINL], AC_CACHE_CHECK([whether sinl() can be used without linking with libm], [gl_cv_func_sinl_no_libm], [ - AC_TRY_LINK([#ifndef __NO_MATH_INLINES - # define __NO_MATH_INLINES 1 /* for glibc */ - #endif - #include - long double x;], - [return sinl (x) > 0.4;], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#ifndef __NO_MATH_INLINES + # define __NO_MATH_INLINES 1 /* for glibc */ + #endif + #include + long double x;]], + [[return sinl (x) > 0.4;]])], [gl_cv_func_sinl_no_libm=yes], [gl_cv_func_sinl_no_libm=no]) ]) @@ -29,12 +31,14 @@ AC_DEFUN([gl_FUNC_SINL], [ save_LIBS="$LIBS" LIBS="$LIBS -lm" - AC_TRY_LINK([#ifndef __NO_MATH_INLINES - # define __NO_MATH_INLINES 1 /* for glibc */ - #endif - #include - long double x;], - [return sinl (x) > 0.4;], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#ifndef __NO_MATH_INLINES + # define __NO_MATH_INLINES 1 /* for glibc */ + #endif + #include + long double x;]], + [[return sinl (x) > 0.4;]])], [gl_cv_func_sinl_in_libm=yes], [gl_cv_func_sinl_in_libm=no]) LIBS="$save_LIBS" @@ -57,7 +61,21 @@ AC_DEFUN([gl_FUNC_SINL], AC_REQUIRE([gl_FUNC_ISNANL]) AC_REQUIRE([gl_FUNC_FLOOR]) AC_REQUIRE([gl_FUNC_FLOORL]) - SINL_LIBM="$ISNANL_LIBM $FLOOR_LIBM $FLOORL_LIBM" + dnl Append $ISNANL_LIBM to SINL_LIBM, avoiding gratuitous duplicates. + case " $SINL_LIBM " in + *" $ISNANL_LIBM "*) ;; + *) SINL_LIBM="$SINL_LIBM $ISNANL_LIBM" ;; + esac + dnl Append $FLOOR_LIBM to SINL_LIBM, avoiding gratuitous duplicates. + case " $SINL_LIBM " in + *" $FLOOR_LIBM "*) ;; + *) SINL_LIBM="$SINL_LIBM $FLOOR_LIBM" ;; + esac + dnl Append $FLOORL_LIBM to SINL_LIBM, avoiding gratuitous duplicates. + case " $SINL_LIBM " in + *" $FLOORL_LIBM "*) ;; + *) SINL_LIBM="$SINL_LIBM $FLOORL_LIBM" ;; + esac fi AC_SUBST([SINL_LIBM]) ])