update build system to find automatically installed kcompat and urcu

diff --git a/README b/README
index d2f78bc79de7adc991f1a6a7909c52ef846838db..306ef58afb9dfe84ba898c4f0a07f94f2d2ba4f0 100644 (file)
--- a/README
+++ b/README
@@ -13,8 +13,7 @@ Dependencies:
 Installation instruction:
 
 - Download, compile and install liburcu and libkcompat.
-- In this package's tree, run ./configure, specifying the location of
-  liburcu and libkcompat with the --with-urcu and --with-kcompat options.
+- In this package's tree, run ./configure.
 - Run make.
 - See the manual in the doc/ directory for usage instructions.
 

diff --git a/configure.ac b/configure.ac
index bc8c325e9ceb9a49f49da8f9155bd6af225a348e..070093bbcea7e6f919f1be949e59bb200a06b998 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,30 +50,18 @@ AC_C_INLINE
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 
-AC_ARG_WITH(urcu, [  --with-urcu path        Path to userspace RCU source], [
-       AC_CHECK_FILE(["$withval/urcu.h"], [
-               URCU_CFLAGS="-I$withval"
-               URCU_LIBS="-L$withval -lurcu-bp" ],
-               AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
-], [
-       PKG_CHECK_MODULES(URCU, [liburcu], , [
-               AC_MSG_ERROR([Must specify urcu path.])])
-])
-AC_SUBST(URCU_CFLAGS)
-AC_SUBST(URCU_LIBS)
+# URCU
+
+# urcu - check if we just find the headers it out of the box.
+AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.])])
+
+# urcu - check that URCU lib is available to compilation
+AC_CHECK_LIB([urcu-bp], [synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
+
+# kcompat
+
+AC_CHECK_HEADERS([kcompat.h], [], [AC_MSG_ERROR([Cannot find kcompat headers (kcompat.h). Use [CFLAGS]=-Idir to specify their location.])])
 
-AC_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
-], [
-        AC_CHECK_FILE("$withval/kcompat.h", [
-                KCOMPAT_CFLAGS="-I$withval $URCU_CFLAGS"
-                KCOMPAT_LIBS=
-                ], AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory]))
-], [
-        PKG_CHECK_MODULES(KCOMPAT, [libkcompat], , [
-               AC_MSG_ERROR([Must specify kcompat path.])])
-])
-AC_SUBST(KCOMPAT_CFLAGS)
-AC_SUBST(KCOMPAT_LIBS)
 
 AC_CONFIG_FILES([
        Makefile

diff --git a/java/Makefile.am b/java/Makefile.am
index e818b810286ef4b9eb45a9fe30fc45b7eff92ad1..f9deb7acfe289b75377534fd3a8f816ef168301f 100644 (file)
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 lib_LTLIBRARIES = libustjava.la
 libustjava_la_SOURCES = UST.c UST.h

diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am
index acc855683285169e9f590dc579d4bbcc1b980f87..1f7dad3979e0ef03b1d8ea7d3c0bbc9d82953cfa 100644 (file)
--- a/libmallocwrap/Makefile.am
+++ b/libmallocwrap/Makefile.am
@@ -1,5 +1,4 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 lib_LTLIBRARIES = libmallocwrap.la
 libmallocwrap_la_SOURCES = mallocwrap.c

diff --git a/libust/Makefile.am b/libust/Makefile.am
index df5f46a4228247a68b594a813e4841a860259844..1aec7b3177bba643f7991d69b9729b73b95048ab 100644 (file)
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,8 +1,7 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm
 
 lib_LTLIBRARIES = libust.la
 libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.h
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libust_la_LIBADD = $(URCU_LIBS) -lpthread
+libust_la_LIBADD = -lpthread
 libust_la_CFLAGS = -DUST_COMPONENT="libust"

diff --git a/tests/basic/Makefile.am b/tests/basic/Makefile.am
index d949bb4679c288742491a8a2c074a385455d1e6f..669cb8267efa3ce2a554e7204016f02286691e9e 100644 (file)
--- a/tests/basic/Makefile.am
+++ b/tests/basic/Makefile.am
@@ -1,9 +1,8 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 noinst_PROGRAMS = basic
 basic_SOURCES = basic.c
-basic_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+basic_LDADD = $(top_builddir)/libust/libust.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/basic_long/Makefile.am b/tests/basic_long/Makefile.am
index 219be7a72f874ab7c4914399d8bbf9b7b4bd1052..a6e0f7c502b93010d4b95970ab78f258d29f6b78 100644 (file)
--- a/tests/basic_long/Makefile.am
+++ b/tests/basic_long/Makefile.am
@@ -1,9 +1,8 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 noinst_PROGRAMS = basic_long
 basic_long_SOURCES = basic_long.c
-basic_long_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+basic_long_LDADD = $(top_builddir)/libust/libust.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am
index 4813bf8c9ab3376cdde9dfa2e7b2516191e509ca..86a1a798a9a9d27aaa99d5a3da59cbad85b8bb41 100644 (file)
--- a/tests/fork/Makefile.am
+++ b/tests/fork/Makefile.am
@@ -1,11 +1,10 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 noinst_PROGRAMS = fork fork2
 fork_SOURCES = fork.c
-fork_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+fork_LDADD = $(top_builddir)/libust/libust.la
 fork2_SOURCES = fork2.c
-fork2_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+fork2_LDADD = $(top_builddir)/libust/libust.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index 845773ee91cc192f52353fde96b18443a4e7bba4..bef643db2bbed61c99ec7f8b75f5d359299ecc2e 100644 (file)
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -1,9 +1,8 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c tp.h
-hello_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+hello_LDADD = $(top_builddir)/libust/libust.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/tests/hello2/Makefile.am b/tests/hello2/Makefile.am
index 1abdae01dbd4600624f8b3b41a59fb870eaf3071..8c3aad1e7650ed6538713462a7834f3b5a19ab58 100644 (file)
--- a/tests/hello2/Makefile.am
+++ b/tests/hello2/Makefile.am
@@ -1,9 +1,8 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-       $(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust
 
 noinst_PROGRAMS = hello2
 hello2_SOURCES = hello2.c
-hello2_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+hello2_LDADD = $(top_builddir)/libust/libust.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run

diff --git a/ustd/Makefile.am b/ustd/Makefile.am
index e17854035243834a004e675ab90402201043cb87..df49a82083e4f81e56614ab14accd60ac3c950ae 100644 (file)
--- a/ustd/Makefile.am
+++ b/ustd/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-        -I$(top_builddir)/libustcomm $(KCOMPAT_CFLAGS)
+        -I$(top_builddir)/libustcomm
 
 bin_PROGRAMS = ustd
 ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/share/usterr.h