Commit b7e56693 authored by Nikos Mavrogiannopoulos's avatar Nikos Mavrogiannopoulos
Browse files

Merge branch 'tmp-avoid-libs-in-libsvar' into 'master'

Do not add libraries in the global LIBS in configure

Closes #735

See merge request !1008
parents 2c789753 b00f7d45
Pipeline #63021324 passed with stage
in 72 minutes and 46 seconds
......@@ -462,6 +462,7 @@ ubsan-Werror.Fedora.x86_64:
- ./bootstrap
- CFLAGS="-std=c99 -fsanitize=undefined -fsanitize=bool -fsanitize=alignment -fsanitize=null -fsanitize=bounds-strict -fsanitize=enum -fno-sanitize-recover -g -O2" CXXFLAGS=$CFLAGS LDFLAGS="-static-libubsan" dash ./configure
--cache-file cache/config.cache --disable-non-suiteb-curves --disable-guile --disable-full-test-suite --disable-doc
- grep "^LIBS=''" config.log || false
- make -j$(nproc) -C gl
- make -j$(nproc) -C lib CFLAGS="-Werror -O2 -g -Wimplicit-fallthrough=2"
- make -j$(nproc) -C libdane CFLAGS="-Werror -O2 -g -Wimplicit-fallthrough=2"
......
......@@ -211,7 +211,10 @@ AC_CHECK_HEADERS([netinet/tcp.h])
AC_CHECK_HEADERS([stdatomic.h])
dnl This ensures that we link with the right library for atomic operations on Linux SPARC
save_LIBS=$LIBS
AC_SEARCH_LIBS([__atomic_load_4], [atomic], [], [AC_MSG_NOTICE([Could not detect libatomic])])
LIBS=$save_LIBS
AS_IF([test "$ac_cv_search___atomic_load_4" = "none required" || test "$ac_cv_search___atomic_load_4" = "no"],
[AC_SUBST([LIBATOMIC_LIBS], [])],
[AC_SUBST([LIBATOMIC_LIBS], [$ac_cv_search___atomic_load_4])])
......@@ -370,6 +373,7 @@ AC_ARG_WITH(included-unistring, AS_HELP_STRING([--with-included-unistring],
if test "$included_unistring" = yes;then
ac_have_unistring=no
else
save_LIBS=$LIBS
AC_SEARCH_LIBS(u8_normalize, unistring, [
included_unistring=no
ac_have_unistring=yes
......@@ -381,6 +385,7 @@ else
*** Libunistring was not found. To use the included one, use --with-included-unistring
]])
])
LIBS=$save_LIBS
fi
AM_CONDITIONAL(HAVE_LIBUNISTRING, test "$ac_have_unistring" = "yes")
......@@ -506,7 +511,8 @@ idna_support=no
with_libidn2=no
if test "$try_libidn2" = yes;then
AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [
save_LIBS=$LIBS
AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [
with_libidn2=yes;
idna_support="IDNA 2008 (libidn2)"
AC_DEFINE([HAVE_LIBIDN2], 1, [Define if IDNA 2008 support is enabled.])
......@@ -522,8 +528,9 @@ dnl fi
with_libidn2=no;
AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
])
LIBS=$save_LIBS
else
with_libidn2=no
with_libidn2=no
fi
AM_CONDITIONAL(HAVE_LIBIDN2, test "$with_libidn2" != "no")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment