[glib/wip/monotonic: 1/9] Link libglib against -lrt if we have clock_gettime
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/monotonic: 1/9] Link libglib against -lrt if we have clock_gettime
- Date: Fri, 22 Oct 2010 17:26:43 +0000 (UTC)
commit 720c20df2c7f186e0529bf1af88bff118b5b70f2
Author: Ryan Lortie <desrt desrt ca>
Date: Fri Oct 22 17:16:47 2010 +0200
Link libglib against -lrt if we have clock_gettime
configure.ac | 2 ++
glib/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5668592..f17df56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2384,8 +2384,10 @@ AC_CHECK_FUNCS(clock_gettime, [], [
AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
G_THREAD_LIBS="$G_THREAD_LIBS -lrt"
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt"
+ GLIB_RT_LIBS="-lrt"
])
])
+AC_SUBST(GLIB_RT_LIBS)
AC_CACHE_CHECK(for monotonic clocks,
glib_cv_monotonic_clock,AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 6f3d526..d757773 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -334,7 +334,7 @@ pcre_lib =
pcre_inc =
endif
-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS)
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]