X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=config;h=234b4f288bf33078cabfd18f6556ee959524cc0a;hp=8a47ca102dea40a04948bab9a0f934c30fd92e7e;hb=9a310a5d4eb4ec9cf9ef0c19fb919a80f9895864;hpb=e0371fe4dc65ec62861e0ef293305442c0d97269 diff --git a/config b/config index 8a47ca102d..234b4f288b 100755 --- a/config +++ b/config @@ -20,6 +20,31 @@ # Be as similar to the output of config.guess/config.sub # 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 </dev/null` || MACHINE="unknown" @@ -27,6 +52,7 @@ RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" + # Now test for ISC and SCO, since it is has a braindamaged uname. # # We need to work around FreeBSD 1.1.5.1 @@ -48,8 +74,18 @@ if [ "x$XREL" != "x" ]; then echo "whatever-whatever-sco5"; exit 0 ;; 4.2MP) - if [ "x$VERSION" = "x2.1.1" ]; then + if [ "x$VERSION" = "x2.01" ]; then + echo "${MACHINE}-whatever-unixware201"; exit 0 + elif [ "x$VERSION" = "x2.02" ]; then + echo "${MACHINE}-whatever-unixware202"; exit 0 + elif [ "x$VERSION" = "x2.03" ]; then + echo "${MACHINE}-whatever-unixware203"; exit 0 + elif [ "x$VERSION" = "x2.1.1" ]; then echo "${MACHINE}-whatever-unixware211"; exit 0 + elif [ "x$VERSION" = "x2.1.2" ]; then + echo "${MACHINE}-whatever-unixware212"; exit 0 + elif [ "x$VERSION" = "x2.1.3" ]; then + echo "${MACHINE}-whatever-unixware213"; exit 0 else echo "${MACHINE}-whatever-unixware2"; exit 0 fi @@ -57,16 +93,33 @@ if [ "x$XREL" != "x" ]; then 4.2) echo "whatever-whatever-unixware1"; exit 0 ;; + 5) + if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x7" ]; then + echo "${MACHINE}-sco-unixware7"; exit 0 + fi + ;; esac fi fi # Now we simply scan though... In most cases, the SYSTEM info is enough # case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in + MPE/iX:*) + MACHINE=`echo "$MACHINE" | sed -e 's/-/_/g'` + echo "parisc-hp-MPE/iX"; exit 0 + ;; A/UX:*) echo "m68k-apple-aux3"; exit 0 ;; + AIX:[3456789]:4:*) + echo "${MACHINE}-ibm-aix43"; exit 0 + ;; + + AIX:*:[56789]:*) + echo "${MACHINE}-ibm-aix43"; exit 0 + ;; + AIX:*) echo "${MACHINE}-ibm-aix"; exit 0 ;; @@ -94,12 +147,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in esac ;; - IRIX:*) - echo "${MACHINE}-sgi-irix"; exit 0 + IRIX:5.*) + echo "mips2-sgi-irix"; exit 0 + ;; + + IRIX:6.*) + echo "mips3-sgi-irix"; exit 0 ;; IRIX64:*) - echo "${MACHINE}-sgi-irix64"; exit 0 + echo "mips4-sgi-irix64"; exit 0 ;; Linux:[2-9].*) @@ -110,6 +167,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-whatever-linux1"; exit 0 ;; + GNU*) + echo "hurd-x86"; exit 0; + ;; + LynxOS:*) echo "${MACHINE}-lynx-lynxos"; exit 0 ;; @@ -133,23 +194,26 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-whatever-bsdi"; exit 0 ;; - FreeBSD:*:*:*386*) - case `sysctl -n hw.model` in - Pentium*) - echo "i586-whatever-freebsd"; exit 0 - ;; - *) - echo "i386-whatever-freebsd"; exit 0 - ;; - esac; - ;; - FreeBSD:*) - echo "${MACHINE}-whatever-freebsd"; exit 0 - ;; + VERS=`echo ${RELEASE} | sed -e 's/[-(].*//'` + MACH=`sysctl -n hw.model` + ARCH='whatever' + case ${MACH} in + *386* ) MACH="i386" ;; + *486* ) MACH="i486" ;; + Pentium\ II*) MACH="i686" ;; + Pentium* ) MACH="i586" ;; + Alpha* ) MACH="alpha" ;; + * ) MACH="$MACHINE" ;; + esac + case ${MACH} in + i[0-9]86 ) ARCH="pc" ;; + esac + echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0 + ;; NetBSD:*:*:*386*) - echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-netbsd"; exit 0 + echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0 ;; NetBSD:*) @@ -166,11 +230,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 @@ -180,8 +244,24 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "i860-intel-osf1"; exit 0 ;; + Rhapsody:*) + echo "ppc-apple-rhapsody"; exit 0 + ;; + + Darwin:*) + case "$MACHINE" in + Power*) + echo "ppc-apple-darwin${VERSION}" + ;; + *) + echo "i386-apple-darwin${VERSION}" + ;; + esac + exit 0 + ;; + SunOS:5.*) - echo "${MACHINE}-sun-solaris2"; exit 0 + echo "${MACHINE}-whatever-solaris2"; exit 0 ;; SunOS:*) @@ -228,6 +308,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-v11-${SYSTEM}"; exit 0; ;; + NEWS-OS:4.*) + echo "mips-sony-newsos4"; exit 0; + ;; + esac # @@ -265,48 +349,53 @@ exit 0 # 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 <&1` -if [ $? = "0" ]; then +GCCVER=`(gcc --version) 2>/dev/null` +if [ "$GCCVER" != "" ]; then CC=gcc + # then strip off whatever prefix Cygnus prepends the number with... + GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'` + # peak single digit before and after first dot, e.g. 2.95.1 gives 29 + GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` else CC=cc - if [ "$SYSTEM" = "SunOS" ] - then - case `cc -V 2>&1` in - *4*) CC=cc;; - *5*) CC=cc;; - *) CC=sc3;; - esac +fi + +if [ "$SYSTEM" = "SunOS" ]; then + # check for WorkShop C, expected output is "cc: blah-blah C x.x" + CCVER=`(cc -V 2>&1) 2>/dev/null | \ + egrep -e '^cc: .* C [0-9]\.[0-9]' | \ + sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'` + CCVER=${CCVER:-0} + if [ $CCVER -gt 40 ]; then + CC=cc # overrides gcc!!! + if [ $CCVER -eq 50 ]; then + echo "WARNING! Detected WorkShop C 5.0. Do make sure you have" + echo " patch #107357-01 or later applied." + sleep 5 + fi + elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then + CC=sc3 + fi +fi + +if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then + # check for Compaq C, expected output is "blah-blah C Vx.x" + CCCVER=`(ccc -V 2>&1) 2>/dev/null | \ + egrep -e '.* C V[0-9]\.[0-9]' | \ + sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'` + CCCVER=${CCCVER:-0} + if [ $CCCVER -gt 60 ]; then + CC=ccc # overrides gcc!!! well, ccc outperforms inoticeably + # only on hash routines and des, otherwise gcc (2.95) + # keeps along rather tight... fi fi +GCCVER=${GCCVER:-0} +CCVER=${CCVER:-0} + # read the output of the embedded GuessOS read GUESSOS @@ -316,19 +405,115 @@ echo Operating system: $GUESSOS # script above so we end up with values in vars but that would take # more time that I want to waste at the moment case "$GUESSOS" in - alpha-*-linux2) OUT="alpha-gcc" ;; + mips2-sgi-irix) + CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=${CPU:-0} + if [ $CPU -ge 4000 ]; then + options="$options -mips2" + fi + OUT="irix-$CC" + ;; + mips3-sgi-irix) + CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=${CPU:-0} + if [ $CPU -ge 5000 ]; then + options="$options -mips4" + else + options="$options -mips3" + fi + OUT="irix-mips3-$CC" + ;; + 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 " Type return if you want to continue, Ctrl-C to abort." + 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=${CPU:-0} + if [ $CPU -ge 5000 ]; then + options="$options -mips4" + else + options="$options -mips3" + fi + OUT="irix-mips3-$CC" + ;; + alpha-*-linux2) + ISA=`awk '/cpu model/{print$4}' /proc/cpuinfo` + case ${ISA:-generic} in + *[67]) OUT="linux-alpha+bwx-$CC" ;; + *) OUT="linux-alpha-$CC" ;; + esac + if [ "$CC" = "gcc" ]; then + case ${ISA:-generic} in + EV5|EV45) options="$options -mcpu=ev5";; + EV56|PCA56) options="$options -mcpu=ev56";; + EV6|EV67|PCA57) options="$options -mcpu=ev6";; + esac + fi + ;; + mips-*-linux?) + cat >dummy.c < /* for printf() prototype */ + int main (argc, argv) int argc; char *argv[]; { +#ifdef __MIPSEB__ + printf ("linux-%s\n", argv[1]); +#endif +#ifdef __MIPSEL__ + printf ("linux-%sel\n", argv[1]); +#endif + return 0; +} +EOF + ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}` + rm dummy dummy.c + ;; ppc-*-linux2) OUT="linux-ppc" ;; - mips-*-linux?) OUT="linux-mips" ;; - sparc-*-linux2) OUT="linux-sparc" ;; - sparc64-*-linux2) OUT="linux-sparc64" ;; + m68k-*-linux*) OUT="linux-m68k" ;; + ia64-*-linux?) OUT="linux-ia64" ;; + ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; + ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; + i386-apple-darwin*) OUT="darwin-i386-cc" ;; + sparc64-*-linux2) + #Before we can uncomment following lines we have to wait at least + #till 64-bit glibc for SPARC is operational:-( + #echo "WARNING! If you wish to build 64-bit library, then you have to" + #echo " invoke './Configure linux64-sparcv9' *manually*." + #echo " Type return if you want to continue, Ctrl-C to abort." + #read waste < /dev/tty + OUT="linux-sparcv9" ;; + sparc-*-linux2) + KARCH=`awk '/^type/{print$3}' /proc/cpuinfo` + case ${KARCH:-sun4} in + sun4u*) OUT="linux-sparcv9" ;; + sun4m) OUT="linux-sparcv8" ;; + sun4d) OUT="linux-sparcv8" ;; + *) OUT="linux-sparcv7" ;; + esac ;; + arm*-*-linux2) OUT="linux-elf-arm" ;; + s390-*-linux2) OUT="linux-s390" ;; *-*-linux2) OUT="linux-elf" ;; *-*-linux1) OUT="linux-aout" ;; - sun4u-sun-solaris2) OUT="solaris-usparc-$CC" ;; - sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;; - *86*-sun-solaris2) OUT="solaris-x86-$CC" ;; + 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" + echo " invoke './Configure solaris64-sparcv9-cc' *manually*." + echo " Type return if you want to continue, Ctrl-C to abort." + if [ "$TEST" = "false" ]; then + read waste < /dev/tty + fi + fi + OUT="solaris-sparcv9-$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) OUT="FreeBSD" ;; + alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; + *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; + *-freebsd[1-2]*) OUT="FreeBSD" ;; *86*-*-netbsd) OUT="NetBSD-x86" ;; sun3*-*-netbsd) OUT="NetBSD-m68" ;; *-*-netbsd) OUT="NetBSD-sparc" ;; @@ -338,40 +523,60 @@ case "$GUESSOS" in *-*-openbsd) OUT="OpenBSD" ;; *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; *-*-osf) OUT="alpha-cc" ;; - *-*-unixware*) OUT="unixware-2.0" ;; + *-*-unixware7) OUT="unixware-7" ;; + *-*-UnixWare7) OUT="unixware-7" ;; + *-*-Unixware7) OUT="unixware-7" ;; + *-*-unixware20*) OUT="unixware-2.0" ;; + *-*-unixware21*) OUT="unixware-2.1" ;; + *-*-UnixWare20*) OUT="unixware-2.0" ;; + *-*-UnixWare21*) OUT="unixware-2.1" ;; + *-*-Unixware20*) OUT="unixware-2.0" ;; + *-*-Unixware21*) OUT="unixware-2.1" ;; BS2000-siemens-sysv4) OUT="BS2000-OSD" ;; RM*-siemens-sysv4) OUT="ReliantUNIX" ;; *-siemens-sysv4) OUT="SINIX" ;; + *-hpux1*) OUT="hpux-parisc-$CC" + options="$options -D_REENTRANT" ;; + *-hpux) OUT="hpux-parisc-$CC" ;; # these are all covered by the catchall below - # *-hpux*) OUT="hpux-$CC" ;; # *-aix) OUT="aix-$CC" ;; # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac +# NB: This atalla support has been superceded by the ENGINE support +# That contains its own header and definitions anyway. Support can +# be enabled or disabled on any supported platform without external +# headers, eg. by adding the "hw-atalla" switch to ./config or +# perl Configure +# +# See whether we can compile Atalla support +#if [ -f /usr/include/atasi.h ] +#then +# options="$options -DATALLA" +#fi + # gcc < 2.8 does not support -mcpu=ultrasparc -if [ "$OUT" = solaris-usparc-gcc ] +if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] then - GCCVERMAJOR="`echo $GCCVER | sed 's/.*version \([^.]*\).*/\1/`" - GCCVERMINOR="`echo $GCCVER | sed 's/.*version[^.]*\.\([^.]*\).*/\1/`" - echo "gcc version $GCCVERMAJOR.$GCCVERMINOR.x" - case "$GCCVERMAJOR" in - egcs*) - ;; - *) - if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ] - then - OUT=solaris-usparc-oldgcc - fi - ;; - esac + echo "WARNING! Do consider upgrading to gcc-2.8 or later." + sleep 5 + OUT=solaris-sparcv9-gcc27 +fi +if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] +then + echo "WARNING! Falling down to 'linux-sparcv8'." + echo " Upgrade to gcc-2.8 or later." + sleep 5 + OUT=linux-sparcv8 fi case "$GUESSOS" in i386-*) options="$options 386" ;; esac -for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha +for i in bf cast des dh dsa ec hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha do if [ ! -d crypto/$i ] then @@ -379,6 +584,27 @@ do fi done +# Discover Kerberos 5 (since it's still a prototype, we don't +# do any guesses yet, that's why this section is commented away. +#if [ -d /usr/kerberos ]; then +# krb5_dir=/usr/kerberos +# if [ \( -f $krb5_dir/lib/libgssapi_krb5.a -o -f $krb5_dir/lib/libgssapi_krb5.so* \)\ +# -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\ +# -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\ +# -a \( -f $krb5_dir/lib/libk5crypto.a -o -f $krb5_dir/lib/libk5crypto.so* \)\ +# -a \( -f $krb5_dir/include/krb5.h \) ]; then +# options="$options --with-krb5-flavor=MIT" +# fi +#elif [ -d /usr/heimdal ]; then +# krb5_dir=/usr/heimdal +# if [ \( -f $krb5_dir/lib/libgssapi.a -o -f $krb5_dir/lib/libgssapi.so* \)\ +# -a \( -f $krb5_dir/lib/libkrb5.a -o -f $krb5_dir/lib/libkrb5.so* \)\ +# -a \( -f $krb5_dir/lib/libcom_err.a -o -f $krb5_dir/lib/libcom_err.so* \)\ +# -a \( -f $krb5_dir/include/krb5.h \) ]; then +# options="$options --with-krb5-flavor=Heimdal" +# fi +#fi + if [ -z "$OUT" ]; then OUT="$CC" fi @@ -412,14 +638,14 @@ fi # compiler for the platform ... in which case we add it on # the end ... otherwise we leave it off -$PERL ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null +$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null if [ $? = "0" ]; then OUT="$OUT-$CC" fi OUT="$PREFIX$OUT" -$PERL ./Configure 2>&1 | grep "$OUT" > /dev/null +$PERL ./Configure LIST | grep "$OUT" > /dev/null if [ $? = "0" ]; then echo Configuring for $OUT