Permalink
Browse files

Don't bother checking for 2.x kernels, to make cross-compiling work.

If anybody tries building this on/for a 1.x kernel, and complains about
it failing to compile, or failing to work, we'll worry about it then.

(This also picks up the change

commit 3c84d82
Author: Stephen Donnelly <stephen.donnelly@endace.com>
Date:   Thu Mar 24 11:09:29 2011 +1300

    Ensure that dag library directory is added to LDFLAGS if required.

    configure will need to be rebuilt using preferred autoconf version.

in configure; it *wasn't* rebuilt before committing.)
  • Loading branch information...
1 parent bb6cfe0 commit f3e011b18c55aefbc6294e32fb00c46f92625579 @guyharris guyharris committed May 5, 2011
Showing with 3 additions and 50 deletions.
  1. +3 −33 configure
  2. +0 −17 configure.in
View
@@ -7233,37 +7233,6 @@ _ACEOF
;;
linux)
- { echo "$as_me:$LINENO: checking Linux kernel version" >&5
-echo $ECHO_N "checking Linux kernel version... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
- if test "${ac_cv_linux_vers+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_linux_vers=unknown
-fi
-
- else
- if test "${ac_cv_linux_vers+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_linux_vers=`uname -r 2>&1 | \
- sed -n -e '$s/.* //' -e '$s/\..*//p'`
-fi
-
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_linux_vers" >&5
-echo "${ECHO_T}$ac_cv_linux_vers" >&6; }
- if test $ac_cv_linux_vers = unknown ; then
- { { echo "$as_me:$LINENO: error: cannot determine linux version when cross-compiling" >&5
-echo "$as_me: error: cannot determine linux version when cross-compiling" >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test $ac_cv_linux_vers -lt 2 ; then
- { { echo "$as_me:$LINENO: error: version 2 or higher required; see the INSTALL doc for more info" >&5
-echo "$as_me: error: version 2 or higher required; see the INSTALL doc for more info" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
#
# Do we have the wireless extensions?
#
@@ -8949,13 +8918,16 @@ _ACEOF
fi
+ LDFLAGS=$saved_ldflags
+
if test "$dag_streams" = 1; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DAG_STREAMS_API 1
_ACEOF
LIBS="$LIBS -ldag"
+ LDFLAGS="$LDFLAGS -L$dag_lib_dir"
{ echo "$as_me:$LINENO: checking for vdag_set_device_info in -lvdag" >&5
echo $ECHO_N "checking for vdag_set_device_info in -lvdag... $ECHO_C" >&6; }
@@ -9034,8 +9006,6 @@ _ACEOF
fi
fi
- LDFLAGS=$saved_ldflags
-
cat >>confdefs.h <<\_ACEOF
#define HAVE_DAG_API 1
View
@@ -410,23 +410,6 @@ dlpi)
;;
linux)
- AC_MSG_CHECKING(Linux kernel version)
- if test "$cross_compiling" = yes; then
- AC_CACHE_VAL(ac_cv_linux_vers,
- ac_cv_linux_vers=unknown)
- else
- AC_CACHE_VAL(ac_cv_linux_vers,
- ac_cv_linux_vers=`uname -r 2>&1 | \
- sed -n -e '$s/.* //' -e '$s/\..*//p'`)
- fi
- AC_MSG_RESULT($ac_cv_linux_vers)
- if test $ac_cv_linux_vers = unknown ; then
- AC_MSG_ERROR(cannot determine linux version when cross-compiling)
- fi
- if test $ac_cv_linux_vers -lt 2 ; then
- AC_MSG_ERROR(version 2 or higher required; see the INSTALL doc for more info)
- fi
-
#
# Do we have the wireless extensions?
#

0 comments on commit f3e011b

Please sign in to comment.