Thanks to Andrew Beekhof
Signed-off-by: Angus Salkeld asalkeld@redhat.com --- configure.ac | 3 +++ examples/Makefile.am | 12 ++++++------ tests/Makefile.am | 26 +++++++++++++------------- 3 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac index 855dfef..129545c 100644 --- a/configure.ac +++ b/configure.ac @@ -202,6 +202,7 @@ fi # OS detection # THIS SECTION MUST DIE! CP=cp +LIB_RT=-lrt AC_MSG_CHECKING([for os in ${host_os}]) case "$host_os" in *linux*) @@ -213,6 +214,7 @@ case "$host_os" in AC_DEFINE_UNQUOTED([QB_DARWIN], [1], [Compiling for Darwin platform]) CP=rsync + LIB_RT= AC_DEFINE_UNQUOTED([MAP_ANONYMOUS], [MAP_ANON], [Shared memory define for Darwin platform]) AC_DEFINE_UNQUOTED([PATH_MAX], [4096], @@ -321,6 +323,7 @@ AC_ARG_WITH([socket-dir], [ SOCKETDIR="$localstatedir/run" ])
AC_SUBST(CP) +AC_SUBST(LIB_RT) # *FLAGS handling goes here
ENV_CFLAGS="$CFLAGS" diff --git a/examples/Makefile.am b/examples/Makefile.am index a04754b..58646e3 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -25,27 +25,27 @@ noinst_PROGRAMS = mapnotify simplelog tcpclient tcpserver ipcclient ipcserver
mapnotify_SOURCES = mapnotify.c $(top_builddir)/include/qb/qbmap.h mapnotify_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -mapnotify_LDADD = -lrt $(top_builddir)/lib/libqb.la +mapnotify_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
simplelog_SOURCES = simplelog.c $(top_builddir)/include/qb/qblog.h simplelog_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -simplelog_LDADD = -lrt $(top_builddir)/lib/libqb.la +simplelog_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
tcpclient_SOURCES = tcpclient.c $(top_builddir)/include/qb/qbloop.h tcpclient_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -tcpclient_LDADD = -lrt $(top_builddir)/lib/libqb.la +tcpclient_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
tcpserver_SOURCES = tcpserver.c $(top_builddir)/include/qb/qbloop.h tcpserver_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -tcpserver_LDADD = -lrt $(top_builddir)/lib/libqb.la +tcpserver_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
ipcclient_SOURCES = ipcclient.c $(top_builddir)/include/qb/qbloop.h \ $(top_builddir)/include/qb/qbipcc.h ipcclient_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -ipcclient_LDADD = -lrt $(top_builddir)/lib/libqb.la +ipcclient_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
ipcserver_SOURCES = ipcserver.c $(top_builddir)/include/qb/qbloop.h \ $(top_builddir)/include/qb/qbipcs.h ipcserver_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(GLIB_CFLAGS) -ipcserver_LDADD = -lrt $(top_builddir)/lib/libqb.la $(GLIB_LIBS) +ipcserver_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la $(GLIB_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 634e0ed..49287cb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,27 +25,27 @@ noinst_PROGRAMS = bmc bmcpt bms rbwriter rbreader loop bench-log
bmc_SOURCES = bmc.c $(top_builddir)/include/qb/qbipcc.h bmc_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -bmc_LDADD = -lrt $(top_builddir)/lib/libqb.la +bmc_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
bmcpt_SOURCES = bmcpt.c $(top_builddir)/include/qb/qbipcc.h bmcpt_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -bmcpt_LDADD = -lrt $(top_builddir)/lib/libqb.la +bmcpt_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
bms_SOURCES = bms.c $(top_builddir)/include/qb/qbipcs.h bms_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include $(GLIB_CFLAGS) -bms_LDADD = -lrt $(top_builddir)/lib/libqb.la $(GLIB_LIBS) +bms_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la $(GLIB_LIBS)
rbwriter_SOURCES = rbwriter.c $(top_builddir)/include/qb/qbrb.h rbwriter_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -rbwriter_LDADD = -lrt $(top_builddir)/lib/libqb.la +rbwriter_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
rbreader_SOURCES = rbreader.c $(top_builddir)/include/qb/qbrb.h rbreader_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -rbreader_LDADD = -lrt $(top_builddir)/lib/libqb.la +rbreader_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
loop_SOURCES = loop.c $(top_builddir)/include/qb/qbloop.h loop_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -loop_LDADD = -lrt $(top_builddir)/lib/libqb.la +loop_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
if HAVE_DICT_WORDS if HAVE_SLOW_TESTS @@ -68,7 +68,7 @@ endif
bench_log_SOURCES = bench-log.c $(top_builddir)/include/qb/qblog.h bench_log_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -bench_log_LDADD = -lrt $(top_builddir)/lib/libqb.la +bench_log_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
if HAVE_CHECK EXTRA_DIST += resources.test @@ -82,27 +82,27 @@ check_SCRIPTS = resources.test
array_test_SOURCES = check_array.c $(top_builddir)/include/qb/qbarray.h array_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include -array_test_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@ +array_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
map_test_SOURCES = check_map.c $(top_builddir)/include/qb/qbmap.h map_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include -map_test_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@ +map_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
rb_test_SOURCES = check_rb.c $(top_builddir)/include/qb/qbrb.h rb_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include -rb_test_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@ +rb_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
loop_test_SOURCES = check_loop.c $(top_builddir)/include/qb/qbloop.h loop_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include -loop_test_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@ +loop_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
ipc_test_SOURCES = check_ipc.c $(top_builddir)/include/qb/qbipcc.h $(top_builddir)/include/qb/qbipcs.h ipc_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include -ipc_test_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@ +ipc_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
log_test_SOURCES = check_log.c $(top_builddir)/include/qb/qblog.h log_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include -log_test_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@ +log_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
endif