[systemd-commits] configure.ac Makefile.am

[Kay Sievers]

 Makefile.am  |    3 +++
 configure.ac |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fba1ea06bb5b653e9eb0cc1b6004af8da273a4ab
Author: Shawn Landden <shawnlandden at gmail.com>
Date:   Sun Jul 21 20:57:35 2013 -0700

    build: do not link everything with -lrt (and therefore -pthread)

diff --git a/Makefile.am b/Makefile.am
index 7b4753d..c81c40c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1835,6 +1835,9 @@ libsystemd_daemon_la_LDFLAGS = \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
+libsystemd_daemon_la_LIBADD =  \
+	$(RT_LIBS)
+
 pkginclude_HEADERS += \
 	src/systemd/sd-daemon.h
 
diff --git a/configure.ac b/configure.ac
index 4e8c573..76aa2a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,6 @@ AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])
 
 # ------------------------------------------------------------------------------
 
-AC_SEARCH_LIBS([mq_open], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
 AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])
 
 save_LIBS="$LIBS"
@@ -198,6 +197,9 @@ LIBS=
 AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
 CAP_LIBS="$LIBS"
+AC_SEARCH_LIBS([mq_open], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
+RT_LIBS="$LIBS"
+AC_SUBST(RT_LIBS)
 LIBS="$save_LIBS"
 AC_SUBST(CAP_LIBS)