1
From: Ben Hutchings <ben@decadent.org.uk>
2
Subject: [PATCH] Don't check autoconf.h or version.h directly
3
Last-Update: 2010-05-23
5
The generated headers may be installed in various different places.
6
Don't make assumptions about where they are. Use 'make kernelversion'
9
Index: alsa-driver-1.0.23+dfsg/configure.in
10
===================================================================
11
--- alsa-driver-1.0.23+dfsg.orig/configure.in 2010-05-28 19:14:23.000000000 +0200
12
+++ alsa-driver-1.0.23+dfsg/configure.in 2010-05-28 19:14:23.000000000 +0200
15
dnl Check for kernel version...
16
AC_MSG_CHECKING(for kernel version)
17
-KERNEL_INC="-I$CONFIG_SND_KERNELSRC/include"
19
-if test -n "$kernelbuild"; then
21
- if test -d "$kernelbuild/include"; then
22
- kpath="-I$kernelbuild/include"
24
- if test -d "$kernelbuild/include2"; then
25
- kpath="$kpath -I$kernelbuild/include2"
26
- MAKE_ADDS="O=$kernelbuild"
28
- KERNEL_INC="$kpath $KERNEL_INC"
31
-ac_save_CFLAGS="$CFLAGS"
32
-CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
33
-if test -n "$kernelbuild" -a -f $kernelbuild/include/$INCLUDE_VERSION_H; then
34
- KERNDIR=$kernelbuild
36
- KERNDIR=$CONFIG_SND_KERNELSRC
42
-#include "$KERNDIR/include/$INCLUDE_VERSION_H"
44
-#include "$KERNDIR/include/$INCLUDE_UTSRELEASE_H"
50
- char kpatchlevel[128];
51
- char ksublevel[128];
55
- f=fopen("./conftestdata","w");
57
- for (ptr = UTS_RELEASE, dptr = kversion; *ptr != '\0' && isdigit(*ptr); ptr++, dptr++)
62
- for (dptr = kpatchlevel; *ptr != '\0' && isdigit(*ptr); ptr++, dptr++)
67
- for (dptr = ksublevel; *ptr != '\0' && isdigit(*ptr); ptr++, dptr++)
70
- for (dptr = kextra; *ptr != '\0'; ptr++, dptr++)
73
- fprintf(f,"%s:%s:%s:%s\n",kversion,kpatchlevel,ksublevel,kextra);
80
-}],kaversion=`cat conftestdata`,
83
-CFLAGS="$ac_save_CFLAGS"
84
-kversion=`echo $kaversion | cut -d : -f 1`
85
-kpatchlevel=`echo $kaversion | cut -d : -f 2`
86
-ksublevel=`echo $kaversion | cut -d : -f 3`
87
-kextraversion=`echo $kaversion | cut -d : -f 4`
88
+kaversion=`cd "$CONFIG_SND_KERNELSRC" && env -u MAKELEVEL make kernelversion`
89
+kversion=`echo $kaversion | cut -d . -f 1`
90
+kpatchlevel=`echo $kaversion | cut -d . -f 2`
91
+ksublevel=`echo $kaversion | cut -d . -f 3`
92
+kextraversion=`echo $kaversion | cut -d . -f 4`
93
kversion=`expr $kversion + 0`
94
kpatchlevel=`expr $kpatchlevel + 0`
95
ksublevel=`expr $ksublevel + 0`