Add Userspace-RCU to global CFLAGS and LIBS

The Userspace-RCU headers are now needed for more parts of the libisc
and libdns, thus we need to add it globally to prevent compilation
failures on systems with non-standard Userspace-RCU installation path.

diff --git a/configure.ac b/configure.ac
index 46dcc2a4414bebfd7b02e8425e0e4c67c4c76822..11a7b68a3fd7ed620b1951609a26258ee6a0b1b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -244,6 +244,9 @@ AC_DEFINE_UNQUOTED([RCU_FLAVOR], ["$RCU_FLAVOR"], [Chosen Userspace-RCU flavor])
 PKG_CHECK_VERSION([RCU_VERSION], [$RCU_FLAVOR])
 AC_DEFINE_UNQUOTED([RCU_VERSION], ["$RCU_VERSION"], [Compile-time Userspace-RCU version])
 
+CFLAGS="$CFLAGS $LIBURCU_CFLAGS"
+LIBS="$LIBS $LIBURCU_LIBS"
+
 # Fuzzing is not included in pairwise testing as fuzzing tools are
 # not present in the relevant Docker image.
 #

diff --git a/lib/dns/Makefile.am b/lib/dns/Makefile.am
index a70d7e73815a9364feecfab886917a3905a9b054..1db6d6585ad154a8ec2358b6fa6089e21050d034 100644 (file)
--- a/lib/dns/Makefile.am
+++ b/lib/dns/Makefile.am
@@ -263,7 +263,6 @@ libdns_la_CPPFLAGS =                \
        $(AM_CPPFLAGS)          \
        $(LIBDNS_CFLAGS)        \
        $(LIBISC_CFLAGS)        \
-       $(LIBURCU_CFLAGS)       \
        $(LIBUV_CFLAGS)         \
        $(OPENSSL_CFLAGS)
 
@@ -273,7 +272,6 @@ libdns_la_LDFLAGS =         \
 
 libdns_la_LIBADD =             \
        $(LIBISC_LIBS)          \
-       $(LIBURCU_LIBS)         \
        $(LIBUV_LIBS)           \
        $(OPENSSL_LIBS)
 

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index df23562ac41fd4fc6fe8594a6c1d2ca6d95ed8d2..7d74517464e4c55fb67975fcd6432dad36811c50 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -212,7 +212,6 @@ endif USE_ISC_RWLOCK
 libisc_la_CPPFLAGS =           \
        $(AM_CPPFLAGS)          \
        $(LIBISC_CFLAGS)        \
-       $(LIBURCU_CFLAGS)       \
        $(LIBUV_CFLAGS)         \
        $(OPENSSL_CFLAGS)       \
        $(ZLIB_CFLAGS)
@@ -222,7 +221,6 @@ libisc_la_LDFLAGS =         \
        -release "$(PACKAGE_VERSION)"
 
 libisc_la_LIBADD =             \
-       $(LIBURCU_LIBS)         \
        $(LIBUV_LIBS)           \
        $(OPENSSL_LIBS)         \
        $(ZLIB_LIBS)