Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15016:0cee0fa6cf32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 11:45:16 +0200
parents 674015319e54
children 87dac772c52e
files ChangeLog m4/cosl.m4 modules/cosl
diffstat 3 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	sinl: Move AC_LIBOBJ invocations to module description.
--- 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 @@
   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])
--- a/modules/cosl
+++ b/modules/cosl
@@ -18,6 +18,11 @@
 
 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: