From: Dan Fandrich <dan@coneharvesters.com>
Date: Sun, 12 Sep 2010 00:04:05 +0000 (-0700)
Subject: Link curl and the test apps with -lrt explicitly when necessary
X-Git-Tag: curl-7_21_2~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2f16e66f507ffd7a61b41e3052527b91883182;p=thirdparty%2Fcurl.git

Link curl and the test apps with -lrt explicitly when necessary

When curl calls a function from that library then it needs to
explicitly link to the library instead of piggybacking on
libcurl's own dependency.  Without this, GNU ld with the
--no-add-needed flag fails when linking (which Fedora now does
by default).

Reported by: Quanah Gibson-Mount
Bug: http://curl.haxx.se/mail/lib-2010-09/0085.html
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e659353602..cbcfbd8cb1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -25,6 +25,7 @@ This release includes the following bugfixes:
  o Curl_is_connected: use correct errno
  o Added SSPI build to Watcom makefile
  o progress: callback for POSTs less than MAX_INITIAL_POST_SIZE
+ o linking problem on Fedora 13
 
 This release includes the following known bugs:
 
@@ -34,6 +35,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Kamil Dudka, Ben Greear, Cameron Kaiser, Dan Fandrich, Dirk Manske,
- Guenter Knauf, Julien Chaffraix, Kamil Dudka
+ Guenter Knauf, Julien Chaffraix, Kamil Dudka, Quanah Gibson-Mount
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/acinclude.m4 b/acinclude.m4
index 86f7c7bb83..225fb9d1d0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2145,6 +2145,7 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
         else
           LIBS="$curl_cv_gclk_LIBS $curl_cv_save_LIBS"
         fi
+        CURL_LIBS="$CURL_LIBS $curl_cv_gclk_LIBS"
         AC_MSG_RESULT([$curl_cv_gclk_LIBS])
         ac_cv_func_clock_gettime="yes"
         ;;
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 2ba7b0a32f..9c0d595076 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -54,7 +54,7 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
 test1022.pl Makefile.inc
 
 # Dependencies (may need to be overriden)
-LDADD = $(top_builddir)/lib/libcurl.la
+LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
 DEPENDENCIES = $(top_builddir)/lib/libcurl.la
 
 # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,