1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
|
Author: Victor Seva <linuxmaniac@torreviejawireless.org>
Description: Add option to disable building the lwng command line utility
--- linux-wlan-ng-0.2.9+dfsg.orig/Configure
+++ linux-wlan-ng-0.2.9+dfsg/Configure
@@ -200,6 +200,11 @@
$ECHO ""
#=======================================================================
+# Should we build for linux-wlan tools
+
+ask_bool "Build linux-wlan-ng tools?" UTILS
+
+#=======================================================================
# Should we build for PCMCIA Card Services?
ask_bool "Build Prism2.x PCMCIA Card Services (_cs) driver?" PRISM2_PCMCIA
@@ -355,6 +360,12 @@
dump_str "KERNEL_MODFLAGS=$KERNEL_MODFLAGS"
#=======================================================================
+
+if [ $UTILS = "y" ] ; then
+ write_bool UTILS
+fi
+
+#=======================================================================
# If compiling for pcmcia-cs, find the PCMCIA source tree
if [ $PRISM2_PCMCIA = "y" ] ; then
@@ -382,16 +393,20 @@
$ECHO "pcmcia-cs source tree $PCMCIA_SRC is incomplete or missing!"
$ECHO "The wlan driver for pcmcia cannot be built without "
$ECHO "the pcmcia-cs source tree present and configured."
- fail
- fi
- if [ ! -f $PCMCIA_SRC/include/pcmcia/config.h ] ; then
+ PRISM2_PCMCIA=n
+ write_str PRISM2_PCMCIA
+ elif [ ! -f $PCMCIA_SRC/include/pcmcia/config.h ] ; then
$ECHO "The pcmcia-cs source tree does not appear to be configured."
$ECHO "The wlan driver for pcmcia cannot be built without "\
$ECHO "the pcmcia-cs source tree present and configured."
- fail
+ PRISM2_PCMCIA=n
+ write_str PRISM2_PCMCIA
fi
$ECHO ""
+ # Only if we're really building pcmcia..
+ if [ $PRISM2_PCMCIA = "y" ] ; then
+
# Now we need to generate the module options flags.
# It's only relevant if modversions is turned on.
grep CONFIG_MODVERSIONS=y < $PCMCIA_SRC/config.mk > /dev/null
@@ -407,6 +422,7 @@
PCMCIA_MODFLAGS="$KERNEL_MODFLAGS"
fi
dump_str "PCMCIA_MODFLAGS=$PCMCIA_MODFLAGS"
+ fi
fi
fi
@@ -485,9 +501,15 @@
$ECHO ""
+# Debian mod: Allow CC to be specified to set the compiler.
+if [ -z "$CC" ]; then
+ CC=gcc
+fi
+
+
dump_str 'HOST_AS=$(HOST_COMPILE)as'
dump_str 'HOST_LD=$(HOST_COMPILE)ld'
-dump_str 'HOST_CC=$(HOST_COMPILE)gcc'
+dump_str 'HOST_CC=$(HOST_COMPILE)'$CC
dump_str 'HOST_CPP=$(HOST_CC) -E'
dump_str 'HOST_AR=$(HOST_COMPILE)ar'
dump_str 'HOST_NM=$(HOST_COMPILE)nm'
@@ -509,7 +531,7 @@
if [ "_$CROSS_COMPILE" = "_" ] ; then
dump_str 'AS=$(HOST_COMPILE)as'
dump_str 'LD=$(HOST_COMPILE)ld'
-dump_str 'CC=$(HOST_COMPILE)gcc'
+dump_str 'CC=$(HOST_COMPILE)'$CC
dump_str 'CPP=$(HOST_CC) -E'
dump_str 'AR=$(HOST_COMPILE)ar'
dump_str 'NM=$(HOST_COMPILE)nm'
@@ -521,8 +543,8 @@
else
dump_str "AS=$CROSS_COMPILE"as
dump_str "LD=$CROSS_COMPILE"ld
-dump_str "CC=$CROSS_COMPILE"gcc
-CC="$CROSS_COMPILE"gcc
+dump_str "CC=$CROSS_COMPILE"$CC
+CC="$CROSS_COMPILE"$CC
dump_str "CPP=$CC -E"
dump_str "AR=$CROSS_COMPILE"ar
dump_str "NM=$CROSS_COMPILE"nm
|