From 125bdc0019935919cc3a66bd7b0b7da7396c283e Mon Sep 17 00:00:00 2001 From: octo Date: Tue, 21 Mar 2006 07:10:11 +0000 Subject: [PATCH] Corrected reading the libraries to link to from `curl-config'.. (Changed: src/Makefile.am, configure.in) --- configure.in | 10 ++++++++++ src/Makefile.am | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 3b179106..edfa22eb 100644 --- a/configure.in +++ b/configure.in @@ -319,6 +319,16 @@ AC_CHECK_LIB(curl, curl_easy_init, [with_libcurl="no"]) AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes") +if test "x$with_libcurl" = "xyes" +then + with_libcurl_libs=`curl-config --libs` + if test "x$with_libcurl_libs" != "x" + then + BUILD_WITH_LIBCURL_LIBS="$with_libcurl_libs"; + AC_SUBST(BUILD_WITH_LIBCURL_LIBS) + fi +fi + m4_divert_once([HELP_WITH], [ collectd additional packages:]) diff --git a/src/Makefile.am b/src/Makefile.am index c60cb36d..765cb106 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ pkglib_LTLIBRARIES += apache.la apache_la_SOURCES = apache.c apache_la_LDFLAGS = -module -avoid-version if BUILD_WITH_LIBCURL -apache_la_LDFLAGS += -lcurl +apache_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS) endif collectd_LDADD += "-dlopen" apache.la collectd_DEPENDENCIES += apache.la -- 2.11.0