Rename the cache variable to contain the special marker '_cv_'.

diff --git a/ChangeLog b/ChangeLog
index 8ea2319..38ec2f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2007-10-29  Bruno Haible  <bruno@clisp.org>
 
+       * m4/floorf.m4 (gl_FUNC_FLOORF_LIBS): Rename the cache variable to
+       contain the special marker '_cv_'.
+       * m4/floor.m4 (gl_FUNC_FLOOR_LIBS): Likewise.
+       * m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): Likewise.
+       * m4/ceilf.m4 (gl_FUNC_CEILF_LIBS): Likewise.
+       * m4/ceil.m4 (gl_FUNC_CEIL_LIBS): Likewise.
+       * m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Likewise.
+       Reported by Ralf Wildenhues.
+
+2007-10-29  Bruno Haible  <bruno@clisp.org>
+
        * gnulib-tool (func_import): When --lgpl is not specified, set
        sed_transform_lib_file to convert LGPL and GPLv2+ copyright headers to
        GPLv3.

diff --git a/m4/ceil.m4 b/m4/ceil.m4
index 9a8eb05..d89dd32 100644 (file)
--- a/m4/ceil.m4
+++ b/m4/ceil.m4
@@ -18,8 +18,8 @@ AC_DEFUN([gl_FUNC_CEIL],
 # Sets CEIL_LIBM.
 AC_DEFUN([gl_FUNC_CEIL_LIBS],
 [
-  AC_CACHE_VAL([gl_func_ceil_libm], [
-    gl_func_ceil_libm=?
+  AC_CACHE_VAL([gl_cv_func_ceil_libm], [
+    gl_cv_func_ceil_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -27,8 +27,8 @@ AC_DEFUN([gl_FUNC_CEIL_LIBS],
        #include <math.h>
        double x;],
       [x = ceil(x);],
-      [gl_func_ceil_libm=])
-    if test "$gl_func_ceil_libm" = "?"; then
+      [gl_cv_func_ceil_libm=])
+    if test "$gl_cv_func_ceil_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -38,9 +38,9 @@ AC_DEFUN([gl_FUNC_CEIL_LIBS],
          #include <math.h>
          double x;],
         [x = ceil(x);],
-        [gl_func_ceil_libm="-lm"])
+        [gl_cv_func_ceil_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  CEIL_LIBM="$gl_func_ceil_libm"
+  CEIL_LIBM="$gl_cv_func_ceil_libm"
 ])

diff --git a/m4/ceilf.m4 b/m4/ceilf.m4
index 9e261e5..0eab474 100644 (file)
--- a/m4/ceilf.m4
+++ b/m4/ceilf.m4
@@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_CEILF],
 # Sets CEILF_LIBM.
 AC_DEFUN([gl_FUNC_CEILF_LIBS],
 [
-  AC_CACHE_VAL([gl_func_ceilf_libm], [
-    gl_func_ceilf_libm=?
+  AC_CACHE_VAL([gl_cv_func_ceilf_libm], [
+    gl_cv_func_ceilf_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -43,8 +43,8 @@ AC_DEFUN([gl_FUNC_CEILF_LIBS],
        #include <math.h>
        float x;],
       [x = ceilf(x);],
-      [gl_func_ceilf_libm=])
-    if test "$gl_func_ceilf_libm" = "?"; then
+      [gl_cv_func_ceilf_libm=])
+    if test "$gl_cv_func_ceilf_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -54,9 +54,9 @@ AC_DEFUN([gl_FUNC_CEILF_LIBS],
          #include <math.h>
          float x;],
         [x = ceilf(x);],
-        [gl_func_ceilf_libm="-lm"])
+        [gl_cv_func_ceilf_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  CEILF_LIBM="$gl_func_ceilf_libm"
+  CEILF_LIBM="$gl_cv_func_ceilf_libm"
 ])

diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 4bf9caa..676c64b 100644 (file)
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_CEILL],
 # Sets CEILL_LIBM.
 AC_DEFUN([gl_FUNC_CEILL_LIBS],
 [
-  AC_CACHE_VAL([gl_func_ceill_libm], [
-    gl_func_ceill_libm=?
+  AC_CACHE_VAL([gl_cv_func_ceill_libm], [
+    gl_cv_func_ceill_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -43,8 +43,8 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS],
        #include <math.h>
        long double x;],
       [x = ceill(x);],
-      [gl_func_ceill_libm=])
-    if test "$gl_func_ceill_libm" = "?"; then
+      [gl_cv_func_ceill_libm=])
+    if test "$gl_cv_func_ceill_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -54,9 +54,9 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS],
          #include <math.h>
          long double x;],
         [x = ceill(x);],
-        [gl_func_ceill_libm="-lm"])
+        [gl_cv_func_ceill_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  CEILL_LIBM="$gl_func_ceill_libm"
+  CEILL_LIBM="$gl_cv_func_ceill_libm"
 ])

diff --git a/m4/floor.m4 b/m4/floor.m4
index 780a88f..b950e69 100644 (file)
--- a/m4/floor.m4
+++ b/m4/floor.m4
@@ -18,8 +18,8 @@ AC_DEFUN([gl_FUNC_FLOOR],
 # Sets FLOOR_LIBM.
 AC_DEFUN([gl_FUNC_FLOOR_LIBS],
 [
-  AC_CACHE_VAL([gl_func_floor_libm], [
-    gl_func_floor_libm=?
+  AC_CACHE_VAL([gl_cv_func_floor_libm], [
+    gl_cv_func_floor_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -27,8 +27,8 @@ AC_DEFUN([gl_FUNC_FLOOR_LIBS],
        #include <math.h>
        double x;],
       [x = floor(x);],
-      [gl_func_floor_libm=])
-    if test "$gl_func_floor_libm" = "?"; then
+      [gl_cv_func_floor_libm=])
+    if test "$gl_cv_func_floor_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -38,9 +38,9 @@ AC_DEFUN([gl_FUNC_FLOOR_LIBS],
          #include <math.h>
          double x;],
         [x = floor(x);],
-        [gl_func_floor_libm="-lm"])
+        [gl_cv_func_floor_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  FLOOR_LIBM="$gl_func_floor_libm"
+  FLOOR_LIBM="$gl_cv_func_floor_libm"
 ])

diff --git a/m4/floorf.m4 b/m4/floorf.m4
index 91b6900..8cdaa94 100644 (file)
--- a/m4/floorf.m4
+++ b/m4/floorf.m4
@@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_FLOORF],
 # Sets FLOORF_LIBM.
 AC_DEFUN([gl_FUNC_FLOORF_LIBS],
 [
-  AC_CACHE_VAL([gl_func_floorf_libm], [
-    gl_func_floorf_libm=?
+  AC_CACHE_VAL([gl_cv_func_floorf_libm], [
+    gl_cv_func_floorf_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -43,8 +43,8 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS],
        #include <math.h>
        float x;],
       [x = floorf(x);],
-      [gl_func_floorf_libm=])
-    if test "$gl_func_floorf_libm" = "?"; then
+      [gl_cv_func_floorf_libm=])
+    if test "$gl_cv_func_floorf_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -54,9 +54,9 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS],
          #include <math.h>
          float x;],
         [x = floorf(x);],
-        [gl_func_floorf_libm="-lm"])
+        [gl_cv_func_floorf_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  FLOORF_LIBM="$gl_func_floorf_libm"
+  FLOORF_LIBM="$gl_cv_func_floorf_libm"
 ])

diff --git a/m4/floorl.m4 b/m4/floorl.m4
index 3d580c5..6207811 100644 (file)
--- a/m4/floorl.m4
+++ b/m4/floorl.m4
@@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_FLOORL],
 # Sets FLOORL_LIBM.
 AC_DEFUN([gl_FUNC_FLOORL_LIBS],
 [
-  AC_CACHE_VAL([gl_func_floorl_libm], [
-    gl_func_floorl_libm=?
+  AC_CACHE_VAL([gl_cv_func_floorl_libm], [
+    gl_cv_func_floorl_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -43,8 +43,8 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS],
        #include <math.h>
        long double x;],
       [x = floorl(x);],
-      [gl_func_floorl_libm=])
-    if test "$gl_func_floorl_libm" = "?"; then
+      [gl_cv_func_floorl_libm=])
+    if test "$gl_cv_func_floorl_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -54,9 +54,9 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS],
          #include <math.h>
          long double x;],
         [x = floorl(x);],
-        [gl_func_floorl_libm="-lm"])
+        [gl_cv_func_floorl_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  FLOORL_LIBM="$gl_func_floorl_libm"
+  FLOORL_LIBM="$gl_cv_func_floorl_libm"
 ])