[GNUnet-SVN] r37146 - gnunet/src/curl

[gnunet]

Author: daniel
Date: 2016-05-07 18:48:27 +0200 (Sat, 07 May 2016)
New Revision: 37146

Modified:
   gnunet/src/curl/Makefile.am
Log:
curl: fix linking against libgnurl/libcurl

Modified: gnunet/src/curl/Makefile.am
===================================================================
--- gnunet/src/curl/Makefile.am 2016-05-06 20:30:18 UTC (rev 37145)
+++ gnunet/src/curl/Makefile.am 2016-05-07 16:48:27 UTC (rev 37146)
@@ -6,6 +6,16 @@
   XLIB = -lgcov
 endif
 
+if HAVE_LIBGNURL
address@hidden@
address@hidden@
+else
+if HAVE_LIBCURL
address@hidden@
address@hidden@
+endif
+endif
+
 lib_LTLIBRARIES = \
   libgnunetcurl.la
 
@@ -18,8 +28,10 @@
 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