summaryrefslogtreecommitdiffstats
path: root/src/external/libnl.m4
diff options
context:
space:
mode:
authorNikolai Kondrashov <Nikolai.Kondrashov@redhat.com>2014-07-25 16:41:42 +0300
committerJakub Hrozek <jhrozek@redhat.com>2014-07-29 16:48:23 +0200
commitd9424a4d40f5f77e70c77d39f33ffed87370c21b (patch)
treed9498920346712da9d8d439b63e5e298fc539fde /src/external/libnl.m4
parent93f295496dc6dc0838c09692b6a3a008b35d461b (diff)
downloadsssd-d9424a4d40f5f77e70c77d39f33ffed87370c21b.tar.gz
sssd-d9424a4d40f5f77e70c77d39f33ffed87370c21b.tar.xz
sssd-d9424a4d40f5f77e70c77d39f33ffed87370c21b.zip
build: Distinguish libnl version checks
Use separate shell variable name prefixes for checks of separate libnl versions, as repeated invocations of PKG_CHECK_MODULES with the same prefix are not generally supposed to have an effect. This prevents bugs similar to https://fedorahosted.org/sssd/ticket/2388 Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/external/libnl.m4')
-rw-r--r--src/external/libnl.m49
1 files changed, 7 insertions, 2 deletions
diff --git a/src/external/libnl.m4 b/src/external/libnl.m4
index d468a490b..25be3f144 100644
--- a/src/external/libnl.m4
+++ b/src/external/libnl.m4
@@ -35,11 +35,14 @@ AC_DEFUN([AM_CHECK_LIBNL_FCS],
dnl A macro to check the availability and version of libnetlink
AC_DEFUN([AM_CHECK_LIBNL1],
[
- PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.1,[
+ PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.1,[
HAVE_LIBNL=1
HAVE_LIBNL1=1
+ LIBNL_CFLAGS="$LIBNL1_CFLAGS"
+ LIBNL_LIBS="$LIBNL1_LIBS"
+
AC_DEFINE_UNQUOTED(HAVE_LIBNL, 1, [Build with libnetlink support])
AC_DEFINE_UNQUOTED(HAVE_LIBNL1, 1, [Libnetlink version = 1])
@@ -61,13 +64,15 @@ dnl A macro to check the availability of libnetlink version 3
AC_DEFUN([AM_CHECK_LIBNL3],
[
- PKG_CHECK_MODULES(LIBNL, [
+ PKG_CHECK_MODULES(LIBNL3, [
libnl-3.0 >= 3.0
libnl-route-3.0 >= 3.0], [
HAVE_LIBNL=1
HAVE_LIBNL3=1
+ LIBNL_CFLAGS="$LIBNL3_CFLAGS"
+ LIBNL_LIBS="$LIBNL3_LIBS"
AC_DEFINE_UNQUOTED(HAVE_LIBNL, 1, [Build with libnetlink support])
AC_DEFINE_UNQUOTED(HAVE_LIBNL3, 1, [Libnetlink version = 3])