diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-09-04 12:49:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-09-04 12:49:32 +0000 |
commit | 83995cf89e0515b46d65badd09b641c988a5ea9d (patch) | |
tree | 40933754d17c45b1d6592a8842a647a46b57b834 /src/hostlist | |
parent | 3e36950d8d3f6319544b9d627156c70eaaf9bdaf (diff) | |
download | gnunet-83995cf89e0515b46d65badd09b641c988a5ea9d.tar.gz gnunet-83995cf89e0515b46d65badd09b641c988a5ea9d.zip |
address Debian #758937: allow use of curl if it is really the gnutls version and libgnurl is unavailable
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/Makefile.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index d777cd658..5d5a94b5d 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -20,6 +20,15 @@ endif | |||
20 | if HAVE_LIBGNURL | 20 | if HAVE_LIBGNURL |
21 | libexec_PROGRAMS = \ | 21 | libexec_PROGRAMS = \ |
22 | gnunet-daemon-hostlist | 22 | gnunet-daemon-hostlist |
23 | LIB_GNURL=@LIBGNURL@ | ||
24 | CPP_GNURL=@LIBGNURL_CPPFLAGS@ | ||
25 | else | ||
26 | if HAVE_LIBCURL | ||
27 | libexec_PROGRAMS = \ | ||
28 | gnunet-daemon-hostlist | ||
29 | LIB_GNURL=@LIBCURL@ | ||
30 | CPP_GNURL=@LIBCURL_CPPFLAGS@ | ||
31 | endif | ||
23 | endif | 32 | endif |
24 | 33 | ||
25 | gnunet_daemon_hostlist_SOURCES = \ | 34 | gnunet_daemon_hostlist_SOURCES = \ |
@@ -35,11 +44,12 @@ gnunet_daemon_hostlist_LDADD = \ | |||
35 | $(top_builddir)/src/transport/libgnunettransport.la \ | 44 | $(top_builddir)/src/transport/libgnunettransport.la \ |
36 | $(top_builddir)/src/util/libgnunetutil.la \ | 45 | $(top_builddir)/src/util/libgnunetutil.la \ |
37 | $(GN_LIBMHD) \ | 46 | $(GN_LIBMHD) \ |
38 | @LIBGNURL@ \ | 47 | $(LIB_GNURL) \ |
39 | $(GN_LIBINTL) | 48 | $(GN_LIBINTL) |
40 | 49 | ||
41 | gnunet_daemon_hostlist_CPPFLAGS = \ | 50 | gnunet_daemon_hostlist_CPPFLAGS = \ |
42 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) | 51 | $(CPP_GNURL) \ |
52 | $(AM_CPPFLAGS) | ||
43 | 53 | ||
44 | if HAVE_LIBGNURL | 54 | if HAVE_LIBGNURL |
45 | check_PROGRAMS = \ | 55 | check_PROGRAMS = \ |