From 25f4653be40f3ace6b3c66e290b49acb65d026cd Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Mon, 23 Dec 2024 15:05:46 -0500 Subject: [PATCH] build: toolchain m4 isn't compatible with older autoconf Signed-off-by: Ben Collins --- CMakeLists.txt | 2 +- configure.ac | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b402afe..e66cc364 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ target_sources(jwt PRIVATE libjwt/jwt.c libjwt/jwks.c libjwt/base64.c) generate_export_header(jwt) -include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}) target_link_libraries(jwt PUBLIC ${JANSSON_LINK_LIBRARIES}) target_include_directories(jwt PUBLIC diff --git a/configure.ac b/configure.ac index 346f0b17..09581c67 100644 --- a/configure.ac +++ b/configure.ac @@ -113,8 +113,10 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], AC_SUBST([RPMBUILD_OPTS],["$RPMB_OPENSSL $RPMB_GNUTLS $RPMB_CHECK"]) dnl Check for compiler support flags -AX_GCC_FUNC_ATTRIBUTE([deprecated]) -AX_GCC_FUNC_ATTRIBUTE([visibility]) +dnl AX_GCC_FUNC_ATTRIBUTE([deprecated]) +dnl AX_GCC_FUNC_ATTRIBUTE([visibility]) +AC_SUBST([GCC_FUNC_DEPRECATED],["__attribute__((__deprecated__))"]) +AC_SUBST([GCC_EXPORT],["__attribute__((visibility(\"default\")))"]) dnl Valgrind defaults AX_VALGRIND_DFLT([memcheck], [on])