projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GH932: Add more help messages to some apps options.
[openssl.git]
/
config
diff --git
a/config
b/config
index 1683f0788857f2bcd294e43df5164e7308f79269..9dfe1c3d2b03bd22cc1e089569ed8c0300d011aa 100755
(executable)
--- a/
config
+++ b/
config
@@
-23,6
+23,7
@@
SUFFIX=""
TEST="false"
EXE=""
SUFFIX=""
TEST="false"
EXE=""
+THERE=`dirname $0`
# pick up any command line args to config
for i
# pick up any command line args to config
for i
@@
-32,7
+33,7
@@
case "$i" in
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
- -d
Add a debug- prefix to machine choic
e.
+ -d
Build with debugging when possibl
e.
-t Test mode, do not run the Configure perl script.
-h This help.
-t Test mode, do not run the Configure perl script.
-h This help.
@@
-201,6
+202,10
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
+ Haiku:*)
+ echo "${MACHINE}-whatever-haiku"; exit 0
+ ;;
+
NetBSD:*:*:*386*)
echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
;;
NetBSD:*:*:*386*)
echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
;;
@@
-323,15
+328,7
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-mingw"; exit 0;
;;
CYGWIN*)
echo "${MACHINE}-whatever-mingw"; exit 0;
;;
CYGWIN*)
- case "$RELEASE" in
- [bB]*|1.0|1.[12].*)
- echo "${MACHINE}-whatever-cygwin_pre1.3"
- ;;
- *)
- echo "${MACHINE}-whatever-cygwin"
- ;;
- esac
- exit 0
+ echo "${MACHINE}-pc-cygwin"; exit 0
;;
vxworks*)
;;
vxworks*)
@@
-484,10
+481,10
@@
case "$GUESSOS" in
;;
mips4-sgi-irix64)
echo "WARNING! If you wish to build 64-bit library, then you have to"
;;
mips4-sgi-irix64)
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure irix64-mips4-$CC' *manually*."
+ echo " invoke '
$THERE
/Configure irix64-mips4-$CC' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
#CPU=${CPU:-0}
fi
#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
#CPU=${CPU:-0}
@@
-503,10
+500,10
@@
case "$GUESSOS" in
ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure darwin64-ppc-cc' *manually*."
+ echo " invoke '
$THERE
/Configure darwin64-ppc-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
fi
if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
fi
fi
if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
@@
-518,7
+515,7
@@
case "$GUESSOS" in
ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure darwin64-x86_64-cc $options' *manually*."
+ echo " invoke '
$THERE
/Configure darwin64-x86_64-cc $options' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
# The stty technique used elsewhere doesn't work on
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
# The stty technique used elsewhere doesn't work on
@@
-556,10
+553,10
@@
case "$GUESSOS" in
ppc64-*-linux2)
if [ -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
ppc64-*-linux2)
if [ -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure linux-ppc64' *manually*."
+ echo " invoke '
$THERE
/Configure linux-ppc64' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
fi
if [ "$KERNEL_BITS" = "64" ]; then
fi
fi
if [ "$KERNEL_BITS" = "64" ]; then
@@
-573,10
+570,10
@@
case "$GUESSOS" in
ppc-*-linux2) OUT="linux-ppc" ;;
mips64*-*-linux2)
echo "WARNING! If you wish to build 64-bit library, then you have to"
ppc-*-linux2) OUT="linux-ppc" ;;
mips64*-*-linux2)
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure linux64-mips64' *manually*."
+ echo " invoke '
$THERE
/Configure linux64-mips64' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
OUT="linux-mips64"
;;
fi
OUT="linux-mips64"
;;
@@
-590,10
+587,10
@@
case "$GUESSOS" in
sparc64-*-linux2)
echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI"
echo " and wish to build 64-bit library, then you have to"
sparc64-*-linux2)
echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI"
echo " and wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure linux64-sparcv9' *manually*."
+ echo " invoke '
$THERE
/Configure linux64-sparcv9' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
OUT="linux-sparcv9" ;;
sparc-*-linux2)
fi
OUT="linux-sparcv9" ;;
sparc-*-linux2)
@@
-641,7
+638,7
@@
case "$GUESSOS" in
# echo " have to invoke './Configure linux32-s390x' *manually*."
# if [ "$TEST" = "false" -a -t -1 ]; then
# echo " You have about 5 seconds to press Ctrl-C to abort."
# echo " have to invoke './Configure linux32-s390x' *manually*."
# if [ "$TEST" = "false" -a -t -1 ]; then
# echo " You have about 5 seconds to press Ctrl-C to abort."
- # (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ # (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
# fi
#fi
OUT="linux64-s390x"
# fi
#fi
OUT="linux64-s390x"
@@
-663,14
+660,14
@@
case "$GUESSOS" in
*-*-linux2) OUT="linux-generic32" ;;
sun4[uv]*-*-solaris2)
OUT="solaris-sparcv9-$CC"
*-*-linux2) OUT="linux-generic32" ;;
sun4[uv]*-*-solaris2)
OUT="solaris-sparcv9-$CC"
- ISA64=`(isa
list
) 2>/dev/null | grep sparcv9`
+ ISA64=`(isa
info
) 2>/dev/null | grep sparcv9`
if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure solaris64-sparcv9-cc' *manually*."
+ echo " invoke '
$THERE
/Configure solaris64-sparcv9-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
# $GCC_ARCH denotes default ABI chosen by compiler driver
fi
elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
# $GCC_ARCH denotes default ABI chosen by compiler driver
@@
-679,18
+676,18
@@
case "$GUESSOS" in
# and therefore switch over to 64-bit. <appro>
OUT="solaris64-sparcv9-gcc"
echo "WARNING! If you wish to build 32-bit library, then you have to"
# and therefore switch over to 64-bit. <appro>
OUT="solaris64-sparcv9-gcc"
echo "WARNING! If you wish to build 32-bit library, then you have to"
- echo " invoke '
.
/Configure solaris-sparcv9-gcc' *manually*."
+ echo " invoke '
$THERE
/Configure solaris-sparcv9-gcc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
elif [ "$GCC_ARCH" = "-m32" ]; then
echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"
echo " and wish to build 64-bit library, then you have to"
fi
elif [ "$GCC_ARCH" = "-m32" ]; then
echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"
echo " and wish to build 64-bit library, then you have to"
- echo " invoke '
.
/Configure solaris64-sparcv9-gcc' *manually*."
+ echo " invoke '
$THERE
/Configure solaris64-sparcv9-gcc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
fi
fi
fi
fi
fi
@@
-702,7
+699,7
@@
case "$GUESSOS" in
sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
*86*-*-solaris2)
sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
*86*-*-solaris2)
- ISA64=`(isa
list
) 2>/dev/null | grep amd64`
+ ISA64=`(isa
info
) 2>/dev/null | grep amd64`
if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
OUT="solaris64-x86_64-$CC"
else
if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
OUT="solaris64-x86_64-$CC"
else
@@
-731,6
+728,8
@@
case "$GUESSOS" in
*ELF*) OUT="BSD-x86-elf" ;;
*) OUT="BSD-x86"; options="$options no-sse2" ;;
esac ;;
*ELF*) OUT="BSD-x86-elf" ;;
*) OUT="BSD-x86"; options="$options no-sse2" ;;
esac ;;
+ x86_64-*-haiku) OUT="haiku-x86_64" ;;
+ *-*-haiku) OUT="haiku-x86" ;;
*-*-*bsd*) OUT="BSD-generic32" ;;
*-*-osf) OUT="osf1-alpha-cc" ;;
*-*-*bsd*) OUT="BSD-generic32" ;;
*-*-osf) OUT="osf1-alpha-cc" ;;
@@
-768,14
+767,19
@@
case "$GUESSOS" in
OUT=${OUT:-"hpux-parisc2-${CC}"}
if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
echo "WARNING! If you wish to build 64-bit library then you have to"
OUT=${OUT:-"hpux-parisc2-${CC}"}
if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
echo "WARNING! If you wish to build 64-bit library then you have to"
- echo " invoke '
.
/Configure hpux64-parisc2-cc' *manually*."
+ echo " invoke '
$THERE
/Configure hpux64-parisc2-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
fi
fi
fi
+ # PA-RISC 2.0 is no longer supported as separate 32-bit
+ # target. This is compensated for by run-time detection
+ # in most critical assembly modules and taking advantage
+ # of 2.0 architecture in PA-RISC 1.1 build.
+ OUT="hpux-parisc1_1-${CC}"
elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
- OUT="hpux-parisc-${CC}"
+ OUT="hpux-parisc
1_1
-${CC}"
elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
OUT="hpux-parisc-${CC}"
else # Motorola(?) CPU
elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
OUT="hpux-parisc-${CC}"
else # Motorola(?) CPU
@@
-800,10
+804,10
@@
case "$GUESSOS" in
OUT="aix-cc"
if [ $KERNEL_BITS -eq 64 ]; then
echo "WARNING! If you wish to build 64-bit kit, then you have to"
OUT="aix-cc"
if [ $KERNEL_BITS -eq 64 ]; then
echo "WARNING! If you wish to build 64-bit kit, then you have to"
- echo " invoke '
.
/Configure aix64-cc' *manually*."
+ echo " invoke '
$THERE
/Configure aix64-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have ~5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have ~5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ (trap "stty `stty -g`
; exit 0
" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
fi
fi
fi
fi
fi
@@
-814,12
+818,14
@@
case "$GUESSOS" in
fi
;;
# these are all covered by the catchall below
fi
;;
# these are all covered by the catchall below
-
*-*-cygwin_pre1.3) OUT="Cygwin-pre1.3
" ;;
- *-*-cygwin) OUT="Cygwin" ;;
+
i[3456]86-*-cygwin) OUT="Cygwin-x86
" ;;
+ *-*-cygwin) OUT="Cygwin
-${MACHINE}
" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
- armv[7-9]*-*-android) OUT="android-armv7" ;;
+ armv[7-9]*-*-android)
+ OUT="android-armeabi"; options="$options -march=armv7-a" ;;
+ arm*-*-android) OUT="android-armeabi" ;;
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
@@
-867,7
+873,7
@@
esac
for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha
do
for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha
do
- if [ ! -d crypto/$i ]
+ if [ ! -d
$THERE/
crypto/$i ]
then
options="$options no-$i"
fi
then
options="$options no-$i"
fi
@@
-906,21
+912,21
@@
fi
# compiler for the platform ... in which case we add it on
# the end ... otherwise we leave it off
# compiler for the platform ... in which case we add it on
# the end ... otherwise we leave it off
-$PERL
.
/Configure LIST | grep "$OUT-$CC" > /dev/null
+$PERL
$THERE
/Configure LIST | grep "$OUT-$CC" > /dev/null
if [ $? = "0" ]; then
OUT="$OUT-$CC"
fi
OUT="$OUT"
if [ $? = "0" ]; then
OUT="$OUT-$CC"
fi
OUT="$OUT"
-$PERL
.
/Configure LIST | grep "$OUT" > /dev/null
+$PERL
$THERE
/Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then
echo Configuring for $OUT
if [ "$TEST" = "true" ]; then
if [ $? = "0" ]; then
echo Configuring for $OUT
if [ "$TEST" = "true" ]; then
- echo $PERL
.
/Configure $OUT $options
+ echo $PERL
$THERE
/Configure $OUT $options
else
else
- $PERL
.
/Configure $OUT $options
+ $PERL
$THERE
/Configure $OUT $options
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."