slp
/
linux-wlan-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't prompt for pcmcia sources if using kernel pcmcia.

origin
solomon 2002-10-08 15:53:19 +00:00
parent d67830f2af
commit 87d437b46a
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -41,6 +41,8 @@
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
- Only prompt for pcmcia sources if we're using non-kernel pcmcia.
(original patch by Beat Bolli, rewritten a bit..)
- Add the Linksys WCF12 CF ident info.
- A bunch of compile fixes for older versions of wireless extensions.
- Added implementations of GIWTXPOWER and GIWRETRY

57
Configure
View File

@ -377,35 +377,41 @@ $ECHO ""
# If compiling for pcmcia-cs, find the PCMCIA source tree
if [ $PRISM2_PCMCIA = "y" ] ; then
if [ ! "$PCMCIA_SRC" ] ; then
if [ -f /sbin/cardctl ] ; then
PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'`
PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC
fi
fi
ask_str "pcmcia-cs source dir" PCMCIA_SRC
if [ ! -f $PCMCIA_SRC/Makefile ] ; then
$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
$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
fi
$ECHO ""
# Should we build for Kernel based PCMCIA?
WLAN_KERN_PCMCIA=y
grep 'define CONFIG_PCMCIA' < $LINUX_SRC/include/linux/autoconf.h > /dev/null
if [ $? = 1 ] ; then
WLAN_KERN_PCMCIA=n
fi
write_bool WLAN_KERN_PCMCIA
# Now we need to generate the module options flags.
# We only need the pcmcia source directory if we're NOT building for
# kernel PCMCIA.
if [ $WLAN_KERN_PCMCIA != "y" ] ; then
if [ ! "$PCMCIA_SRC" ] ; then
if [ -f /sbin/cardctl ] ; then
PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'`
PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC
fi
fi
ask_str "pcmcia-cs source dir" PCMCIA_SRC
if [ ! -f $PCMCIA_SRC/Makefile ] ; then
$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
$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
fi
$ECHO ""
# 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
if [ $? = 0 ] ; then
@ -413,17 +419,14 @@ if [ $PRISM2_PCMCIA = "y" ] ; then
else
PCMCIA_MODFLAGS="-DMODULE"
fi
# new versions of pcmcia-cs don't generate their own modversion.h
# if they don't have it, use the kernel module flags instead.
if [ ! -f $PCMCIA_SRC/include/linux/modversions.h ] ; then
PCMCIA_MODFLAGS="$KERNEL_MODFLAGS"
fi
dump_str "PCMCIA_MODFLAGS=$PCMCIA_MODFLAGS"
fi
write_bool WLAN_KERN_PCMCIA
fi
#=======================================================================