Put the test whether the floor or ceil variant needs libm into a separate macro.

[gnulib.git] / m4 / ceil.m4

diff --git a/m4/ceil.m4 b/m4/ceil.m4
index 9e035f1..9a8eb05 100644 (file)
--- a/m4/ceil.m4
+++ b/m4/ceil.m4
@@ -1,4 +1,4 @@
-# ceil.m4 serial 1
+# ceil.m4 serial 2
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,18 +7,19 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_CEIL],
 [
   dnl Test whether ceil() can be used without libm.
-  CEIL_LIBM=?
-  AC_TRY_LINK([
-     #ifndef __NO_MATH_INLINES
-     # define __NO_MATH_INLINES 1 /* for glibc */
-     #endif
-     #include <math.h>
-     double x;],
-    [x = ceil(x);],
-    [CEIL_LIBM=])
+  gl_FUNC_CEIL_LIBS
   if test "$CEIL_LIBM" = "?"; then
-    save_LIBS="$LIBS"
-    LIBS="$LIBS -lm"
+    CEIL_LIBM=
+  fi
+  AC_SUBST([CEIL_LIBM])
+])
+
+# Determines the libraries needed to get the ceil() function.
+# Sets CEIL_LIBM.
+AC_DEFUN([gl_FUNC_CEIL_LIBS],
+[
+  AC_CACHE_VAL([gl_func_ceil_libm], [
+    gl_func_ceil_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -26,11 +27,20 @@ AC_DEFUN([gl_FUNC_CEIL],
        #include <math.h>
        double x;],
       [x = ceil(x);],
-      [CEIL_LIBM="-lm"])
-    LIBS="$save_LIBS"
-  fi
-  if test "$CEIL_LIBM" = "?"; then
-    CEIL_LIBM=
-  fi
-  AC_SUBST([CEIL_LIBM])
+      [gl_func_ceil_libm=])
+    if test "$gl_func_ceil_libm" = "?"; then
+      save_LIBS="$LIBS"
+      LIBS="$LIBS -lm"
+      AC_TRY_LINK([
+         #ifndef __NO_MATH_INLINES
+         # define __NO_MATH_INLINES 1 /* for glibc */
+         #endif
+         #include <math.h>
+         double x;],
+        [x = ceil(x);],
+        [gl_func_ceil_libm="-lm"])
+      LIBS="$save_LIBS"
+    fi
+  ])
+  CEIL_LIBM="$gl_func_ceil_libm"
 ])