X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fexpl.m4;h=2a9f6ffe9eae155dad47e07f2d98e6dd37b5dfea;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=ba1143ee3cce56cce3345383032bdd117153b07c;hpb=ec062d7a2671739dd977ebde3965fc93f8678a2e;p=gnulib.git

diff --git a/m4/expl.m4 b/m4/expl.m4
index ba1143ee3..2a9f6ffe9 100644
--- a/m4/expl.m4
+++ b/m4/expl.m4
@@ -1,5 +1,5 @@
-# expl.m4 serial 2
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# expl.m4 serial 8
+dnl Copyright (C) 2010-2013 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.
@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_EXPL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare expl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -20,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])
     ])
@@ -37,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"
@@ -50,14 +56,36 @@ AC_DEFUN([gl_FUNC_EXPL],
   if test $gl_cv_func_expl_no_libm = yes \
      || test $gl_cv_func_expl_in_libm = yes; then
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has expl() in libc but doesn't declare it in <math.h>.
-    AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [#include <math.h>])
+    dnl Mac OS X 10.3 has expl() in libc but doesn't declare it in <math.h>.
+    AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [[#include <math.h>]])
   else
     HAVE_DECL_EXPL=0
     HAVE_EXPL=0
-    AC_LIBOBJ([expl])
-    AC_REQUIRE([gl_FUNC_FLOORL])
-    EXPL_LIBM="$FLOORL_LIBM"
+    dnl Find libraries needed to link lib/expl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_EXP])
+      EXPL_LIBM="$EXP_LIBM"
+    else
+      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])
 ])