From: Bruno Haible Date: Sat, 21 May 2011 09:45:16 +0000 (+0200) Subject: cosl: Move AC_LIBOBJ invocations to module description. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd666d4ad2ad44f8d59f7aa122f5c6e5e90c2c14;p=pspp cosl: Move AC_LIBOBJ invocations to module description. * m4/cosl.m4 (gl_FUNC_COSL): Move AC_LIBOBJ invocations from here... * modules/cosl (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index c04f36fd1a..f8fc42c0cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-21 Bruno Haible + + cosl: Move AC_LIBOBJ invocations to module description. + * m4/cosl.m4 (gl_FUNC_COSL): Move AC_LIBOBJ invocations from here... + * modules/cosl (configure.ac): ... to here. + 2011-05-21 Bruno Haible sinl: Move AC_LIBOBJ invocations to module description. diff --git a/m4/cosl.m4 b/m4/cosl.m4 index c1af904437..3cb90029a7 100644 --- a/m4/cosl.m4 +++ b/m4/cosl.m4 @@ -1,4 +1,4 @@ -# cosl.m4 serial 3 +# cosl.m4 serial 4 dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -55,9 +55,7 @@ AC_DEFUN([gl_FUNC_COSL], else HAVE_DECL_COSL=0 HAVE_COSL=0 - AC_LIBOBJ([cosl]) - AC_LIBOBJ([sincosl]) - AC_LIBOBJ([trigl]) + dnl Find libraries needed to link lib/cosl.c, lib/sincosl.c, lib/trigl.c. AC_REQUIRE([gl_FUNC_ISNANL]) AC_REQUIRE([gl_FUNC_FLOOR]) AC_REQUIRE([gl_FUNC_FLOORL]) diff --git a/modules/cosl b/modules/cosl index 391a841837..65fcbd1399 100644 --- a/modules/cosl +++ b/modules/cosl @@ -18,6 +18,11 @@ floorl [test $HAVE_COSL = 0] configure.ac: gl_FUNC_COSL +if test $HAVE_COSL = 0; then + AC_LIBOBJ([cosl]) + AC_LIBOBJ([sincosl]) + AC_LIBOBJ([trigl]) +fi gl_MATH_MODULE_INDICATOR([cosl]) Makefile.am: