diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2010-09-11 17:04:05 -0700 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2010-09-11 17:08:23 -0700 |
| commit | 8e2f16e66f507ffd7a61b41e3052527b91883182 (patch) | |
| tree | bf7b02862c43e1d1a1af7cfbe30d85d4c3e57c1d | |
| parent | a7f6747019445558075fe9578a18f0eb6577bae7 (diff) | |
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
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | tests/libtest/Makefile.am | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e65935360..cbcfbd8cb 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 86f7c7bb8..225fb9d1d 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 2ba7b0a32..9c0d59507 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, |