From 73e851712db01b60ba354fb491d6183c223a529d Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 31 Mar 2000 16:18:57 +0000 Subject: [PATCH] Configure: Fixed the echo \c problem. hfa384x.h: Date mismatch? I don't think I changed it. wlandump/Makefile: Fixed target setup. wlandump/README: new file. wlandump/wlandump.addon: new file. --- Configure | 109 +++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/Configure b/Configure index 7a49080..01f7eb2 100755 --- a/Configure +++ b/Configure @@ -25,11 +25,12 @@ # all our stuff from pcmcia/config.mk. Would simplify alot of things. # +ECHO="/bin/echo -e " fail () { - echo "" - echo "Configuration failed" - echo "" + $ECHO "" + $ECHO "Configuration failed" + $ECHO "" exit 1 } @@ -38,7 +39,7 @@ if [ -r config.out ]; then . ./config.out 2> /dev/null else if [ ! -r config.in ]; then - echo "config.in does not exist!" + $ECHO "config.in does not exist!" fail fi . ./config.in @@ -48,12 +49,12 @@ fi PROMPT=y arg () { - VALUE="`echo X"$2" | sed -e 's/^X--[a-zA-Z_]*=//'`" + VALUE="`$ECHO X"$2" | sed -e 's/^X--[a-zA-Z_]*=//'`" eval $1=\"$VALUE\" } usage () { - echo "usage: $0 " + $ECHO "usage: $0 " exit 1 } @@ -70,35 +71,35 @@ cat << 'EOF' > $CONFIG EOF write_bool() { - value=`eval echo '$'$1` + value=`eval $ECHO '$'$1` if [ "$value" = "y" ] ; then - echo "$1=y" >> $CONFIG - echo "$1=y" >> $CONFIG_MK + $ECHO "$1=y" >> $CONFIG + $ECHO "$1=y" >> $CONFIG_MK else - echo "# $1 is not defined" >> $CONFIG - echo "# $1 is not defined" >> $CONFIG_MK + $ECHO "# $1 is not defined" >> $CONFIG + $ECHO "# $1 is not defined" >> $CONFIG_MK fi } write_str () { - value=`eval echo '$'$1` - echo "$1"=\"$value\" >> $CONFIG - echo "$1=$value" >> $CONFIG_MK + value=`eval $ECHO '$'$1` + $ECHO "$1"=\"$value\" >> $CONFIG + $ECHO "$1=$value" >> $CONFIG_MK } prompt () { eval $3=\"$2\" if [ "$PROMPT" = "y" ] ; then - /bin/echo "$1 [$2]: \c" + $ECHO "$1 [$2]: \c" read tmp if [ -n "$tmp" ] ; then eval $3=\"$tmp\" ; fi else - /bin/echo "$1 [$2]" + $ECHO "$1 [$2]" fi } ask_bool () { - default=`eval echo '$'$2` + default=`eval $ECHO '$'$2` if [ ! "$default" ] ; then default=n ; fi answer="" while [ "$answer" != "n" -a "$answer" != "y" ] ; do @@ -109,31 +110,31 @@ ask_bool () { } ask_str () { - default=`eval echo '$'$2` - prompt "$1" "`echo $default`" answer + default=`eval $ECHO '$'$2` + prompt "$1" "`$ECHO $default`" answer eval $2=\"$answer\" write_str $2 } #======================================================================= -echo "" -echo "---------------- Linux WLAN Configuration Script -------------" -echo "" -echo "The default responses are correct for most users." -echo "" +$ECHO "" +$ECHO "---------------- Linux WLAN Configuration Script -------------" +$ECHO "" +$ECHO "The default responses are correct for most users." +$ECHO "" # Collect the kernel source tree and test for sanity ask_str "Linux source directory" LINUX_SRC if [ ! -f $LINUX_SRC/Makefile ] ; then - echo "Linux source tree $LINUX_SRC is incomplete or missing!" + $ECHO "Linux source tree $LINUX_SRC is incomplete or missing!" if [ -d $LINUX_SRC/include/linux ] ; then - echo " The kernel header files are present, but not " \ + $ECHO " The kernel header files are present, but not " \ "the full source code." fi - echo " See the HOWTO for a list of FTP sites for current" \ + $ECHO " See the HOWTO for a list of FTP sites for current" \ "kernel sources." fail fi @@ -144,20 +145,20 @@ version () { expr $1 \* 65536 + $2 \* 256 + $3 } -echo "" +$ECHO "" for TAG in VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION ; do eval `sed -ne "/^$TAG/s/[ ]//gp" $LINUX_SRC/Makefile` done SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION VERSION_CODE=`version $VERSION $PATCHLEVEL $SUBLEVEL` -echo "The kernel source tree is version $SRC_RELEASE." +$ECHO "The kernel source tree is version $SRC_RELEASE." if [ $VERSION_CODE -lt `version 2 0 0` ] ; then - echo "This package requires at least a 2.0 series kernel." + $ECHO "This package requires at least a 2.0 series kernel." fail fi CUR_RELEASE=`uname -r` if [ "$SRC_RELEASE" != "$CUR_RELEASE" ] ; then - echo "WARNING: the current kernel is actually version $CUR_RELEASE." + $ECHO "WARNING: the current kernel is actually version $CUR_RELEASE." fi BUILD_ARCH=`uname -m | sed -e 's/i.86/i386/'` @@ -165,22 +166,22 @@ BUILD_ARCH=`uname -m | sed -e 's/i.86/i386/'` # Check for consistent kernel build dates CUR_D=`uname -v | sed -e 's/^#[0-9]* //;s/SMP //'` -CUR_D=`echo $CUR_D | sed -e 's/\(:[0-9][0-9]\) .* \([12][90]\)/\1 \2/'` -echo "The current kernel build date is $CUR_D." +CUR_D=`$ECHO $CUR_D | sed -e 's/\(:[0-9][0-9]\) .* \([12][90]\)/\1 \2/'` +$ECHO "The current kernel build date is $CUR_D." UTS_VERSION="unknown"; if [ -f $LINUX_SRC/include/linux/compile.h ] ; then UTS_VERSION=`grep UTS_VERSION $LINUX_SRC/include/linux/compile.h | sed -e 's/.*"\(.*\)"/\1/'` - SRC_D=`echo $UTS_VERSION | sed -e 's/^#[0-9]* //;s/SMP //'` - SRC_D=`echo $SRC_D | sed -e 's/\(:[0-9][0-9]\) .* \([12][90]\)/\1 \2/'` + SRC_D=`$ECHO $UTS_VERSION | sed -e 's/^#[0-9]* //;s/SMP //'` + SRC_D=`$ECHO $SRC_D | sed -e 's/\(:[0-9][0-9]\) .* \([12][90]\)/\1 \2/'` if [ $SRC_RELEASE = $CUR_RELEASE -a "$SRC_D" != "$CUR_D" ] ; then - echo "WARNING: the source tree has a build date of $SRC_D." + $ECHO "WARNING: the source tree has a build date of $SRC_D." if [ `date -d "$SRC_D" +%s` -gt `date -d "$CUR_D" +%s` ] ; then - echo " Did you forget to install your new kernel?!?" + $ECHO " Did you forget to install your new kernel?!?" fi fi fi -echo "" +$ECHO "" # PCMCIA Source dir PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'` @@ -201,7 +202,7 @@ if [ ! "$MODDIR" ] ; then MODDIR=/lib/modules/$SRC_RELEASE fi else - MODDIR=`echo $MODDIR | \ + MODDIR=`$ECHO $MODDIR | \ sed -e "s/[0-9]\.[0-9]\.[0-9]*\(-[A-Za-z0-9]*\)*/$SRC_RELEASE/"` fi ask_str " Module install directory" MODDIR @@ -218,28 +219,28 @@ write_str INST_EXEDIR # How should the startup scripts be configured? -echo "" +$ECHO "" if [ "$PREFIX" = "" ] ; then if [ -d /etc/rc.d/init.d -o -d /etc/init.d -o -d /sbin/init.d ] ; then - echo "It looks like you have a System V init file setup." + $ECHO "It looks like you have a System V init file setup." SYSV_INIT=y if [ -d /etc/rc.d/init.d ] ; then - echo "RC_DIR=/etc/rc.d" >> $CONFIG - echo "RC_DIR=/etc/rc.d" >> $CONFIG_MK + $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG + $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG_MK elif [ -d /sbin/init.d ] ; then - echo "RC_DIR=/sbin" >> $CONFIG - echo "RC_DIR=/sbin" >> $CONFIG_MK + $ECHO "RC_DIR=/sbin" >> $CONFIG + $ECHO "RC_DIR=/sbin" >> $CONFIG_MK else - echo "RC_DIR=/etc" >> $CONFIG - echo "RC_DIR=/etc" >> $CONFIG_MK + $ECHO "RC_DIR=/etc" >> $CONFIG + $ECHO "RC_DIR=/etc" >> $CONFIG_MK fi else - echo "It looks like you have a BSD-ish init file setup." + $ECHO "It looks like you have a BSD-ish init file setup." if ! grep rc.wlan /etc/rc.d/rc.S >/dev/null ; then - echo " You'll need to edit /etc/rc.d/rc.S to invoke" \ + $ECHO " You'll need to edit /etc/rc.d/rc.S to invoke" \ "/etc/rc.d/rc.wlan (for ISA/PCMCIA cards)" - echo " so that wlan cards will be started at boot time." + $ECHO " so that wlan cards will be started at boot time." fi SYSV_INIT= fi @@ -253,7 +254,7 @@ fi if [ ! -x /sbin/depmod ] ; then INSTALL_DEPMOD=n ; fi write_bool INSTALL_DEPMOD -echo "" +$ECHO "" #======================================================================= # Make sure our target architecture is the same as our build architecture. @@ -278,6 +279,6 @@ mv $CONFIG config.out touch .prereq.ok -echo "" -echo "Configuration successful." -echo "" +$ECHO "" +$ECHO "Configuration successful." +$ECHO ""