Use AC_SEARCH_LIBS instead of hardcoded lists

Use AC_SEARCH_LIBS to detect what library provides sem_*.
This allows us to stop hardcoding the ld arguments in the various MakeFiles.

Suggested-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index aaedabb8f4a289c59c6d123be3942f91c141765d..887c26dc92d84dc545534581ed8bd4024a6304cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,6 +286,9 @@ AC_CHECK_FUNCS([fgetln],
        AC_DEFINE(HAVE_FGETLN,1,[Have fgetln]),
        AM_CONDITIONAL(HAVE_FGETLN, false))
 
+# Check for some libraries
+AC_SEARCH_LIBS(sem_open, [rt pthread])
+
 # Check for some standard binaries
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_SED

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 8974ca947666d0090a804fb1efb542fbd2516f2c..aba2e675402c3344f2e8f20546333e593de7828d 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -114,10 +114,6 @@ liblxc_so_LDFLAGS = \
 
 liblxc_so_LDADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SECCOMP_LIBS)
 
-if !IS_BIONIC
-liblxc_so_LDADD += -lutil -lrt
-endif
-
 bin_SCRIPTS = \
        lxc-ps \
        lxc-netstat \
@@ -172,10 +168,6 @@ AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir)
 endif
 LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SECCOMP_LIBS@
 
-if !IS_BIONIC
-LDADD += -lrt
-endif
-
 lxc_attach_SOURCES = lxc_attach.c
 lxc_cgroup_SOURCES = lxc_cgroup.c
 lxc_checkpoint_SOURCES = lxc_checkpoint.c

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index a883d3658cac3aac270f69b121f296a03a81c74c..0f4ee1dc386b343fd8c2902b761ff8701e45f23e 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,10 +2,6 @@ if ENABLE_TESTS
 
 LDADD = ../lxc/liblxc.so
 
-if !IS_BIONIC
-LDADD += -lpthread
-endif
-
 lxc_test_containertests_SOURCES = containertests.c
 lxc_test_locktests_SOURCES = locktests.c
 lxc_test_startone_SOURCES = startone.c