generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't read from tty in test mode

Browse Source
This commit is contained in:
Ulf Möller 2001-02-27 21:10:21 +00:00
parent 8700e7b3cf
commit 06a2b07bb0
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
config
View File

@ -20,6 +20,31 @@
# Be as similar to the output of config.guess/config.sub # Be as similar to the output of config.guess/config.sub
# as possible. # as possible.
PREFIX=""
SUFFIX=""
TEST="false"
# pick up any command line args to config
for i
do
case "$i" in
-d*) PREFIX="debug-";;
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
-d Add a debug- prefix to machine choice.
-t Test mode, do not run the Configure perl script.
-h This help.
Any other text will be passed to the Configure perl script.
See INSTALL for instructions.
EOF
;;
*) options=$options" $i" ;;
esac
done
# First get uname entries that we use below # First get uname entries that we use below
MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
@ -300,31 +325,6 @@ exit 0
# this is where the translation occurs into SSLeay terms # this is where the translation occurs into SSLeay terms
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
PREFIX=""
SUFFIX=""
TEST="false"
# pick up any command line args to config
for i
do
case "$i" in
-d*) PREFIX="debug-";;
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
-d Add a debug- prefix to machine choice.
-t Test mode, do not run the Configure perl script.
-h This help.
Any other text will be passed to the Configure perl script.
See INSTALL for instructions.
EOF
;;
*) options=$options" $i" ;;
esac
done
# figure out if gcc is available and if so we use it otherwise # figure out if gcc is available and if so we use it otherwise
# we fallback to whatever cc does on the system # we fallback to whatever cc does on the system
GCCVER=`(gcc --version) 2>/dev/null` GCCVER=`(gcc --version) 2>/dev/null`
@ -403,7 +403,9 @@ case "$GUESSOS" in
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke './Configure irix64-mips4-$CC' *manually*." echo " invoke './Configure irix64-mips4-$CC' *manually*."
echo " Type return if you want to continue, Ctrl-C to abort." echo " Type return if you want to continue, Ctrl-C to abort."
read waste < /dev/tty if [ "$TEST" = "false" ]; then
read waste < /dev/tty
fi
CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
CPU=${CPU:-0} CPU=${CPU:-0}
if [ $CPU -ge 5000 ]; then if [ $CPU -ge 5000 ]; then
@ -474,7 +476,9 @@ EOF
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke './Configure solaris64-sparcv9-cc' *manually*." echo " invoke './Configure solaris64-sparcv9-cc' *manually*."
echo " Type return if you want to continue, Ctrl-C to abort." echo " Type return if you want to continue, Ctrl-C to abort."
read waste < /dev/tty if [ "$TEST" = "false" ]; then
read waste < /dev/tty
fi
fi fi
OUT="solaris-sparcv9-$CC" ;; OUT="solaris-sparcv9-$CC" ;;
sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;; sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;;