From 4f1179ef1b3a7ca38250f381e6e523087664914a Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Mon, 30 Jul 2007 21:19:00 +0000 Subject: [PATCH] Don't require libnl-devel, guess the path to it based on default location during a nightly. --- configure | 5 +++++ configure.ac | 5 +++++ util-vserver.spec | 2 -- util-vserver.spec.in | 2 -- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d9e3794..e4939b2 100755 --- a/configure +++ b/configure @@ -27660,6 +27660,11 @@ fi ensc_have_libnl=yes +LIBNL_ROOT=`echo ../libnl*/` +if test -d "$LIBNL_ROOT"; then + CFLAGS="$CFLAGS -isystem $LIBNL_ROOT/include" + LDFLAGS="$LDFLAGS -L$LIBNL_ROOT/lib" +fi if test x"$ensc_have_libnl" = xyes; then diff --git a/configure.ac b/configure.ac index 1d952bf..56e7bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,11 @@ dnl {check for libnl dnl ensc_have_libnl=yes +LIBNL_ROOT=`echo ../libnl*/` +if test -d "$LIBNL_ROOT"; then + CFLAGS="$CFLAGS -isystem $LIBNL_ROOT/include" + LDFLAGS="$LDFLAGS -L$LIBNL_ROOT/lib" +fi if test x"$ensc_have_libnl" = xyes; then AC_CHECK_HEADERS([netlink/netlink.h netlink/route/addr.h], [ : ], diff --git a/util-vserver.spec b/util-vserver.spec index 534ee4e..a3bdd88 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -52,8 +52,6 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel -# vip6-autod -BuildRequires: libnl-devel %{!?_without_doc:BuildRequires: doxygen tetex-latex} Requires(post): %name-core Requires(pre): %pkglibdir diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 26633ef..ed381b6 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -52,8 +52,6 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel -# vip6-autod -BuildRequires: libnl-devel %{!?_without_doc:BuildRequires: doxygen tetex-latex} Requires(post): %name-core Requires(pre): %pkglibdir -- 2.43.0