projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DSO_ctrl() changes have removed a couple of DSO_METHOD-specific functions
[oweals/openssl.git]
/
config
diff --git
a/config
b/config
index e9ab8befeec113fe49028d7ca27ae51beb55282e..6a2625308efbe1828adf3f6ce15ea241ea76f9da 100755
(executable)
--- a/
config
+++ b/
config
@@
-27,6
+27,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"
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
# Now test for ISC and SCO, since it is has a braindamaged uname.
#
# We need to work around FreeBSD 1.1.5.1
@@
-50,6
+51,8
@@
if [ "x$XREL" != "x" ]; then
4.2MP)
if [ "x$VERSION" = "x2.1.1" ]; then
echo "${MACHINE}-whatever-unixware211"; exit 0
4.2MP)
if [ "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
else
echo "${MACHINE}-whatever-unixware2"; exit 0
fi
else
echo "${MACHINE}-whatever-unixware2"; exit 0
fi
@@
-57,12
+60,21
@@
if [ "x$XREL" != "x" ]; then
4.2)
echo "whatever-whatever-unixware1"; exit 0
;;
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
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
;;
A/UX:*)
echo "m68k-apple-aux3"; exit 0
;;
@@
-156,7
+168,7
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
;;
NetBSD:*:*:*386*)
;;
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 | sed 's,.*\(.\)86-class.*,i\186,'`-whateve
r-netbsd"; exit 0
;;
NetBSD:*)
;;
NetBSD:*)
@@
-173,11
+185,11
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
QNX:*)
case "$VERSION" in
QNX:*)
case "$VERSION" in
- 4
23
)
- echo "${MACHINE}-
qssl-qnx32
"
+ 4
*
)
+ echo "${MACHINE}-
whatever-qnx4
"
;;
*)
;;
*)
- echo "${MACHINE}-
qssl
-qnx"
+ echo "${MACHINE}-
whatever
-qnx"
;;
esac
exit 0
;;
esac
exit 0
@@
-192,7
+204,7
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
;;
SunOS:5.*)
;;
SunOS:5.*)
- echo "${MACHINE}-
sun
-solaris2"; exit 0
+ echo "${MACHINE}-
whatever
-solaris2"; exit 0
;;
SunOS:*)
;;
SunOS:*)
@@
-239,6
+251,10
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
+ NEWS-OS:4.*)
+ echo "mips-sony-newsos4"; exit 0;
+ ;;
+
esac
#
esac
#
@@
-399,6
+415,8
@@
case "$GUESSOS" in
;;
mips-*-linux?) OUT="linux-mips" ;;
ppc-*-linux2) OUT="linux-ppc" ;;
;;
mips-*-linux?) OUT="linux-mips" ;;
ppc-*-linux2) OUT="linux-ppc" ;;
+ m68k-*-linux*) OUT="linux-m68k" ;;
+ ia64-*-linux?) OUT="linux-ia64" ;;
ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
sparc64-*-linux2)
#Before we can uncomment following lines we have to wait at least
ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
sparc64-*-linux2)
#Before we can uncomment following lines we have to wait at least
@@
-416,9
+434,10
@@
case "$GUESSOS" in
sun4d) OUT="linux-sparcv8" ;;
*) OUT="linux-sparcv7" ;;
esac ;;
sun4d) OUT="linux-sparcv8" ;;
*) OUT="linux-sparcv7" ;;
esac ;;
+ arm*-*-linux2) OUT="linux-elf-arm" ;;
*-*-linux2) OUT="linux-elf" ;;
*-*-linux1) OUT="linux-aout" ;;
*-*-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"
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"
@@
-427,10
+446,10
@@
case "$GUESSOS" in
read waste < /dev/tty
fi
OUT="solaris-sparcv9-$CC" ;;
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" ;;
*-*-sunos4) OUT="sunos-$CC" ;;
alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
*-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
@@
-444,8
+463,12
@@
case "$GUESSOS" in
*-*-openbsd) OUT="OpenBSD" ;;
*86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
*-*-osf) OUT="alpha-cc" ;;
*-*-openbsd) OUT="OpenBSD" ;;
*86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
*-*-osf) OUT="alpha-cc" ;;
- *-*-unixware*) OUT="unixware-2.0" ;;
- *-*-UnixWare*) OUT="unixware-2.0" ;;
+ *-*-unixware7) OUT="unixware-7" ;;
+ *-*-UnixWare7) OUT="unixware-7" ;;
+ *-*-Unixware7) OUT="unixware-7" ;;
+ *-*-unixware[1-2]*) OUT="unixware-2.0" ;;
+ *-*-UnixWare[1-2]*) OUT="unixware-2.0" ;;
+ *-*-Unixware[1-2]*) OUT="unixware-2.0" ;;
BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
*-siemens-sysv4) OUT="SINIX" ;;
BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
*-siemens-sysv4) OUT="SINIX" ;;
@@
-455,9
+478,16
@@
case "$GUESSOS" in
# these are all covered by the catchall below
# *-aix) OUT="aix-$CC" ;;
# *-dgux) OUT="dgux" ;;
# these are all covered by the catchall below
# *-aix) OUT="aix-$CC" ;;
# *-dgux) OUT="dgux" ;;
+ mips-sony-newsos4) OUT="newsos4-gcc" ;;
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
+# 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-sparcv9-gcc -a $GCCVER -lt 28 ]
then
# gcc < 2.8 does not support -mcpu=ultrasparc
if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
then
@@
-472,14
+502,6
@@
then
sleep 5
OUT=linux-sparcv8
fi
sleep 5
OUT=linux-sparcv8
fi
-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" ;;
case "$GUESSOS" in
i386-*) options="$options 386" ;;
@@
-526,16
+548,16
@@
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
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"
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
if [ $? = "0" ]; then
- echo Configuring for $OUT
+
#
echo Configuring for $OUT
if [ "$TEST" = "true" ]; then
echo $PERL ./Configure $OUT $options
if [ "$TEST" = "true" ]; then
echo $PERL ./Configure $OUT $options