blob: 5a1d97f0ab3683fe8a406e196867671368fd78ab [file] [log] [blame]
diff -aruN a/configure b/configure
--- a/configure 2010-08-04 10:45:59.000000000 -0700
+++ b/configure 2011-02-24 14:32:49.448584669 -0800
@@ -2,6 +2,7 @@
# This is not an autconf generated configure
#
INCLUDE=${1:-"$PWD/include"}
+CC=${CC:gcc}
TABLES=
@@ -15,7 +16,7 @@
return 0;
}
EOF
-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
if [ $? -eq 0 ]
then
echo "TC_CONFIG_ATM:=y" >>Config
@@ -49,7 +50,7 @@
EOF
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
then
echo "TC_CONFIG_XT:=y" >>Config
echo "using xtables"
@@ -86,7 +87,7 @@
}
EOF
-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
if [ $? -eq 0 ]
then
@@ -126,7 +127,7 @@
}
EOF
-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
if [ $? -eq 0 ]
then
diff -aruN a/tc/Makefile b/tc/Makefile
--- a/tc/Makefile 2010-08-04 10:45:59.000000000 -0700
+++ b/tc/Makefile 2011-02-24 14:50:20.602868604 -0800
@@ -71,12 +71,20 @@
LDFLAGS += -Wl,-export-dynamic
endif
+ifneq ($(IPTL),)
+LDFLAGS += $(IPTL)
+endif
+
TCLIB := tc_core.o
TCLIB += tc_red.o
TCLIB += tc_cbq.o
TCLIB += tc_estimator.o
TCLIB += tc_stab.o
+ifneq ($(IPTC),)
+CFLAGS += $(IPTC)
+endif
+
CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB
ifneq ($(IPT_LIB_DIR),)
CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"