From: Ben Pfaff <blp@nicira.com>
Date: Wed, 22 Jun 2011 22:09:35 +0000 (-0700)
Subject: configure: Fix --with-linux when environment contains KSRC.
X-Git-Tag: v1.2.0~134
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=0a89c170f40b908ea6fb30469c8d0c009dd41c2b

configure: Fix --with-linux when environment contains KSRC.

When "configure"'s environment contains KSRC, "configure" would use it in
preference to the value specified on --with-linux.  This caused a problem
for module-assistant builds in particular.
---

diff --git a/acinclude.m4 b/acinclude.m4
index 59c0c7453..e89e0e9f6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -57,6 +57,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     elif test X"$with_l26_source" != X; then
       KSRC=$with_l26_source
       AC_MSG_WARN([--with-l26-source is deprecated, please use --with-linux-source instead])
+    else
+      KSRC=
     fi
   elif test X"$with_linux_source" != X || test X"$with_l26_source" != X; then
     AC_MSG_ERROR([Linux source directory may not be specified without Linux build directory])