diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-06-26 15:55:55 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-06-26 15:55:55 +0000 |
commit | 44d10fe5cea875a05a31059bf2b2da25ee0cd5c0 (patch) | |
tree | 9b0f29826c35f80e7c98a528e7129e2f79f53ea2 /src/vpn/Makefile.am | |
parent | dfb93f8cbf257d1744cd59abd4d05ab06c9138c2 (diff) | |
download | gnunet-44d10fe5cea875a05a31059bf2b2da25ee0cd5c0.tar.gz gnunet-44d10fe5cea875a05a31059bf2b2da25ee0cd5c0.zip |
-added vpn gns test, fixes
Diffstat (limited to 'src/vpn/Makefile.am')
-rw-r--r-- | src/vpn/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 8cc546b36..91cb95640 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -26,6 +26,7 @@ if HAVE_MHD | |||
26 | test_gnunet_vpn-6_to_4 \ | 26 | test_gnunet_vpn-6_to_4 \ |
27 | test_gnunet_vpn-6_over \ | 27 | test_gnunet_vpn-6_over \ |
28 | test_gnunet_vpn-4_over | 28 | test_gnunet_vpn-4_over |
29 | #test_gns_vpn | ||
29 | endif | 30 | endif |
30 | else | 31 | else |
31 | install-exec-hook: | 32 | install-exec-hook: |
@@ -48,7 +49,8 @@ TESTS = $(check_PROGRAMS) | |||
48 | endif | 49 | endif |
49 | 50 | ||
50 | EXTRA_DIST = \ | 51 | EXTRA_DIST = \ |
51 | test_gnunet_vpn.conf | 52 | test_gnunet_vpn.conf \ |
53 | test_gns_vpn.conf | ||
52 | 54 | ||
53 | gnunet_helper_vpn_SOURCES = \ | 55 | gnunet_helper_vpn_SOURCES = \ |
54 | gnunet-helper-vpn.c | 56 | gnunet-helper-vpn.c |
@@ -80,6 +82,14 @@ libgnunetvpn_la_LIBADD = \ | |||
80 | libgnunetvpn_la_LDFLAGS = \ | 82 | libgnunetvpn_la_LDFLAGS = \ |
81 | $(GN_LIB_LDFLAGS) | 83 | $(GN_LIB_LDFLAGS) |
82 | 84 | ||
85 | #test_gns_vpn_SOURCES = \ | ||
86 | # test_gns_vpn.c | ||
87 | #test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \ | ||
88 | # $(top_builddir)/src/namestore/libgnunetnamestore.la \ | ||
89 | # $(top_builddir)/src/testing/libgnunettesting.la \ | ||
90 | # $(top_builddir)/src/util/libgnunetutil.la | ||
91 | #test_gnunet_vpn_4_over_CPPFLAGS = \ | ||
92 | # @LIBCURL_CPPFLAGS@ | ||
83 | 93 | ||
84 | test_gnunet_vpn_4_over_SOURCES = \ | 94 | test_gnunet_vpn_4_over_SOURCES = \ |
85 | test_gnunet_vpn.c | 95 | test_gnunet_vpn.c |