diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-07 14:59:04 +0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-07 14:59:04 +0400 |
| commit | 192295a094f5494ebd443877b2c457a41e871ee8 (patch) | |
| tree | 9c75a3a42024ad4f1d6df05e0dc66d2cb236067a /config | |
| parent | 7dfded5c26241f189439b4322d5e6aaf8837d888 (diff) | |
Merge main trunk to engine branch, all conflicts resolved.
Diffstat (limited to 'config')
| -rwxr-xr-x | config | 33 |
1 files changed, 10 insertions, 23 deletions
@@ -181,11 +181,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in QNX:*) case "$VERSION" in - 423) - echo "${MACHINE}-qssl-qnx32" + 4*) + echo "${MACHINE}-whatever-qnx4" ;; *) - echo "${MACHINE}-qssl-qnx" + echo "${MACHINE}-whatever-qnx" ;; esac exit 0 @@ -200,7 +200,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in ;; SunOS:5.*) - echo "${MACHINE}-sun-solaris2"; exit 0 + echo "${MACHINE}-whatever-solaris2"; exit 0 ;; SunOS:*) @@ -292,8 +292,6 @@ TEST="false" for i do case "$i" in -# shared library support (behnke@trustcenter.de) --shared) SHARED=true;; -d*) PREFIX="debug-";; -t*) TEST="true";; -h*) TEST="true"; cat <<EOF @@ -431,7 +429,7 @@ case "$GUESSOS" in arm*-*-linux2) OUT="linux-elf-arm" ;; *-*-linux2) OUT="linux-elf" ;; *-*-linux1) OUT="linux-aout" ;; - sun4u*-sun-solaris2) + sun4u*-*-solaris2) ISA64=`(isalist) 2>/dev/null | grep sparcv9` if [ "$ISA64" != "" -a "$CC" = "cc" -a $CCVER -ge 50 ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" @@ -440,10 +438,10 @@ case "$GUESSOS" in read waste < /dev/tty fi OUT="solaris-sparcv9-$CC" ;; - sun4m-sun-solaris2) OUT="solaris-sparcv8-$CC" ;; - sun4d-sun-solaris2) OUT="solaris-sparcv8-$CC" ;; - sun4*-sun-solaris2) OUT="solaris-sparcv7-$CC" ;; - *86*-sun-solaris2) OUT="solaris-x86-$CC" ;; + sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;; + sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;; + sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;; + *86*-*-solaris2) OUT="solaris-x86-$CC" ;; *-*-sunos4) OUT="sunos-$CC" ;; alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; @@ -511,17 +509,6 @@ then sleep 5 OUT=linux-sparcv8 fi -# To start with $OUT is never i86pc-sun-solaris2. Secondly why -# ban *all* assembler implementation if it can't stand only one, -# SHA-0 implementation. -#if [ "$OUT" = "i86pc-sun-solaris2" ] -#then -# ASM=`as -V /dev/null 2>&1` -# case "$ASM" in -# GNU*) ;; -# *) options="$options no-asm" ; echo "WARNING: You need the GNU assembler to use OpenSSL assembler code." ; echo "Sun as is not supported on Solaris x86." ;; -# esac -#fi case "$GUESSOS" in i386-*) options="$options 386" ;; @@ -577,7 +564,7 @@ OUT="$PREFIX$OUT" $PERL ./Configure LIST | grep "$OUT" > /dev/null if [ $? = "0" ]; then - echo Configuring for $OUT + #echo Configuring for $OUT if [ "$TEST" = "true" ]; then echo $PERL ./Configure $OUT $options |