Fix configure.in kernel version checking and CONFIG_MODULES checking.
In kernel commits 264a26838056fc2d759f58bec2e720e01fcb1bdb and
273b281fa22c293963ee3e6eec418f5dda2dbc83, autoconf.h and utsrelease.h
are now in include/generated, respectively.
Bryan Hundven
diff -urN linuxwacom-dev.orig/configure.in linuxwacom-dev/configure.in
--- linuxwacom-dev.orig/configure.in 2009-12-09 11:58:41.000000000 -0800
+++ linuxwacom-dev/configure.in 2010-01-18 18:37:07.412452908 -0800
@@ -152,6 +152,7 @@
AC_MSG_CHECKING(kernel version)
MODUTS=
for a in "$WCM_KERNEL_DIR/include/linux/version.h" \
+ "$WCM_KERNEL_DIR/include/generated/utsrelease.h" \
"$WCM_KERNEL_DIR/include/linux/utsrelease.h"; do
MODUTS=`grep UTS_RELEASE $a | sed -e 's/^[[^"]]*"\([[^"]]*\).*$/\1/g'`
test -n "$MODUTS" && break
@@ -195,6 +196,8 @@
AC_MSG_CHECKING(for kernel module support)
if grep CONFIG_MODULES $WCM_KERNEL_DIR/include/linux/autoconf.h >/dev/null 2>&1; then
AC_MSG_RESULT(yes)
+ elif grep CONFIG_MODULES $WCM_KERNEL_DIR/include/generated/autoconf.h >/dev/null 2>&1; then
+ AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
WCM_KERNEL_VER=
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
