Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15013:8836800a98a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
expl: Move AC_LIBOBJ invocations to module description. * m4/expl.m4 (gl_FUNC_EXPL): Move AC_LIBOBJ invocation from here... * modules/expl (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 11:36:27 +0200
parents 61a8e016e080
children ffe53e18481a
files ChangeLog m4/expl.m4 modules/expl
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	expl: Move AC_LIBOBJ invocations to module description.
+	* m4/expl.m4 (gl_FUNC_EXPL): Move AC_LIBOBJ invocation from here...
+	* modules/expl (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	roundl: Move AC_LIBOBJ invocations to module description.
--- a/m4/expl.m4
+++ b/m4/expl.m4
@@ -1,4 +1,4 @@
-# expl.m4 serial 2
+# expl.m4 serial 3
 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,7 +55,7 @@
   else
     HAVE_DECL_EXPL=0
     HAVE_EXPL=0
-    AC_LIBOBJ([expl])
+    dnl Find libraries needed to link lib/expl.c.
     AC_REQUIRE([gl_FUNC_FLOORL])
     EXPL_LIBM="$FLOORL_LIBM"
   fi
--- a/modules/expl
+++ b/modules/expl
@@ -13,6 +13,9 @@
 
 configure.ac:
 gl_FUNC_EXPL
+if test $HAVE_EXPL = 0; then
+  AC_LIBOBJ([expl])
+fi
 gl_MATH_MODULE_INDICATOR([expl])
 
 Makefile.am: