[Open-scap] [PATCH 9/9] Link against librt on Solaris

Marshall Miller mmiller at tresys.com
Fri Apr 29 21:21:00 UTC 2011


Add -lrt to list of libraries to link against on Solaris because this is where sigwaitinfo is located.
---
 configure.ac                |    7 +++++++
 src/OVAL/probes/Makefile.am |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a60d9e4..7cdcb7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,11 @@ CFLAGS_NODEBUG="-DNDEBUG"
 AC_CHECK_FUNCS([fts_open])
 
 #
+# sigwaitinfo
+#
+AC_CHECK_FUNC(sigwaitinfo, [sigwaitinfo_lib=""], [sigwaitinfo_lib="-lrt"])
+
+#
 # vasprintf
 #
 AC_CHECK_FUNCS([vasprintf])
@@ -402,6 +407,8 @@ AC_SUBST([PERL_INCLUDES], ["$PERL_INCLUDES"])
 AC_SUBST([perl_vendorlibdir], ['${prefix}'$vendorlib])
 AC_SUBST([perl_vendorarchdir], ['${prefix}'$vendorarch])
 
+AC_SUBST(sigwaitinfo_lib)
+
 AC_SUBST(libxml_cflags)
 AC_SUBST(libxml_libs)
 
diff --git a/src/OVAL/probes/Makefile.am b/src/OVAL/probes/Makefile.am
index ee7c36e..6ed06f4 100644
--- a/src/OVAL/probes/Makefile.am
+++ b/src/OVAL/probes/Makefile.am
@@ -6,7 +6,7 @@ pkglibexec_PROGRAMS=
 CFLAGS += @pthread_cflags@ -I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_srcdir)/src/common/public -I$(top_srcdir)/src/OVAL -I$(top_srcdir)/src/OVAL/public -I$(top_srcdir)/src/OVAL/probes/public -I$(top_srcdir)/src/OVAL/probes/SEAP/public @pcre_cflags@ -DTHREAD_SAFE -DSEAP_THREAD_SAFE @libxml_cflags@
 LDFLAGS += @pthread_ldflags@
 
-LDADD= probe/libprobe.la @pcre_libs@
+LDADD= probe/libprobe.la @pcre_libs@ @sigwaitinfo_lib@
 
 if WANT_PROBES
 pkglibexec_PROGRAMS += probe_system_info
-- 
1.6.2.5




More information about the Open-scap-list mailing list