Changed all the Configure scripts to bash instead of sh. Added RANLIB to all the Configure scripts and Makefiles. Initial check-in of Configdata script.

This commit is contained in:
joellen 2000-07-06 04:40:21 +00:00
parent a0b40c4261
commit 2d527c4931
12 changed files with 39 additions and 4 deletions

View File

@ -1,4 +1,4 @@
#!/bin/sh
#! /bin/bash
#
# Configure
#
@ -9,7 +9,7 @@
#
# Inquiries regarding the linux-wlan Open Source Project can be
# made directly to:
*
#
# AbsoluteValue Systems Inc.
# info@linux-wlan.com
# http://www.linux-wlan.com
@ -222,6 +222,7 @@ if [ ! "$PCMCIA_SRC" ] ; then
fi
ask_str "pcmcia-cs source dir" PCMCIA_SRC
$ECHO ""
# Alternate target install root dir - the value of this variable
# will prefix other variables, such as modules and pcmcia directories
ask_str "Alternate target install root directory on host" TARGET_ROOT_ON_HOST
@ -243,11 +244,13 @@ MODDIR=/lib/modules/$SRC_RELEASE
ask_str " Module install directory" MODDIR
TARGET_MODDIR=$TARGET_ROOT_ON_HOST$MODDIR
write_str TARGET_MODDIR
$ECHO ""
# PCMCIA script dir
ask_str "PCMCIA script directory" PCMCIA_DIR
TARGET_PCMCIA_DIR=$TARGET_ROOT_ON_HOST$PCMCIA_DIR
write_str TARGET_PCMCIA_DIR
$ECHO ""
# Just write some out (we're not prompting right now)
write_str INST_EXEDIR
@ -258,8 +261,6 @@ write_str TARGET_INST_EXEDIR
# How should the startup scripts be configured?
$ECHO ""
SYSV_INIT=n
if [ "$PREFIX" = "" ] ; then
if [ -d /etc/rc.d/init.d -o -d /etc/init.d -o -d /sbin/init.d ] ; then
@ -304,14 +305,20 @@ if [ ! WLAN_INSTALL_TYPE ] ; then
fi
ask_str "Install drivers as station (sta) or access point (ap)?" WLAN_INSTALL_TYPE
$ECHO ""
#=======================================================================
# Make sure our target architecture is correct
WLAN_TARGET_ARCH=$BUILD_ARCH
ask_str "Target Architecture? (i386 or ppc)" WLAN_TARGET_ARCH
$ECHO ""
ask_str "Prefix for build host compiler? (rarely needed)" HOST_COMPILE
$ECHO ""
dump_str 'HOST_AS=$(HOST_COMPILE)as'
dump_str 'HOST_LD=$(HOST_COMPILE)ld'
dump_str 'HOST_CC=$(HOST_COMPILE)gcc'
@ -321,6 +328,7 @@ dump_str 'HOST_NM=$(HOST_COMPILE)nm'
dump_str 'HOST_STRIP=$(HOST_COMPILE)strip'
dump_str 'HOST_OBJCOPY=$(HOST_COMPILE)objcopy'
dump_str 'HOST_OBJDUMP=$(HOST_COMPILE)objdump'
dump_str 'HOST_RANLIB=$(HOST_COMPILE)ranlib'
dump_str 'HOST_MAKE=make'
if [ "$CROSS_COMPILE_ENABLED" != "n" -a "$CROSS_COMPILE_ENABLED" != "y" ] ; then
@ -329,8 +337,11 @@ fi
ask_bool "Compiling with a cross compiler?" CROSS_COMPILE_ENABLED
$ECHO ""
if [ "$CROSS_COMPILE_ENABLED" = "y" ] ; then
ask_str "Prefix for cross compiler? (change if cross-compiling)" CROSS_COMPILE
$ECHO ""
else
CROSS_COMPILE=""
write_str CROSS_COMPILE
@ -345,6 +356,7 @@ dump_str 'CROSS_NM=$(CROSS_COMPILE)nm'
dump_str 'CROSS_STRIP=$(CROSS_COMPILE)strip'
dump_str 'CROSS_OBJCOPY=$(CROSS_COMPILE)objcopy'
dump_str 'CROSS_OBJDUMP=$(CROSS_COMPILE)objdump'
dump_str 'CROSS_RANLIB=$(CROSS_COMPILE)ranlib'
dump_str 'CROSS_MAKE=make'
#=======================================================================
@ -352,11 +364,13 @@ dump_str 'CROSS_MAKE=make'
ask_bool "Build for debugging (see doc/config.debug)" WLAN_DEBUG
$ECHO ""
#=======================================================================
# Should we build for Kernel based PCMCIA
ask_bool "Build for Kernel PCMCIA?" WLAN_KERN_PCMCIA
$ECHO ""
#=======================================================================
mv $CONFIG config.out

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -53,6 +53,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
# Implicit rules to handle the separate obj dirs

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =makep
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -56,6 +56,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -67,6 +68,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif

View File

@ -54,6 +54,7 @@ NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
@ -65,6 +66,7 @@ NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif