diff options
author | David Barksdale <amatus@amat.us> | 2019-08-27 14:29:17 -0500 |
---|---|---|
committer | David Barksdale <amatus@amat.us> | 2019-08-27 14:29:17 -0500 |
commit | 53fd26b7e0deef386aeb207bfc1e3f7c00a1f775 (patch) | |
tree | db4ed21ae7fb6677b7f7092f529175a76e3d4f6b /src/transport/Makefile.am | |
parent | ba2cae9617e32bf789001415cd787f50af8b3ce9 (diff) | |
download | gnunet-53fd26b7e0deef386aeb207bfc1e3f7c00a1f775.tar.gz gnunet-53fd26b7e0deef386aeb207bfc1e3f7c00a1f775.zip |
Use pkg-config to check for MHD
Diffstat (limited to 'src/transport/Makefile.am')
-rw-r--r-- | src/transport/Makefile.am | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index e6729f2a9..a9b0d19d6 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -12,7 +12,6 @@ pkgcfg_DATA = \ | |||
12 | communicator-unix.conf | 12 | communicator-unix.conf |
13 | 13 | ||
14 | if HAVE_MHD | 14 | if HAVE_MHD |
15 | GN_LIBMHD = -lmicrohttpd | ||
16 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la | 15 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la |
17 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la | 16 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la |
18 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server | 17 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server |
@@ -369,7 +368,7 @@ gnunet_service_transport_LDADD = \ | |||
369 | $(GN_GLPK) \ | 368 | $(GN_GLPK) \ |
370 | $(GN_LIBINTL) | 369 | $(GN_LIBINTL) |
371 | gnunet_service_transport_CFLAGS = \ | 370 | gnunet_service_transport_CFLAGS = \ |
372 | $(CFLAGS) | 371 | $(AM_CFLAGS) |
373 | # -DANALYZE | 372 | # -DANALYZE |
374 | 373 | ||
375 | 374 | ||
@@ -430,7 +429,7 @@ libgnunet_plugin_transport_wlan_la_LIBADD = \ | |||
430 | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ | 429 | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ |
431 | $(GN_PLUGIN_LDFLAGS) | 430 | $(GN_PLUGIN_LDFLAGS) |
432 | libgnunet_plugin_transport_wlan_la_CFLAGS = \ | 431 | libgnunet_plugin_transport_wlan_la_CFLAGS = \ |
433 | $(CFLAGS) -DBUILD_WLAN | 432 | $(AM_CFLAGS) -DBUILD_WLAN |
434 | 433 | ||
435 | libgnunet_plugin_transport_bluetooth_la_SOURCES = \ | 434 | libgnunet_plugin_transport_bluetooth_la_SOURCES = \ |
436 | plugin_transport_wlan.c plugin_transport_wlan.h | 435 | plugin_transport_wlan.c plugin_transport_wlan.h |
@@ -443,7 +442,7 @@ libgnunet_plugin_transport_bluetooth_la_LIBADD = \ | |||
443 | libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \ | 442 | libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \ |
444 | $(GN_PLUGIN_LDFLAGS) | 443 | $(GN_PLUGIN_LDFLAGS) |
445 | libgnunet_plugin_transport_bluetooth_la_CFLAGS = \ | 444 | libgnunet_plugin_transport_bluetooth_la_CFLAGS = \ |
446 | $(CFLAGS) -DBUILD_BLUETOOTH | 445 | $(AM_CFLAGS) -DBUILD_BLUETOOTH |
447 | 446 | ||
448 | libgnunet_plugin_transport_udp_la_SOURCES = \ | 447 | libgnunet_plugin_transport_udp_la_SOURCES = \ |
449 | plugin_transport_udp.c plugin_transport_udp.h \ | 448 | plugin_transport_udp.c plugin_transport_udp.h \ |
@@ -482,24 +481,22 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ | |||
482 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ | 481 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ |
483 | $(GN_PLUGIN_LDFLAGS) | 482 | $(GN_PLUGIN_LDFLAGS) |
484 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ | 483 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ |
485 | $(CFLAGS) | 484 | $(CPP_GNURL) $(AM_CFLAGS) |
486 | libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ | ||
487 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
488 | 485 | ||
489 | 486 | ||
490 | libgnunet_plugin_transport_http_server_la_SOURCES = \ | 487 | libgnunet_plugin_transport_http_server_la_SOURCES = \ |
491 | plugin_transport_http_server.c plugin_transport_http_common.c | 488 | plugin_transport_http_server.c plugin_transport_http_common.c |
492 | libgnunet_plugin_transport_http_server_la_LIBADD = \ | 489 | libgnunet_plugin_transport_http_server_la_LIBADD = \ |
490 | $(MHD_LIBS) \ | ||
493 | $(top_builddir)/src/hello/libgnunethello.la \ | 491 | $(top_builddir)/src/hello/libgnunethello.la \ |
494 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 492 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
495 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 493 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
496 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 494 | $(top_builddir)/src/nat/libgnunetnatnew.la \ |
497 | $(top_builddir)/src/util/libgnunetutil.la | 495 | $(top_builddir)/src/util/libgnunetutil.la |
498 | libgnunet_plugin_transport_http_server_la_LDFLAGS = \ | 496 | libgnunet_plugin_transport_http_server_la_LDFLAGS = \ |
499 | $(GN_LIBMHD) \ | ||
500 | $(GN_PLUGIN_LDFLAGS) | 497 | $(GN_PLUGIN_LDFLAGS) |
501 | libgnunet_plugin_transport_http_server_la_CFLAGS = \ | 498 | libgnunet_plugin_transport_http_server_la_CFLAGS = \ |
502 | $(CFLAGS) | 499 | $(MHD_CFLAGS) $(AM_CFLAGS) |
503 | 500 | ||
504 | libgnunet_plugin_transport_https_client_la_SOURCES = \ | 501 | libgnunet_plugin_transport_https_client_la_SOURCES = \ |
505 | plugin_transport_http_client.c plugin_transport_http_common.c | 502 | plugin_transport_http_client.c plugin_transport_http_common.c |
@@ -512,24 +509,22 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ | |||
512 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ | 509 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ |
513 | $(GN_PLUGIN_LDFLAGS) | 510 | $(GN_PLUGIN_LDFLAGS) |
514 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ | 511 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ |
515 | $(CFLAGS) -DBUILD_HTTPS | 512 | $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS |
516 | libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ | ||
517 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
518 | 513 | ||
519 | 514 | ||
520 | libgnunet_plugin_transport_https_server_la_SOURCES = \ | 515 | libgnunet_plugin_transport_https_server_la_SOURCES = \ |
521 | plugin_transport_http_server.c plugin_transport_http_common.c | 516 | plugin_transport_http_server.c plugin_transport_http_common.c |
522 | libgnunet_plugin_transport_https_server_la_LIBADD = \ | 517 | libgnunet_plugin_transport_https_server_la_LIBADD = \ |
518 | $(MHD_LIBS) \ | ||
523 | $(top_builddir)/src/hello/libgnunethello.la \ | 519 | $(top_builddir)/src/hello/libgnunethello.la \ |
524 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 520 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
525 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 521 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
526 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 522 | $(top_builddir)/src/nat/libgnunetnatnew.la \ |
527 | $(top_builddir)/src/util/libgnunetutil.la | 523 | $(top_builddir)/src/util/libgnunetutil.la |
528 | libgnunet_plugin_transport_https_server_la_LDFLAGS = \ | 524 | libgnunet_plugin_transport_https_server_la_LDFLAGS = \ |
529 | $(GN_LIBMHD) \ | ||
530 | $(GN_PLUGIN_LDFLAGS) | 525 | $(GN_PLUGIN_LDFLAGS) |
531 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ | 526 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ |
532 | $(CFLAGS) -DBUILD_HTTPS | 527 | $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS |
533 | 528 | ||
534 | 529 | ||
535 | if HAVE_TESTING | 530 | if HAVE_TESTING |