summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-21 11:36:27 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:20 +0200
commit22abbd284a52864610fca7e42d17f08845a8e26e (patch)
treed24f50cab9bafa958e97c5b284bef055e5810a14
parentd40924760c0af7c2b69e315154ff54a95a6338bf (diff)
downloadgnulib-22abbd284a52864610fca7e42d17f08845a8e26e.tar.gz
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.
-rw-r--r--ChangeLog6
-rw-r--r--m4/expl.m44
-rw-r--r--modules/expl3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d245aa920..c622420a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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.
* m4/roundl.m4 (gl_FUNC_ROUNDL): Move AC_LIBOBJ invocation from here...
* modules/roundl (configure.ac): ... to here.
diff --git a/m4/expl.m4 b/m4/expl.m4
index 01db76c761..8f1a9a9780 100644
--- 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 @@ AC_DEFUN([gl_FUNC_EXPL],
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
diff --git a/modules/expl b/modules/expl
index a0ccf88448..ed377c305e 100644
--- a/modules/expl
+++ b/modules/expl
@@ -13,6 +13,9 @@ floorl [test $HAVE_EXPL = 0]
configure.ac:
gl_FUNC_EXPL
+if test $HAVE_EXPL = 0; then
+ AC_LIBOBJ([expl])
+fi
gl_MATH_MODULE_INDICATOR([expl])
Makefile.am: