diff options
| author | Ran Benita <ran234@gmail.com> | 2014-10-15 22:38:17 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2014-10-15 22:38:17 +0300 |
| commit | 1595f2b7429e1ab530d2131642e1407caadb3432 (patch) | |
| tree | b9d9232c30ac8bcef6471d192f114a8b4fe83fc5 | |
| parent | c42b864654d766a12b12a10e8105158467440957 (diff) | |
| parent | 3e169c47269434f28acf40afb66e0ce154c9ab59 (diff) | |
| download | xorg-lib-libxkbcommon-1595f2b7429e1ab530d2131642e1407caadb3432.tar.gz | |
Merge pull request #13 from jasperla/librt
Make librt optional, required for at least OpenBSD
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index af84ae4..9071e90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -209,7 +209,7 @@ test_keyseq_LDADD = $(TESTS_LDADD) test_rulescomp_LDADD = $(TESTS_LDADD) test_rmlvo_to_kccgst_LDADD = $(TESTS_LDADD) test_print_compiled_keymap_LDADD = $(TESTS_LDADD) -test_compose_LDADD = $(TESTS_LDADD) -lrt +test_compose_LDADD = $(TESTS_LDADD) $(RT_LIBS) if BUILD_LINUX_TESTS check_PROGRAMS += \ @@ -242,7 +242,7 @@ check_PROGRAMS += $(TESTS) # Benchmarks ## -BENCH_LDADD = $(TESTS_LDADD) -lrt +BENCH_LDADD = $(TESTS_LDADD) $(RT_LIBS) check_PROGRAMS += \ bench/key-proc \ diff --git a/configure.ac b/configure.ac index 7449954..52b0d3a 100644 --- a/configure.ac +++ b/configure.ac @@ -95,6 +95,11 @@ XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wdocumentation]) XORG_CHECK_LINKER_FLAGS([-Wl,--no-undefined], [have_no_undefined=yes]) AM_CONDITIONAL([HAVE_NO_UNDEFINED], [test "x$have_no_undefined" = xyes]) +AC_CHECK_LIB(rt, clock_gettime, + [AC_SUBST(RT_LIBS, "-lrt")], + [AC_SUBST(RT_LIBS, "")], + [-lrt]) + # Define a configuration option for the XKB config root xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config` AS_IF([test "x$xkb_base" = x], [ |