| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677 |
- - 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
- - additionally output the full compiler command before running
- it
- --- iproute2-2.6.37.orig/configure 2011-01-07 18:54:30.000000000 +0100
- +++ iproute2-2.6.37/configure 2011-02-25 21:01:53.000000000 +0100
- @@ -1,4 +1,5 @@
- #! /bin/bash
- +set -x
- # This is not an autconf generated configure
- #
- INCLUDE=${1:-"$PWD/include"}
- @@ -15,7 +16,8 @@ int main(int argc, char **argv) {
- return 0;
- }
- EOF
- -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
- +echo "$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm"
- +$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm
- if [ $? -eq 0 ]
- then
- echo "TC_CONFIG_ATM:=y" >>Config
- @@ -49,7 +51,8 @@ int main(int argc, char **argv)
-
- EOF
-
- -if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
- +echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables"
- +if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables
- then
- echo "TC_CONFIG_XT:=y" >>Config
- echo "using xtables"
- @@ -86,7 +89,8 @@ int main(int argc, char **argv) {
- }
-
- EOF
- -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
- +echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl"
- +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl
-
- if [ $? -eq 0 ]
- then
- @@ -126,7 +130,8 @@ int main(int argc, char **argv) {
- }
-
- EOF
- -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
- +echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl"
- +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl
-
- if [ $? -eq 0 ]
- then
- @@ -149,18 +154,8 @@ check_ipt()
-
- check_ipt_lib_dir()
- {
- - IPT_LIB_DIR=""
- - for dir in /lib /usr/lib /usr/local/lib
- - do
- - for file in $dir/$TABLES/lib*t_*so ; do
- - if [ -f $file ]; then
- - echo $dir/$TABLES
- - echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config
- - return
- - fi
- - done
- - done
- - echo "not found!"
- + echo "/usr/lib/$TABLES"
- + echo "IPT_LIB_DIR:=/usr/lib/$TABLES" >> Config
- }
-
- echo "# Generated config based on" $INCLUDE >Config
|
