# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1330163720 -3600
# Node ID b3b80062dbe9324946aa39fb2d2be249cd1a8c55
# Parent  03063b2a437df053dd8249400c6fc932815c1fff
ppp: build rp-pppoe.so (again)

diff -r 03063b2a437d -r b3b80062dbe9 ppp-pam/receipt
--- a/ppp-pam/receipt	Sat Feb 25 10:42:24 2012 +0100
+++ b/ppp-pam/receipt	Sat Feb 25 10:55:20 2012 +0100
@@ -18,7 +18,9 @@
 compile_rules()
 {
 	cd $src
+	grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ||
 	cat >> include/linux/if_pppol2tp.h <<EOT
+#ifndef __LINUX_IF_PPPOL2TP_H
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
  */
@@ -29,6 +31,7 @@
 	__u32 s_tunnel, s_session;	/* For matching incoming packets */
 	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
 };
+#endif
 EOT
 	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
 	./configure --prefix=/usr --mandir=/usr/share/man \
diff -r 03063b2a437d -r b3b80062dbe9 ppp/receipt
--- a/ppp/receipt	Sat Feb 25 10:42:24 2012 +0100
+++ b/ppp/receipt	Sat Feb 25 10:55:20 2012 +0100
@@ -14,7 +14,9 @@
 compile_rules()
 {
 	cd $src
+	grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ||
 	cat >> include/linux/if_pppol2tp.h <<EOT
+#ifndef __LINUX_IF_PPPOL2TP_H
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
  */
@@ -25,6 +27,7 @@
 	__u32 s_tunnel, s_session;	/* For matching incoming packets */
 	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
 };
+#endif
 EOT
 	./configure --prefix=/usr --mandir=/usr/share/man \
 	$CONFIGURE_ARGS &&