X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fexpl.m4;h=a94b2b18f2189a4fad49f94f71b46ee9da46cad6;hb=270e2d3e2966d9a5bc16dd0b367b71740b8994d5;hp=af60829fac182ee7f84c6d37aabf1908f937edd1;hpb=150ee3a66dce0f413327e67322e5b89ed440bd71;p=gnulib.git

diff --git a/m4/expl.m4 b/m4/expl.m4
index af60829fa..a94b2b18f 100644
--- a/m4/expl.m4
+++ b/m4/expl.m4
@@ -1,5 +1,5 @@
-# expl.m4 serial 5
-dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
+# expl.m4 serial 7
+dnl Copyright (C) 2010-2012 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.
@@ -22,8 +22,10 @@ AC_DEFUN([gl_FUNC_EXPL],
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = expl;
              long double x;]],
-           [[return expl (x) > 1.5;]])],
+           [[return funcptr (x) > 1.5
+                    || expl (x) > 1.5;]])],
         [gl_cv_func_expl_no_libm=yes],
         [gl_cv_func_expl_no_libm=no])
     ])
@@ -39,8 +41,10 @@ AC_DEFUN([gl_FUNC_EXPL],
                # define __NO_MATH_INLINES 1 /* for glibc */
                #endif
                #include <math.h>
+               long double (*funcptr) (long double) = expl;
                long double x;]],
-             [[return expl (x) > 1.5;]])],
+             [[return funcptr (x) > 1.5
+                      || expl (x) > 1.5;]])],
           [gl_cv_func_expl_in_libm=yes],
           [gl_cv_func_expl_in_libm=no])
         LIBS="$save_LIBS"
@@ -62,8 +66,25 @@ AC_DEFUN([gl_FUNC_EXPL],
       AC_REQUIRE([gl_FUNC_EXP])
       EXPL_LIBM="$EXP_LIBM"
     else
-      AC_REQUIRE([gl_FUNC_FLOORL])
-      EXPL_LIBM="$FLOORL_LIBM"
+      AC_REQUIRE([gl_FUNC_ISNANL])
+      AC_REQUIRE([gl_FUNC_ROUNDL])
+      AC_REQUIRE([gl_FUNC_LDEXPL])
+      EXPL_LIBM=
+      dnl Append $ISNANL_LIBM to EXPL_LIBM, avoiding gratuitous duplicates.
+      case " $EXPL_LIBM " in
+        *" $ISNANL_LIBM "*) ;;
+        *) EXPL_LIBM="$EXPL_LIBM $ISNANL_LIBM" ;;
+      esac
+      dnl Append $ROUNDL_LIBM to EXPL_LIBM, avoiding gratuitous duplicates.
+      case " $EXPL_LIBM " in
+        *" $ROUNDL_LIBM "*) ;;
+        *) EXPL_LIBM="$EXPL_LIBM $ROUNDL_LIBM" ;;
+      esac
+      dnl Append $LDEXPL_LIBM to EXPL_LIBM, avoiding gratuitous duplicates.
+      case " $EXPL_LIBM " in
+        *" $LDEXPL_LIBM "*) ;;
+        *) EXPL_LIBM="$EXPL_LIBM $LDEXPL_LIBM" ;;
+      esac
     fi
   fi
   AC_SUBST([EXPL_LIBM])