|  | @@ -1,75 +0,0 @@
 | 
	
		
			
				|  |  | -	- use the compiler passed in $CC
 | 
	
		
			
				|  |  | -	- predefine iptables modules dir, since the check would
 | 
	
		
			
				|  |  | -	  always fail (cause of absolute search paths) and OpenADK
 | 
	
		
			
				|  |  | -	  (for now) doesn't compile iptables with shared objects
 | 
	
		
			
				|  |  | -	- do not discard compiler output from tests, they're useful
 | 
	
		
			
				|  |  | -	  for debugging
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | ---- iproute2-3.3.0.orig/configure	2012-03-20 01:27:12.000000000 +0100
 | 
	
		
			
				|  |  | -+++ iproute2-3.3.0/configure	2012-03-22 20:48:53.022784090 +0100
 | 
	
		
			
				|  |  | -@@ -17,7 +17,7 @@ int main(int argc, char **argv) {
 | 
	
		
			
				|  |  | - 	return 0;
 | 
	
		
			
				|  |  | - }
 | 
	
		
			
				|  |  | - EOF
 | 
	
		
			
				|  |  | --gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 
 | 
	
		
			
				|  |  | -+$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 
 | 
	
		
			
				|  |  | - if [ $? -eq 0 ]
 | 
	
		
			
				|  |  | - then
 | 
	
		
			
				|  |  | -     echo "TC_CONFIG_ATM:=y" >>Config
 | 
	
		
			
				|  |  | -@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - EOF
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | --if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
 | 
	
		
			
				|  |  | -+if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
 | 
	
		
			
				|  |  | - then
 | 
	
		
			
				|  |  | - 	echo "TC_CONFIG_XT:=y" >>Config
 | 
	
		
			
				|  |  | - 	echo "using xtables"
 | 
	
		
			
				|  |  | -@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
 | 
	
		
			
				|  |  | - }
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - EOF
 | 
	
		
			
				|  |  | --gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
 | 
	
		
			
				|  |  | -+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - if [ $? -eq 0 ]
 | 
	
		
			
				|  |  | - then
 | 
	
		
			
				|  |  | -@@ -128,7 +128,7 @@ int main(int argc, char **argv) {
 | 
	
		
			
				|  |  | - }
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - EOF
 | 
	
		
			
				|  |  | --gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
 | 
	
		
			
				|  |  | -+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - if [ $? -eq 0 ]
 | 
	
		
			
				|  |  | - then
 | 
	
		
			
				|  |  | -@@ -148,18 +148,8 @@ check_ipt()
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - check_ipt_lib_dir()
 | 
	
		
			
				|  |  | - {
 | 
	
		
			
				|  |  | --	IPT_LIB_DIR=""
 | 
	
		
			
				|  |  | --	for dir in /lib /usr/lib /usr/local/lib
 | 
	
		
			
				|  |  | --	do
 | 
	
		
			
				|  |  | --		for file in $dir/{xtables,iptables}/lib*t_*so ; do
 | 
	
		
			
				|  |  | --			if [ -f $file ]; then
 | 
	
		
			
				|  |  | --				echo ${file%/*}
 | 
	
		
			
				|  |  | --				echo "IPT_LIB_DIR:=${file%/*}" >> Config
 | 
	
		
			
				|  |  | --				return
 | 
	
		
			
				|  |  | --			fi
 | 
	
		
			
				|  |  | --		done
 | 
	
		
			
				|  |  | --	done
 | 
	
		
			
				|  |  | --	echo "not found!"
 | 
	
		
			
				|  |  | -+	echo "/usr/lib/$TABLES"
 | 
	
		
			
				|  |  | -+	echo "IPT_LIB_DIR:=/usr/lib/$TABLES" >> Config
 | 
	
		
			
				|  |  | - }
 | 
	
		
			
				|  |  | - 
 | 
	
		
			
				|  |  | - check_setns()
 | 
	
		
			
				|  |  | -@@ -172,7 +162,7 @@ int main(int argc, char **argv) 
 | 
	
		
			
				|  |  | - 	return 0;
 | 
	
		
			
				|  |  | - }
 | 
	
		
			
				|  |  | - EOF
 | 
	
		
			
				|  |  | --gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
 | 
	
		
			
				|  |  | -+$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
 | 
	
		
			
				|  |  | - if [ $? -eq 0 ]
 | 
	
		
			
				|  |  | - then
 | 
	
		
			
				|  |  | - 	echo "IP_CONFIG_SETNS:=y" >>Config
 |