Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
opendht
Commits
9b8358cd
Commit
9b8358cd
authored
5 years ago
by
Seva
Committed by
Adrien Béraud
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
configure: set openssl & fmt flags with pkg_check_modules
parent
7ae3b3af
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+8
-5
8 additions, 5 deletions
configure.ac
src/Makefile.am
+3
-3
3 additions, 3 deletions
src/Makefile.am
with
11 additions
and
8 deletions
configure.ac
+
8
−
5
View file @
9b8358cd
...
@@ -146,9 +146,6 @@ AS_IF([test "x$with_openssl" != "xno"],
...
@@ -146,9 +146,6 @@ AS_IF([test "x$with_openssl" != "xno"],
[PKG_CHECK_MODULES([OpenSSL], [openssl >= 1.1], [have_openssl=yes], [have_openssl=no])],
[PKG_CHECK_MODULES([OpenSSL], [openssl >= 1.1], [have_openssl=yes], [have_openssl=no])],
[have_openssl=no])
[have_openssl=no])
AS_IF([test "x$have_openssl" = "xyes"], [
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([Using OpenSSL])
], [
], [
AC_MSG_NOTICE([Not using OpenSSL])
AC_MSG_NOTICE([Not using OpenSSL])
...
@@ -163,8 +160,14 @@ AS_IF([test "x$with_http_parser_fork" = "xyes"],[
...
@@ -163,8 +160,14 @@ AS_IF([test "x$with_http_parser_fork" = "xyes"],[
])
])
AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
AC_CHECK_HEADERS([asio.hpp], exit,, AC_MSG_ERROR([Missing Asio header files]))
AC_CHECK_HEADERS([asio.hpp], exit,, AC_MSG_ERROR([Missing Asio headers files]))
PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0])
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:
# http_parser has no pkgconfig, instead we check with:
AC_CHECK_LIB(http_parser, exit,, AC_MSG_ERROR([Missing HttpParser library files]))
AC_CHECK_LIB(http_parser, exit,, AC_MSG_ERROR([Missing HttpParser library files]))
AC_CHECK_HEADERS([http_parser.h], [http_parser_headers=yes; break;])
AC_CHECK_HEADERS([http_parser.h], [http_parser_headers=yes; break;])
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
3
−
3
View file @
9b8358cd
lib_LTLIBRARIES
=
libopendht.la
lib_LTLIBRARIES
=
libopendht.la
libopendht_la_CPPFLAGS
=
@CPPFLAGS@
-I
$(
top_srcdir
)
/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@ @OpenSSL_CFLAGS@
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@
libopendht_la_LIBADD
=
@Argon2_LIBS@ @JsonCpp_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@ @OpenSSL_LIBS@
@Fmt_LIBS@
libopendht_la_LDFLAGS
=
@LDFLAGS@ @Argon2_LDFLAGS@ @OpenSSL_LDFLAGS@
-version-number
@OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
libopendht_la_LDFLAGS
=
@LDFLAGS@ @Argon2_LDFLAGS@ @OpenSSL_LDFLAGS@
@Fmt_LDFLAGS@
-version-number
@OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
libopendht_la_SOURCES
=
\
libopendht_la_SOURCES
=
\
dht.cpp
\
dht.cpp
\
storage.h
\
storage.h
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment