From 53fd26b7e0deef386aeb207bfc1e3f7c00a1f775 Mon Sep 17 00:00:00 2001 From: David Barksdale Date: Tue, 27 Aug 2019 14:29:17 -0500 Subject: Use pkg-config to check for MHD --- src/pt/Makefile.am | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'src/pt') diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 188387c0c..1d94a3429 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am @@ -93,47 +93,42 @@ EXTRA_DIST = \ test_gns_vpn_SOURCES = \ test_gns_vpn.c -test_gns_vpn_LDADD = -lmicrohttpd $(LIB_GNURL) \ +test_gns_vpn_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/identity/libgnunetidentity.la \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -test_gns_vpn_CPPFLAGS = \ - $(CPP_GNURL) $(AM_CPPFLAGS) +test_gns_vpn_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) test_gnunet_vpn_4_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ +test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -test_gnunet_vpn_4_over_CPPFLAGS = \ - $(LIB_GNURL) $(AM_CPPFLAGS) +test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) test_gnunet_vpn_6_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ +test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -test_gnunet_vpn_6_over_CPPFLAGS = \ - $(CPP_GNURL) $(AM_CPPFLAGS) +test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) test_gnunet_vpn_4_to_6_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIB_GNURL) \ +test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -test_gnunet_vpn_4_to_6_CPPFLAGS = \ - $(CPP_GNURL) $(AM_CPPFLAGS) +test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) test_gnunet_vpn_6_to_4_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIB_GNURL) \ +test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -test_gnunet_vpn_6_to_4_CPPFLAGS = \ - $(CPP_GNURL) $(AM_CPPFLAGS) +test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) -- cgit v1.2.3