006-linux-3.7-compat.patch (1483B)
1 --- a/configure.ac 2 +++ b/configure.ac 3 @@ -74,9 +74,10 @@ case "$host_os" in 4 [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) 5 6 AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , 7 - [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, 8 - KERNEL_INCLUDE=/usr/src/linux/include , 9 - [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) 10 + [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , 11 + [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, 12 + KERNEL_INCLUDE=/usr/src/linux/include , 13 + [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) 14 AC_SUBST(KERNEL_INCLUDE) 15 # We need the configure script to run with correct kernel headers. 16 # However we don't want to point to kernel source tree in compile time, 17 @@ -643,7 +644,14 @@ AC_EGREP_CPP(yes, 18 #ifdef SADB_X_EXT_NAT_T_TYPE 19 yes 20 #endif 21 -], [kernel_natt="yes"]) 22 +], [kernel_natt="yes"], [ 23 + AC_EGREP_CPP(yes, 24 + [#include <uapi/linux/pfkeyv2.h> 25 + #ifdef SADB_X_EXT_NAT_T_TYPE 26 + yes 27 + #endif 28 + ], [kernel_natt="yes"]) 29 +]) 30 ;; 31 freebsd*|netbsd*) 32 # NetBSD case 33 --- a/src/include-glibc/Makefile.am 34 +++ b/src/include-glibc/Makefile.am 35 @@ -1,14 +1,7 @@ 36 - 37 -.includes: ${top_builddir}/config.status 38 - ln -snf $(KERNEL_INCLUDE)/linux 39 - touch .includes 40 - 41 -all: .includes 42 - 43 EXTRA_DIST = \ 44 glibc-bugs.h \ 45 net/pfkeyv2.h \ 46 netinet/ipsec.h \ 47 sys/queue.h 48 49 -DISTCLEANFILES = .includes linux 50 +DISTCLEANFILES = linux