[netfilter-cvslog] r4542 - in trunk: libnetfilter_conntrack libnetfilter_log libnetfilter_queue libnfnetlink

laforge at netfilter.org laforge at netfilter.org
Thu Nov 17 14:07:09 CET 2005


Author: laforge at netfilter.org
Date: 2005-11-17 14:07:08 +0100 (Thu, 17 Nov 2005)
New Revision: 4542

Modified:
   trunk/libnetfilter_conntrack/autogen.sh
   trunk/libnetfilter_log/autogen.sh
   trunk/libnetfilter_queue/autogen.sh
   trunk/libnfnetlink/autogen.sh
Log:
add KERNEL_DIR option to autogen.sh for all new libraries (Krzysztof Oledzki)


Modified: trunk/libnetfilter_conntrack/autogen.sh
===================================================================
--- trunk/libnetfilter_conntrack/autogen.sh	2005-11-17 13:04:49 UTC (rev 4541)
+++ trunk/libnetfilter_conntrack/autogen.sh	2005-11-17 13:07:08 UTC (rev 4542)
@@ -7,7 +7,7 @@
     # the headers that we need from the lastest kernel version at autogen
     # stage.
 
-    INCLUDEDIR=/lib/modules/`uname -r`/build/include/linux
+    INCLUDEDIR=${KERNEL_DIR:-/lib/modules/`uname -r`/build}/include/linux
     if [ -f $INCLUDEDIR/netfilter/nfnetlink_conntrack.h ]
     then
     	TARGET=include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
@@ -17,7 +17,7 @@
 	sed 's/linux\/netfilter\/nfnetlink.h/libnfnetlink\/linux_nfnetlink.h/g' $TARGET > $TEMP
 	mv $TEMP $TARGET
     else
-    	echo "can't find nfnetlink_conntrack.h kernel file"
+    	echo "can't find nfnetlink_conntrack.h kernel file in $INCLUDEDIR"
     	exit 1
     fi
 }

Modified: trunk/libnetfilter_log/autogen.sh
===================================================================
--- trunk/libnetfilter_log/autogen.sh	2005-11-17 13:04:49 UTC (rev 4541)
+++ trunk/libnetfilter_log/autogen.sh	2005-11-17 13:07:08 UTC (rev 4542)
@@ -7,7 +7,7 @@
     # the headers that we need from the lastest kernel version at autogen
     # stage.
 
-    INCLUDEDIR=/lib/modules/`uname -r`/build/include/linux
+    INCLUDEDIR=${KERNEL_DIR:-/lib/modules/`uname -r`/build}/include/linux
     if [ -f $INCLUDEDIR/netfilter/nfnetlink_log.h ]
     then
     	TARGET=include/libnetfilter_log/linux_nfnetlink_log.h
@@ -29,7 +29,7 @@
 	print $0
 	}' $TEMP > $TARGET
     else
-    	echo "can't find nfnetlink_log.h kernel file"
+    	echo "can't find nfnetlink_log.h kernel file in $INCLUDEDIR"
     	exit 1
     fi
 }

Modified: trunk/libnetfilter_queue/autogen.sh
===================================================================
--- trunk/libnetfilter_queue/autogen.sh	2005-11-17 13:04:49 UTC (rev 4541)
+++ trunk/libnetfilter_queue/autogen.sh	2005-11-17 13:07:08 UTC (rev 4542)
@@ -7,7 +7,7 @@
     # the headers that we need from the lastest kernel version at autogen
     # stage.
 
-    INCLUDEDIR=/lib/modules/`uname -r`/build/include/linux
+    INCLUDEDIR=${KERNEL_DIR:-/lib/modules/`uname -r`/build}/include/linux
     if [ -f $INCLUDEDIR/netfilter/nfnetlink_queue.h ]
     then
     	TARGET=include/libnetfilter_queue/linux_nfnetlink_queue.h
@@ -29,7 +29,7 @@
 	print $0
 	}' $TEMP > $TARGET
     else
-    	echo "can't find nfnetlink_queue.h kernel file"
+    	echo "can't find nfnetlink_queue.h kernel file in $INCLUDEDIR"
     	exit 1
     fi
 }

Modified: trunk/libnfnetlink/autogen.sh
===================================================================
--- trunk/libnfnetlink/autogen.sh	2005-11-17 13:04:49 UTC (rev 4541)
+++ trunk/libnfnetlink/autogen.sh	2005-11-17 13:07:08 UTC (rev 4542)
@@ -7,14 +7,15 @@
     # the headers that we need from the lastest kernel version at autogen
     # stage.
 
-    INCLUDEDIR=/lib/modules/`uname -r`/build/include/linux
+    INCLUDEDIR=${KERNEL_DIR:-/lib/modules/`uname -r`/build}/include/linux
+
     if [ -f $INCLUDEDIR/netfilter/nfnetlink.h ]
     then
     	TARGET=include/libnfnetlink/linux_nfnetlink.h
     	echo "Copying nfnetlink.h to linux_nfnetlink.h"
     	cp $INCLUDEDIR/netfilter/nfnetlink.h $TARGET
     else
-    	echo "can't find nfnetlink.h kernel file"
+    	echo "can't find nfnetlink.h kernel file in $INCLUDEDIR"
     	exit 1
     fi
 }




More information about the netfilter-cvslog mailing list