* 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)
This commit is contained in:
Alexandre Oliva 1999-02-14 03:04:51 +00:00 committed by Alexandre Oliva
parent e578da5e16
commit 2e6d9dc7a7
5 changed files with 14 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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

8
libtool.m4 vendored
View File

@ -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

View File

@ -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