diff --git a/configure.ac b/configure.ac index 4e7832b2d86485ca389461a7487e0740fb9e7229..ff4b92a0eb64fdf2fc68de72f529a16ec99b154b 100644 --- a/configure.ac +++ b/configure.ac @@ -146,9 +146,6 @@ AS_IF([test "x$with_openssl" != "xno"], [PKG_CHECK_MODULES([OpenSSL], [openssl >= 1.1], [have_openssl=yes], [have_openssl=no])], [have_openssl=no]) AS_IF([test "x$have_openssl" = "xyes"], [ - AC_SUBST(OpenSSL_CFLAGS, "") - AC_SUBST(OpenSSL_LIBS, "") - AC_SUBST(OpenSSL_LDFLAGS, "-lssl") AC_MSG_NOTICE([Using OpenSSL]) ], [ AC_MSG_NOTICE([Not using OpenSSL]) @@ -163,8 +160,14 @@ AS_IF([test "x$with_http_parser_fork" = "xyes"],[ ]) AM_COND_IF([PROXY_CLIENT_OR_SERVER], [ - AC_CHECK_HEADERS([asio.hpp], exit,, AC_MSG_ERROR([Missing Asio header files])) - PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0]) + AC_CHECK_HEADERS([asio.hpp], exit,, AC_MSG_ERROR([Missing Asio headers files])) + CXXFLAGS="${CXXFLAGS} -DASIO_STANDALONE" + PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0], [have_fmt=yes], [have_fmt=no]) + AS_IF([test "x$have_fmt" = "xyes"], [ + AC_MSG_NOTICE([Using libfmt]) + ], [ + AC_MSG_NOTICE([Missing libfmt files]) + ]) # http_parser has no pkgconfig, instead we check with: AC_CHECK_LIB(http_parser, exit,, AC_MSG_ERROR([Missing HttpParser library files])) AC_CHECK_HEADERS([http_parser.h], [http_parser_headers=yes; break;]) diff --git a/src/Makefile.am b/src/Makefile.am index 560dd61e9be302aee4c20095773e1ba1aa25be61..7eaf8b240868365b068a3a01ab26445616b028b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ lib_LTLIBRARIES = libopendht.la -libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@ @OpenSSL_CFLAGS@ -libopendht_la_LIBADD = @Argon2_LIBS@ @JsonCpp_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@ @OpenSSL_LIBS@ -libopendht_la_LDFLAGS = @LDFLAGS@ @Argon2_LDFLAGS@ @OpenSSL_LDFLAGS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@ +libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@ @OpenSSL_CFLAGS@ @Fmt_CFLAGS@ +libopendht_la_LIBADD = @Argon2_LIBS@ @JsonCpp_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@ @OpenSSL_LIBS@ @Fmt_LIBS@ +libopendht_la_LDFLAGS = @LDFLAGS@ @Argon2_LDFLAGS@ @OpenSSL_LDFLAGS@ @Fmt_LDFLAGS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@ libopendht_la_SOURCES = \ dht.cpp \ storage.h \