From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Mon, 30 Jul 2007 21:19:00 +0000 (+0000)
Subject: Don't require libnl-devel, guess the path to it based on default location during... 
X-Git-Tag: util-vserver-0.30.214-1~41
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=4f1179ef1b3a7ca38250f381e6e523087664914a

Don't require libnl-devel, guess the path to it based on default location during a nightly.
---

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