Re: new common math function modules

[Bruno Haible]

Paolo Bonzini wrote:
> > I'll think I'll merge the test for EXP_LIBM, LOG_LIBM etc. into a single
> > one - to save configure script execution time, as you say -.
> 
> That's fair enough, thanks.

Implemented as follows:


2010-01-31  Bruno Haible  <address@hidden>

        Perform the same test for many <math.h> functions.
        * m4/mathfunc.m4 (gl_COMMON_DOUBLE_MATHFUNC,
        gl_COMMON_DOUBLE_MATHFUNC_TEST): New macros.
        * m4/sqrt.m4 (gl_FUNC_SQRT): Invoke gl_COMMON_DOUBLE_MATHFUNC instead
        of gl_MATHFUNC.
        * modules/acos (configure.ac): Likewise.
        * modules/asin (configure.ac): Likewise.
        * modules/atan (configure.ac): Likewise.
        * modules/atan2 (configure.ac): Likewise.
        * modules/cbrt (configure.ac): Likewise.
        * modules/copysign (configure.ac): Likewise.
        * modules/cos (configure.ac): Likewise.
        * modules/cosh (configure.ac): Likewise.
        * modules/erf (configure.ac): Likewise.
        * modules/erfc (configure.ac): Likewise.
        * modules/exp (configure.ac): Likewise.
        * modules/fmod (configure.ac): Likewise.
        * modules/hypot (configure.ac): Likewise.
        * modules/j0 (configure.ac): Likewise.
        * modules/j1 (configure.ac): Likewise.
        * modules/jn (configure.ac): Likewise.
        * modules/lgamma (configure.ac): Likewise.
        * modules/log (configure.ac): Likewise.
        * modules/log10 (configure.ac): Likewise.
        * modules/log1p (configure.ac): Likewise.
        * modules/pow (configure.ac): Likewise.
        * modules/remainder (configure.ac): Likewise.
        * modules/sin (configure.ac): Likewise.
        * modules/sinh (configure.ac): Likewise.
        * modules/tan (configure.ac): Likewise.
        * modules/tanh (configure.ac): Likewise.
        * modules/y0 (configure.ac): Likewise.
        * modules/y1 (configure.ac): Likewise.
        * modules/yn (configure.ac): Likewise.
        Suggested by Paolo Bonzini.

--- m4/mathfunc.m4.orig Sun Jan 31 19:32:47 2010
+++ m4/mathfunc.m4      Sun Jan 31 19:28:12 2010
@@ -1,4 +1,4 @@
-# mathfunc.m4 serial 2
+# mathfunc.m4 serial 3
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -58,3 +58,58 @@
   m4_popdef([FUNC])
   m4_popdef([func])
 ])
+
+# gl_COMMON_DOUBLE_MATHFUNC(FUNC)
+# -------------------------------
+# tests whether the function FUNC is available in libc or libm.
+# It sets FUNC_LIBM to empty or "-lm" accordingly.
+# FUNC must be one of the following functions, that are present on all systems
+# and provided by libm on all systems except MacOS X, BeOS, Haiku:
+#   acos asin atan atan2 cbrt copysign cos cosh erf erfc exp fmod hypot j0 j1
+#   jn lgamma log log10 log1p pow remainder sin sinh sqrt tan tanh y0 y1 yn
+
+AC_DEFUN([gl_COMMON_DOUBLE_MATHFUNC],
+[
+  AC_REQUIRE([gl_COMMON_DOUBLE_MATHFUNC_TEST])
+  m4_pushdef([FUNC], [translit([$1],[abcdefghijklmnopqrstuvwxyz],
+                                    [ABCDEFGHIJKLMNOPQRSTUVWXYZ])])
+  FUNC[]_LIBM="$POW_LIBM"
+  AC_SUBST(FUNC[_LIBM])
+  m4_popdef([FUNC])
+])
+
+AC_DEFUN([gl_COMMON_DOUBLE_MATHFUNC_TEST],
+[
+  dnl We could use any of the following:
+  dnl gl_MATHFUNC([acos], [double], [(double)])
+  dnl gl_MATHFUNC([asin], [double], [(double)])
+  dnl gl_MATHFUNC([atan], [double], [(double)])
+  dnl gl_MATHFUNC([atan2], [double], [(double, double)])
+  dnl gl_MATHFUNC([cbrt], [double], [(double)])
+  dnl gl_MATHFUNC([copysign], [double], [(double, double)])
+  dnl gl_MATHFUNC([cos], [double], [(double)])
+  dnl gl_MATHFUNC([cosh], [double], [(double)])
+  dnl gl_MATHFUNC([erf], [double], [(double)])
+  dnl gl_MATHFUNC([erfc], [double], [(double)])
+  dnl gl_MATHFUNC([exp], [double], [(double)])
+  dnl gl_MATHFUNC([fmod], [double], [(double, double)])
+  dnl gl_MATHFUNC([hypot], [double], [(double, double)])
+  dnl gl_MATHFUNC([j0], [double], [(double)])
+  dnl gl_MATHFUNC([j1], [double], [(double)])
+  dnl gl_MATHFUNC([jn], [double], [(int, double)])
+  dnl gl_MATHFUNC([lgamma], [double], [(double)])
+  dnl gl_MATHFUNC([log], [double], [(double)])
+  dnl gl_MATHFUNC([log10], [double], [(double)])
+  dnl gl_MATHFUNC([log1p], [double], [(double)])
+  dnl gl_MATHFUNC([pow], [double], [(double, double)])
+  dnl gl_MATHFUNC([remainder], [double], [(double, double)])
+  dnl gl_MATHFUNC([sin], [double], [(double)])
+  dnl gl_MATHFUNC([sinh], [double], [(double)])
+  dnl gl_MATHFUNC([sqrt], [double], [(double)])
+  dnl gl_MATHFUNC([tan], [double], [(double)])
+  dnl gl_MATHFUNC([tanh], [double], [(double)])
+  dnl gl_MATHFUNC([y0], [double], [(double)])
+  dnl gl_MATHFUNC([y1], [double], [(double)])
+  dnl gl_MATHFUNC([yn], [double], [(int, double)])
+  gl_MATHFUNC([pow], [double], [(double, double)])
+])
--- m4/sqrt.m4.orig     Sun Jan 31 19:32:47 2010
+++ m4/sqrt.m4  Sun Jan 31 19:30:39 2010
@@ -1,4 +1,4 @@
-# sqrt.m4 serial 2
+# sqrt.m4 serial 3
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,5 +6,5 @@
 
 AC_DEFUN([gl_FUNC_SQRT],
 [
-  gl_MATHFUNC([sqrt], [double], [(double)])
+  gl_COMMON_DOUBLE_MATHFUNC([sqrt])
 ])
--- modules/acos.orig   Sun Jan 31 19:32:47 2010
+++ modules/acos        Sun Jan 31 19:30:42 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([acos], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([acos])
 
 Makefile.am:
 
--- modules/asin.orig   Sun Jan 31 19:32:47 2010
+++ modules/asin        Sun Jan 31 19:30:43 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([asin], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([asin])
 
 Makefile.am:
 
--- modules/atan.orig   Sun Jan 31 19:32:47 2010
+++ modules/atan        Sun Jan 31 19:30:43 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([atan], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([atan])
 
 Makefile.am:
 
--- modules/atan2.orig  Sun Jan 31 19:32:47 2010
+++ modules/atan2       Sun Jan 31 19:30:43 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([atan2], [double], [(double, double)])
+gl_COMMON_DOUBLE_MATHFUNC([atan2])
 
 Makefile.am:
 
--- modules/cbrt.orig   Sun Jan 31 19:32:47 2010
+++ modules/cbrt        Sun Jan 31 19:30:43 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([cbrt], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([cbrt])
 
 Makefile.am:
 
--- modules/copysign.orig       Sun Jan 31 19:32:47 2010
+++ modules/copysign    Sun Jan 31 19:30:43 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([copysign], [double], [(double, double)])
+gl_COMMON_DOUBLE_MATHFUNC([copysign])
 
 Makefile.am:
 
--- modules/cos.orig    Sun Jan 31 19:32:47 2010
+++ modules/cos Sun Jan 31 19:30:43 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([cos], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([cos])
 
 Makefile.am:
 
--- modules/cosh.orig   Sun Jan 31 19:32:47 2010
+++ modules/cosh        Sun Jan 31 19:30:44 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([cosh], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([cosh])
 
 Makefile.am:
 
--- modules/erf.orig    Sun Jan 31 19:32:47 2010
+++ modules/erf Sun Jan 31 19:30:44 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([erf], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([erf])
 
 Makefile.am:
 
--- modules/erfc.orig   Sun Jan 31 19:32:47 2010
+++ modules/erfc        Sun Jan 31 19:30:44 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([erfc], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([erfc])
 
 Makefile.am:
 
--- modules/exp.orig    Sun Jan 31 19:32:47 2010
+++ modules/exp Sun Jan 31 19:30:44 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([exp], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([exp])
 
 Makefile.am:
 
--- modules/fmod.orig   Sun Jan 31 19:32:47 2010
+++ modules/fmod        Sun Jan 31 19:30:44 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([fmod], [double], [(double, double)])
+gl_COMMON_DOUBLE_MATHFUNC([fmod])
 
 Makefile.am:
 
--- modules/hypot.orig  Sun Jan 31 19:32:47 2010
+++ modules/hypot       Sun Jan 31 19:30:44 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([hypot], [double], [(double, double)])
+gl_COMMON_DOUBLE_MATHFUNC([hypot])
 
 Makefile.am:
 
--- modules/j0.orig     Sun Jan 31 19:32:47 2010
+++ modules/j0  Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([j0], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([j0])
 
 Makefile.am:
 
--- modules/j1.orig     Sun Jan 31 19:32:47 2010
+++ modules/j1  Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([j1], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([j1])
 
 Makefile.am:
 
--- modules/jn.orig     Sun Jan 31 19:32:47 2010
+++ modules/jn  Sun Jan 31 19:30:47 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([jn], [double], [(int, double)])
+gl_COMMON_DOUBLE_MATHFUNC([jn])
 
 Makefile.am:
 
--- modules/lgamma.orig Sun Jan 31 19:32:47 2010
+++ modules/lgamma      Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([lgamma], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([lgamma])
 
 Makefile.am:
 
--- modules/log.orig    Sun Jan 31 19:32:47 2010
+++ modules/log Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([log], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([log])
 
 Makefile.am:
 
--- modules/log10.orig  Sun Jan 31 19:32:47 2010
+++ modules/log10       Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([log10], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([log10])
 
 Makefile.am:
 
--- modules/log1p.orig  Sun Jan 31 19:32:47 2010
+++ modules/log1p       Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([log1p], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([log1p])
 
 Makefile.am:
 
--- modules/pow.orig    Sun Jan 31 19:32:48 2010
+++ modules/pow Sun Jan 31 19:30:45 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([pow], [double], [(double, double)])
+gl_COMMON_DOUBLE_MATHFUNC([pow])
 
 Makefile.am:
 
--- modules/remainder.orig      Sun Jan 31 19:32:48 2010
+++ modules/remainder   Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([remainder], [double], [(double, double)])
+gl_COMMON_DOUBLE_MATHFUNC([remainder])
 
 Makefile.am:
 
--- modules/sin.orig    Sun Jan 31 19:32:48 2010
+++ modules/sin Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([sin], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([sin])
 
 Makefile.am:
 
--- modules/sinh.orig   Sun Jan 31 19:32:48 2010
+++ modules/sinh        Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([sinh], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([sinh])
 
 Makefile.am:
 
--- modules/tan.orig    Sun Jan 31 19:32:48 2010
+++ modules/tan Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([tan], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([tan])
 
 Makefile.am:
 
--- modules/tanh.orig   Sun Jan 31 19:32:48 2010
+++ modules/tanh        Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([tanh], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([tanh])
 
 Makefile.am:
 
--- modules/y0.orig     Sun Jan 31 19:32:48 2010
+++ modules/y0  Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([y0], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([y0])
 
 Makefile.am:
 
--- modules/y1.orig     Sun Jan 31 19:32:48 2010
+++ modules/y1  Sun Jan 31 19:30:46 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([y1], [double], [(double)])
+gl_COMMON_DOUBLE_MATHFUNC([y1])
 
 Makefile.am:
 
--- modules/yn.orig     Sun Jan 31 19:32:48 2010
+++ modules/yn  Sun Jan 31 19:30:47 2010
@@ -7,7 +7,7 @@
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([yn], [double], [(int, double)])
+gl_COMMON_DOUBLE_MATHFUNC([yn])
 
 Makefile.am: