From 932908a83c7be5d6928e4dab794ecb8dff2cbe90 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 7 May 2016 16:48:27 +0000 Subject: [PATCH] curl: fix linking against libgnurl/libcurl --- src/curl/Makefile.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/curl/Makefile.am b/src/curl/Makefile.am index c716abe52..af8b64078 100644 --- a/src/curl/Makefile.am +++ b/src/curl/Makefile.am @@ -6,6 +6,16 @@ if USE_COVERAGE XLIB = -lgcov endif +if HAVE_LIBGNURL +LIB_GNURL=@LIBGNURL@ +CPP_GNURL=@LIBGNURL_CPPFLAGS@ +else +if HAVE_LIBCURL +LIB_GNURL=@LIBCURL@ +CPP_GNURL=@LIBCURL_CPPFLAGS@ +endif +endif + lib_LTLIBRARIES = \ libgnunetcurl.la @@ -18,8 +28,10 @@ libgnunetcurl_la_SOURCES = \ libgnunetcurl_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ -ljansson \ - -lcurl \ + $(LIB_GNURL) \ $(XLIB) +libgnunetcurl_la_CPPFLAGS = \ + $(CPP_GNURL) $(AM_CPPFLAGS) #check_PROGRAMS = \ # test_curl -- 2.25.1