Only use libm if it's there and needed

diff --git a/cli/Makefile.am b/cli/Makefile.am
index fb6f2f9b64c1fc78ad0b3fcd902bc8f17337e402..eb49b74885b494bf713849344410b14169216fa3 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -26,6 +26,5 @@ transmissioncli_LDADD = \
     $(LIBCURL_LIBS) \
     $(ZLIB_LIBS) \
     $(OPENSSL_LIBS) \
-    $(PTHREAD_LIBS) \
-    -lm
+    $(PTHREAD_LIBS)
 

diff --git a/configure.ac b/configure.ac
index 014cc409e4ebcdcc59b929f2ba563daa1991aee0..fcf9cb0eead9d3505aa2946ebaad555298546dd7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,7 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 ACX_PTHREAD
 
+AC_SEARCH_LIBS(cos, [m])
 AC_SEARCH_LIBS([socket], [socket net])
 AC_SEARCH_LIBS([gethostbyname], [nsl bind])
 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 8c19a07caeed3f4a5a77a46398efa90b74005712..3ec3862e2dee09935387788f73cd22c7fae082f6 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -28,7 +28,7 @@ LDADD = \
     $(LIBCURL_LIBS) \
     $(ZLIB_LIBS) \
     $(OPENSSL_LIBS) \
-    $(PTHREAD_LIBS) -lm
+    $(PTHREAD_LIBS)
 
 noinst_HEADERS = \
     watch.h

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f10013cc91d5cb340e15272cf0609bfe12b98a5a..1d5ddf753c110ce8a1e1d19a80e9656c61f52f69 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -110,7 +110,7 @@ transmission_LDADD = \
     $(OPENSSL_LIBS) \
     $(LIBCURL_LIBS) \
     $(ZLIB_LIBS) \
-    $(PTHREAD_LIBS) -lm
+    $(PTHREAD_LIBS)
 
 DESKTOP_IN_FILES=transmission.desktop.in
 DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)

diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index 84ef7d32dcc1b19162d17920c476b139fbba2a8f..d896da0986ffeb014202a7d22c45b22be4266160 100644 (file)
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -133,8 +133,7 @@ apps_ldadd = \
     $(LIBCURL_LIBS) \
     $(OPENSSL_LIBS) \
     $(PTHREAD_LIBS) \
-    $(ZLIB_LIBS) \
-    -lm
+    $(ZLIB_LIBS)
 
 bencode_test_SOURCES = bencode-test.c
 bencode_test_LDADD = ${apps_ldadd}