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/pt | |
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/pt')
-rw-r--r-- | src/pt/Makefile.am | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 650fabf09..9783ffc07 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -34,7 +34,29 @@ gnunet_daemon_pt_LDADD = \ | |||
34 | 34 | ||
35 | if HAVE_TESTING | 35 | if HAVE_TESTING |
36 | if HAVE_MHD | 36 | if HAVE_MHD |
37 | |||
37 | if HAVE_LIBGNURL | 38 | if HAVE_LIBGNURL |
39 | LIB_GNURL=@LIBGNURL@ | ||
40 | CPP_GNURL=@LIBGNURL_CPPFLAGS@ | ||
41 | if LINUX | ||
42 | VPN_TEST = \ | ||
43 | test_gnunet_vpn-4_to_6 \ | ||
44 | test_gnunet_vpn-6_to_4 \ | ||
45 | test_gnunet_vpn-6_over \ | ||
46 | test_gnunet_vpn-4_over \ | ||
47 | test_gns_vpn | ||
48 | endif | ||
49 | if MINGW | ||
50 | VPN_TEST = \ | ||
51 | test_gnunet_vpn-4_to_6 \ | ||
52 | test_gnunet_vpn-6_to_4 \ | ||
53 | test_gnunet_vpn-6_over \ | ||
54 | test_gnunet_vpn-4_over | ||
55 | endif | ||
56 | else | ||
57 | if HAVE_LIBCURL | ||
58 | LIB_GNURL=@LIBCURL@ | ||
59 | CPP_GNURL=@LIBCURL_CPPFLAGS@ | ||
38 | if LINUX | 60 | if LINUX |
39 | VPN_TEST = \ | 61 | VPN_TEST = \ |
40 | test_gnunet_vpn-4_to_6 \ | 62 | test_gnunet_vpn-4_to_6 \ |
@@ -52,6 +74,8 @@ if MINGW | |||
52 | endif | 74 | endif |
53 | endif | 75 | endif |
54 | endif | 76 | endif |
77 | |||
78 | endif | ||
55 | endif | 79 | endif |
56 | 80 | ||
57 | check_PROGRAMS = $(VPN_TEST) | 81 | check_PROGRAMS = $(VPN_TEST) |
@@ -69,48 +93,48 @@ EXTRA_DIST = \ | |||
69 | 93 | ||
70 | test_gns_vpn_SOURCES = \ | 94 | test_gns_vpn_SOURCES = \ |
71 | test_gns_vpn.c | 95 | test_gns_vpn.c |
72 | test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ | 96 | test_gns_vpn_LDADD = -lmicrohttpd $(LIB_GNURL) \ |
73 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 97 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
74 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 98 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
75 | $(top_builddir)/src/testing/libgnunettesting.la \ | 99 | $(top_builddir)/src/testing/libgnunettesting.la \ |
76 | $(top_builddir)/src/util/libgnunetutil.la | 100 | $(top_builddir)/src/util/libgnunetutil.la |
77 | test_gns_vpn_CPPFLAGS = \ | 101 | test_gns_vpn_CPPFLAGS = \ |
78 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) | 102 | $(CPP_GNURL) $(AM_CPPFLAGS) |
79 | 103 | ||
80 | test_gnunet_vpn_4_over_SOURCES = \ | 104 | test_gnunet_vpn_4_over_SOURCES = \ |
81 | test_gnunet_vpn.c | 105 | test_gnunet_vpn.c |
82 | test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ | 106 | test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ |
83 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 107 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
84 | $(top_builddir)/src/testing/libgnunettesting.la \ | 108 | $(top_builddir)/src/testing/libgnunettesting.la \ |
85 | $(top_builddir)/src/util/libgnunetutil.la | 109 | $(top_builddir)/src/util/libgnunetutil.la |
86 | test_gnunet_vpn_4_over_CPPFLAGS = \ | 110 | test_gnunet_vpn_4_over_CPPFLAGS = \ |
87 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) | 111 | $(LIB_GNURL) $(AM_CPPFLAGS) |
88 | 112 | ||
89 | test_gnunet_vpn_6_over_SOURCES = \ | 113 | test_gnunet_vpn_6_over_SOURCES = \ |
90 | test_gnunet_vpn.c | 114 | test_gnunet_vpn.c |
91 | test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ | 115 | test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ |
92 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 116 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
93 | $(top_builddir)/src/testing/libgnunettesting.la \ | 117 | $(top_builddir)/src/testing/libgnunettesting.la \ |
94 | $(top_builddir)/src/util/libgnunetutil.la | 118 | $(top_builddir)/src/util/libgnunetutil.la |
95 | test_gnunet_vpn_6_over_CPPFLAGS = \ | 119 | test_gnunet_vpn_6_over_CPPFLAGS = \ |
96 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) | 120 | $(CPP_GNURL) $(AM_CPPFLAGS) |
97 | 121 | ||
98 | test_gnunet_vpn_4_to_6_SOURCES = \ | 122 | test_gnunet_vpn_4_to_6_SOURCES = \ |
99 | test_gnunet_vpn.c | 123 | test_gnunet_vpn.c |
100 | test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ | 124 | test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIB_GNURL) \ |
101 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 125 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
102 | $(top_builddir)/src/testing/libgnunettesting.la \ | 126 | $(top_builddir)/src/testing/libgnunettesting.la \ |
103 | $(top_builddir)/src/util/libgnunetutil.la | 127 | $(top_builddir)/src/util/libgnunetutil.la |
104 | test_gnunet_vpn_4_to_6_CPPFLAGS = \ | 128 | test_gnunet_vpn_4_to_6_CPPFLAGS = \ |
105 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) | 129 | $(CPP_GNURL) $(AM_CPPFLAGS) |
106 | 130 | ||
107 | test_gnunet_vpn_6_to_4_SOURCES = \ | 131 | test_gnunet_vpn_6_to_4_SOURCES = \ |
108 | test_gnunet_vpn.c | 132 | test_gnunet_vpn.c |
109 | test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ | 133 | test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIB_GNURL) \ |
110 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 134 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
111 | $(top_builddir)/src/testing/libgnunettesting.la \ | 135 | $(top_builddir)/src/testing/libgnunettesting.la \ |
112 | $(top_builddir)/src/util/libgnunetutil.la | 136 | $(top_builddir)/src/util/libgnunetutil.la |
113 | test_gnunet_vpn_6_to_4_CPPFLAGS = \ | 137 | test_gnunet_vpn_6_to_4_CPPFLAGS = \ |
114 | @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) | 138 | $(CPP_GNURL) $(AM_CPPFLAGS) |
115 | 139 | ||
116 | 140 | ||