Patchwork build: support for Linux 3.7 UAPI

login
register
mail settings
Submitter Jan Engelhardt
Date Nov. 21, 2012, 11:05 p.m.
Message ID <1353539142-31631-1-git-send-email-jengelh@inai.de>
Download mbox | patch
Permalink /patch/201135/
State Superseded
Headers show

Comments

Jan Engelhardt - Nov. 21, 2012, 11:05 p.m.
In Linux 3.7, nfnetlink.h moved below include/uapi/. Make configure
recognize that. Furthermore, we can drop the unnecessary indirection
via backticks and just ask grep directly if there was any result.
---
Also available via

	git://git.inai.de/ipset master

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Jozsef Kadlecsik - Nov. 22, 2012, 8:29 p.m.
Hi Jan,

On Thu, 22 Nov 2012, Jan Engelhardt wrote:

> In Linux 3.7, nfnetlink.h moved below include/uapi/. Make configure
> recognize that. Furthermore, we can drop the unnecessary indirection
> via backticks and just ask grep directly if there was any result.

The patch is applied and pushed into the ipset git tree, thanks.

Best regards,
Jozsef 

> diff --git a/configure.ac b/configure.ac
> index 7a6aa33..dea392d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -68,7 +68,8 @@ fi
>  
>  AC_PROG_GREP
>  
> -if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
> +if ! $GREP -q "NFNL_SUBSYS_IPSET" "$ksourcedir/include/linux/netfilter/nfnetlink.h" && \
> +   ! $GREP -q "NFNL_SUBSYS_IPSET" "$ksourcedir/include/uapi/linux/netfilter/nfnetlink.h";
>  then
>  	AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
>  fi
> -- 
> 1.7.10.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/configure.ac b/configure.ac
index 7a6aa33..dea392d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,8 @@  fi
 
 AC_PROG_GREP
 
-if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
+if ! $GREP -q "NFNL_SUBSYS_IPSET" "$ksourcedir/include/linux/netfilter/nfnetlink.h" && \
+   ! $GREP -q "NFNL_SUBSYS_IPSET" "$ksourcedir/include/uapi/linux/netfilter/nfnetlink.h";
 then
 	AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
 fi