[Bug 1578] Consistently use -lm when needed

bk: 4c833b8bgj7YRgoxJxUhgt3Ve_dthg

diff --git a/ChangeLog b/ChangeLog
index 39986a95f309a12a385f186adbcc5553642dbcce..f6e6b1fd158da639ea3dbd735561acebc0dc54bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1578] Consistently use -lm when needed.
 (4.2.7p44) 2010/08/27 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1573] from 4.2.6p3-RC1: Miscalculation of offset in sntp.
 (4.2.7p43) 2010/08/26 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index 7521678619ecfc6f48bdb5877064fb3dffaee54f..c4d053246f3b78c10d46175a2c77718f69a24299 100644 (file)
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -4,8 +4,7 @@ noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
 EXTRA_PROGRAMS = propdelay chutest clktest
 
 INCLUDES = -I$(top_srcdir)/include
-# We need -lm (and perhaps $(COMPAT) for propdelay, -lntp for {chu,clk}test
-propdelay_LDADD = -lm ../libntp/libntp.a
+propdelay_LDADD = $(LIBM) ../libntp/libntp.a
 chutest_LDADD = ../libntp/libntp.a
 clktest_LDADD = ../libntp/libntp.a
 ETAGS_ARGS = Makefile.am

diff --git a/configure.ac b/configure.ac
index 313e4bb3c341e6bfe0563e2f015ddd8fa9162dea..707fdd0af80c17ad047fa5ee13e4105e10c823b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -382,6 +382,7 @@ AC_SEARCH_LIBS([MD5Init], [md5 md])
 AC_CHECK_FUNCS([MD5Init])
 
 NTP_LINEEDITLIBS
+NTP_LIB_M
 
 dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt
 dnl Solaris 2.6 only has -lposix4; in Solaris 7, this is a symlink to -lrt,

diff --git a/m4/ntp_lib_m.m4 b/m4/ntp_lib_m.m4
new file mode 100644 (file)
index 0000000..799c699
--- /dev/null
+++ b/m4/ntp_lib_m.m4
@@ -0,0 +1,14 @@
+dnl ######################################################################
+dnl What do we need for math libraries?
+AC_DEFUN([NTP_LIB_M], [
+LIBM=
+case "$host" in
+ *-*-darwin*)
+    ;;
+ *)
+    AC_CHECK_LIB(m, cos, LIBM="-lm")
+    ;;
+esac
+AC_SUBST([LIBM])
+])
+dnl ======================================================================

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 1415d045aac6143ca34cac66c836509d6836d1be..8e6246ee9764e1285143deab31b7c31842d710cd 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -83,13 +83,8 @@ man_MANS=    $(srcdir)/ntpd.1
 # simulator currently uses ntpd-opts.[ch].  This also means there is no
 # longer a reason to have ntpdbase-opts.def split off of ntpd-opts.def.
 
-# ntpd may need:
-# log10                               refclock_wwv.o
-# sqrt                                ntp_control.o
-# floor                               refclock_wwv.o
-# which are (usually) provided by -lm.
-ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
-ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a $(LIBM) @LCRYPTO@ @LSCF@
+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntpsim.a @LCRYPTO@ @LSCF@
 ntpdsim_CFLAGS = $(CFLAGS) -DSIM
 check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
 keyword_gen_LDADD = ../libntp/libntp.a # we don't want $(LDADD) here

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index ea760af9bb77bc9224ae5b4cdf202ce41640b4c0..06987e4663acfc3af1e3bbd33c73abb183936f79 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
 
 # LDADD might need RESLIB and ADJLIB
 LDADD=         version.o ../libntp/libntp.a
-ntpdate_LDADD= $(LDADD) @LCRYPTO@
+ntpdate_LDADD= $(LDADD) $(LIBM) @LCRYPTO@
 DISTCLEANFILES=        .version version.c stamp-v
 noinst_HEADERS=        ntpdate.h
 ETAGS_ARGS=    Makefile.am

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 5d259b9a83335e8be66cf749881bb5be0b02b6ff..8393245e9743d280d7443aea8e726e01073189e9 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD=    version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
+ntpq_LDADD=    version.o $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a \
                @EDITLINE_LIBS@ @LCRYPTO@
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 58547af8d4b9a18311f39aa75395b7929b902e94..bb0952f9b82a2b7e03d7ef5507098b789cbe48ee 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS= $(LIBOPTS_CFLAGS) -I$(top_srcdir)/../include \
        -I$(top_srcdir)/../lib/isc/nothreads/include \
        -I$(top_srcdir)/../lib/isc/unix/include
 
-LDADD= $(LIBOPTS_LDADD) -lm ../libntp/libntp.a @LCRYPTO@
+LDADD= $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a @LCRYPTO@
 
 run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
                autogen -L ../include --writable

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 0eee100dbef9a8e068d49b6bb0ab4342735fe7e4..05d50798d6f36f430df5bce60bc2d13f9f963137 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -134,7 +134,7 @@ AC_PROG_LIBTOOL
 NTP_DIR_SEP
 
 # Checks for libraries.
-
+NTP_LIB_M
 AC_CHECK_FUNC([gethostent], ,
        [AC_SEARCH_LIBS([gethostent], [nsl], , , [$libxnet -lsocket])])
 AC_CHECK_FUNC([openlog], , 

diff --git a/util/Makefile.am b/util/Makefile.am
index 54d95e861559967d1d9c60a64ccf48cf09e79a2d..9f0cedc474c4025087375112440322374783b1c6 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -19,7 +19,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
 
 # LDADD might need RESLIB and ADJLIB
 LDADD=         ../libntp/libntp.a
-tg2_LDADD=     -lm
+tg2_LDADD=     $(LIBM)
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
 ntp_keygen_LDADD=      $(LIBOPTS_LDADD) ../libntp/libntp.a @LCRYPTO@