generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-09 03:08:38 +01:00
Code Issues Projects Releases Wiki Activity

build: Use a single variable to track libraries to link against

Browse Source 
Using various variables means we have to keep these in sync in various
places. Just use a single variable that we can use anywhere where this
is needed.
This commit is contained in:
Guillem Jover 2021-02-09 06:04:38 +01:00
parent 43d34c9d3b
commit a4e0db2b97
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -67,6 +67,7 @@ saved_LIBS="$LIBS"
AC_SEARCH_LIBS([MD5Update], [md], [ AC_SEARCH_LIBS([MD5Update], [md], [
AS_IF([test "x$ac_cv_search_MD5Update" != "xnone required"], [ AS_IF([test "x$ac_cv_search_MD5Update" != "xnone required"], [
MD_LIBS="$ac_cv_search_MD5Update" MD_LIBS="$ac_cv_search_MD5Update"
LIBBSD_LIBS="$LIBBSD_LIBS $ac_cv_search_MD5Update"
]) ])
], [ ], [
AC_MSG_ERROR([cannot find required MD5 functions in libc or libmd]) AC_MSG_ERROR([cannot find required MD5 functions in libc or libmd])
@ -74,6 +75,7 @@ AC_SEARCH_LIBS([MD5Update], [md], [
AC_SEARCH_LIBS([SHA512Update], [md], [ AC_SEARCH_LIBS([SHA512Update], [md], [
AS_IF([test "x$ac_cv_search_SHA512Update" != "xnone required"], [ AS_IF([test "x$ac_cv_search_SHA512Update" != "xnone required"], [
MD_LIBS="$ac_cv_search_SHA512Update" MD_LIBS="$ac_cv_search_SHA512Update"
LIBBSD_LIBS="$LIBBSD_LIBS $ac_cv_search_SHA512Update"
]) ])
], [ ], [
AC_MSG_ERROR([cannot find required SHA-2 functions in libc or libmd]) AC_MSG_ERROR([cannot find required SHA-2 functions in libc or libmd])
@ -88,10 +90,9 @@ AS_CASE([$host_os],
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
AC_SEARCH_LIBS([clock_gettime], [rt], [ AC_SEARCH_LIBS([clock_gettime], [rt], [
AS_IF([test "x$ac_cv_search_clock_gettime" != "xnone required"], [ AS_IF([test "x$ac_cv_search_clock_gettime" != "xnone required"], [
CLOCK_GETTIME_LIBS="$ac_cv_search_clock_gettime" LIBBSD_LIBS="$LIBBSD_LIBS $ac_cv_search_clock_gettime"
]) ])
]) ])
AC_SUBST([CLOCK_GETTIME_LIBS])
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
], ],
[*-musl*], [ [*-musl*], [
@ -199,8 +200,7 @@ AC_LINK_IFELSE(
[AC_DEFINE([HAVE___REGISTER_ATFORK], [1], [AC_DEFINE([HAVE___REGISTER_ATFORK], [1],
[Define to 1 if you have __register_atfork]) [Define to 1 if you have __register_atfork])
AC_MSG_RESULT([yes])], AC_MSG_RESULT([yes])],
[ARC4RANDOM_ATFORK_LIBS="-pthread" [LIBBSD_LIBS="$LIBBSD_LIBS -pthread"
AC_SUBST([ARC4RANDOM_ATFORK_LIBS])
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
@ -209,6 +209,8 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
pstat_getproc sysconf]) pstat_getproc sysconf])
AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"])
AC_SUBST([LIBBSD_LIBS])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
include/Makefile include/Makefile

4
src/Makefile.am
View File

@ -52,9 +52,7 @@ libbsd_la_DEPENDENCIES = \
$(libbsd_la_included_sources) \ $(libbsd_la_included_sources) \
libbsd.map libbsd.map
libbsd_la_LIBADD = \ libbsd_la_LIBADD = \
$(MD_LIBS) \ $(LIBBSD_LIBS) \
$(CLOCK_GETTIME_LIBS) \
$(ARC4RANDOM_ATFORK_LIBS) \
$(nil) $(nil)
libbsd_la_LDFLAGS = \ libbsd_la_LDFLAGS = \
-version-number $(LIBBSD_ABI) -version-number $(LIBBSD_ABI)