You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2018/09/24 21:55:07 UTC
[trafficserver] branch master updated: Fix libjansson & libcjose
static or dynamic detection
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4028ea3 Fix libjansson & libcjose static or dynamic detection
4028ea3 is described below
commit 4028ea30b245b61b6086c671f11d6e5dfa119a32
Author: Jean Baptiste Favre <gi...@jbfavre.org>
AuthorDate: Mon Sep 24 18:43:30 2018 +0200
Fix libjansson & libcjose static or dynamic detection
---
configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2f540ba..112845d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1311,21 +1311,21 @@ TS_CHECK_LUAJIT
#
AC_CHECK_HEADERS([jansson.h], [
AC_MSG_CHECKING([whether jansson is dynamic])
- TS_LINK_WITH_FLAGS_IFELSE([-shared -fPIC -l:libjansson.a],[AC_LANG_PROGRAM(
+ TS_LINK_WITH_FLAGS_IFELSE([-fPIC -ljansson],[AC_LANG_PROGRAM(
[#include <jansson.h>],
[(void) json_object();])],
- [AC_MSG_RESULT([no]); LIBJANSSON=-l:libjansson.a],
- [AC_MSG_RESULT([yes]); LIBJANSSON=-ljansson])
+ [AC_MSG_RESULT([yes]); LIBJANSSON=-ljansson],
+ [AC_MSG_RESULT([no]); LIBJANSSON=-l:libjansson.a])
],
[LIBJANSSON=])
AC_CHECK_HEADERS([cjose/cjose.h], [
AC_MSG_CHECKING([whether cjose is dynamic])
- TS_LINK_WITH_FLAGS_IFELSE([-shared -fPIC -l:libcjose.a],[AC_LANG_PROGRAM(
+ TS_LINK_WITH_FLAGS_IFELSE([-fPIC -lcjose],[AC_LANG_PROGRAM(
[#include <cjose/cjose.h>],
[(void) cjose_jws_import("", 0, NULL);])],
- [AC_MSG_RESULT([no]); LIBCJOSE=-l:libcjose.a],
- [AC_MSG_RESULT([yes]); LIBCJOSE=-lcjose])
+ [AC_MSG_RESULT([yes]); LIBCJOSE=-lcjose],
+ [AC_MSG_RESULT([no]); LIBCJOSE=-l:libcjose.a])
],
[LIBCJOSE=])
AC_CHECK_LIB([crypto],[HMAC],[has_libcrypto=1],[has_libcrypto=0])