* libtool.m4 (AC_CHECK_LIBM): do not set MATHLIB or AC_SUBST it,

this has a negative side-effect of causing automake to add MATHLIB
to every single Makefile.  Let's use plain AC_CHECK_LIB, so that
LIBS get set, until we find a better alternative
* *demo/Makefile.am: remove $(MATHLIB)

diff --git a/ChangeLog b/ChangeLog
index abc980fa62555785bbb88e26d2fe151dbc6e49ff..62097b6a5ad4c71a46b53fff3da7828a0794c469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-1999-02-12  Alexandre Oliva  <oliva@dcc.unicamp.br>
+1999-02-14  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libtool.m4 (AC_CHECK_LIBM): do not set MATHLIB or AC_SUBST it,
+       this has a negative side-effect of causing automake to add MATHLIB 
+       to every single Makefile.  Let's use plain AC_CHECK_LIB, so that
+       LIBS get set, until we find a better alternative
+       * *demo/Makefile.am: remove $(MATHLIB)
 
        * libltdl/configure.in: add a DESCRIPTION argument to AC_DEFINEs
        where appropriate, so as to get rid of acconfig.h

diff --git a/demo/Makefile.am b/demo/Makefile.am
index 62a99c3fa2e7775738979ffaa2e59db2d4fbefb0..cd3ea84b76f78b60e5e8b354e216e69924b3fb02 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -10,7 +10,7 @@ CLEANFILES = $(hardcode_tests)
 # Build a libtool library, libhello.la for installation in libdir.
 lib_LTLIBRARIES = libhello.la
 libhello_la_SOURCES = hello.c foo.c
-libhello_la_LDFLAGS = -version-info 3:12:1 $(MATHLIB)
+libhello_la_LDFLAGS = -version-info 3:12:1
 
 include_HEADERS = foo.h
 

diff --git a/depdemo/Makefile.am b/depdemo/Makefile.am
index 215b0afb4fa5b5a62f4bd28c685c2571e7602a35..9c59e280aade8aac09c04ad7cbee125ece5694f8 100644 (file)
--- a/depdemo/Makefile.am
+++ b/depdemo/Makefile.am
@@ -9,7 +9,7 @@ libl2_la_LIBADD = libl1.la
 libl3_la_SOURCES = l3.c l3.h sysdep.h
 libl3_la_LIBADD = libl1.la libl2.la
 libl4_la_SOURCES = l4.c l4.h sysdep.h
-libl4_la_LIBADD = libl3.la $(MATHLIB)
+libl4_la_LIBADD = libl3.la
 
 bin_PROGRAMS = depdemo depdemo.static
 

diff --git a/libtool.m4 b/libtool.m4
index b3f83861ec538cce7b6d7c0dfcca1ac7b76c5acc..85fd938896707ce50fbd4cce74678045175aa151 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -547,11 +547,9 @@ AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM,
-[
-AC_CHECK_LIB(mw, _mwvalidcheckl, MATHLIB="-lmw", MATHLIB=)
-AC_CHECK_LIB(m, cos, MATHLIB="-lm $MATHLIB", )
-AC_SUBST(MATHLIB)dnl
+AC_DEFUN(AC_CHECK_LIBM, [
+AC_CHECK_LIB(mw, _mwvalidcheckl)
+AC_CHECK_LIB(m, cos)
 ])
 
 dnl old names

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 79196ed8df5c1e997ee81064b72233125ef19dc5..d2da5618e722b0c172fefa2c14129f4890cbbdb4 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -9,10 +9,10 @@ EXTRA_DIST = acinclude.m4
 lib_LTLIBRARIES = foo1.la libfoo2.la
 
 foo1_la_SOURCES = foo1.c
-foo1_la_LDFLAGS = $(MATHLIB) -module -avoid-version
+foo1_la_LDFLAGS = -module -avoid-version
 
 libfoo2_la_SOURCES = foo2.c
-libfoo2_la_LDFLAGS = $(MATHLIB) -module
+libfoo2_la_LDFLAGS = -module
 
 noinst_HEADERS = foo.h