xf86-video-intel: configure.ac src/Makefile.am src/sna/Makefile.am test/Makefile.am

[Chris Wilson]

 configure.ac        |    4 ++++
 src/Makefile.am     |    1 +
 src/sna/Makefile.am |    2 +-
 test/Makefile.am    |    2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6132400365f8f467d838ed26002e74412e1c7298
Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Wed Jun 19 11:30:24 2013 +0100

    configure: test for librt (clock_gettime)
    
    clock_gettime() is in libc not librt on OpenBSD so check
    to see if linking librt is required.
    
    Signed-off-by: Jonathan Gray <jsg at jsg.id.au>

diff --git a/configure.ac b/configure.ac
index 3f6f9bd..26688a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,10 @@ PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
 PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no)
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
+LIBS=""
+AC_SEARCH_LIBS(clock_gettime, rt, [CLOCK_GETTIME_LIBS=$LIBS])
+AC_SUBST(CLOCK_GETTIME_LIBS)
+
 sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 
 if test "x$enable_dri" != "xno"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index feed4ce..8083756 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,6 +95,7 @@ intel_drv_la_SOURCES += \
 	$(NULL)
 intel_drv_la_LIBADD += \
 	$(DRI_LIBS) \
+	@CLOCK_GETTIME_LIBS@ \
 	$(NULL)
 endif
 
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index ed6fad2..56ad936 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -94,7 +94,7 @@ libsna_la_SOURCES = \
 if DRI2
 AM_CFLAGS += @DRI_CFLAGS@
 libsna_la_SOURCES += sna_dri.c
-libsna_la_LIBADD += $(DRI_LIBS)
+libsna_la_LIBADD += $(DRI_LIBS) @CLOCK_GETTIME_LIBS@
 endif
 
 if XVMC
diff --git a/test/Makefile.am b/test/Makefile.am
index c3610f2..f51967b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,7 +25,7 @@ check_PROGRAMS = $(stress_TESTS)
 noinst_PROGRAMS = lowlevel-blt-bench
 
 AM_CFLAGS = @CWARNFLAGS@ @X11_CFLAGS@ @DRM_CFLAGS@
-LDADD = libtest.la @X11_LIBS@ -lXfixes @DRM_LIBS@ -lrt
+LDADD = libtest.la @X11_LIBS@ -lXfixes @DRM_LIBS@ @CLOCK_GETTIME_LIBS@
 
 noinst_LTLIBRARIES = libtest.la
 libtest_la_SOURCES = \