projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of some unnecessary casts and add a necessary one.
[oweals/openssl.git]
/
config
diff --git
a/config
b/config
index 5f3446b05128dcf449919542a6fa47b3c1274cf5..e8cde735ddc6343d6dea32abfcb7909ebec44dc4 100755
(executable)
--- a/
config
+++ b/
config
@@
-82,8
+82,11
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
HP-UX:*)
HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "$HPUXVER" in
HP-UX:*)
HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "$HPUXVER" in
+ 11.*)
+ echo "${MACHINE}-hp-hpux11"; exit 0
+ ;;
10.*)
10.*)
- echo "${MACHINE}-hp-hpux10
.
"; exit 0
+ echo "${MACHINE}-hp-hpux10"; exit 0
;;
*)
echo "${MACHINE}-hp-hpux"; exit 0
;;
*)
echo "${MACHINE}-hp-hpux"; exit 0
@@
-280,6
+283,14
@@
if [ $? = "0" ]; then
CC=gcc
else
CC=cc
CC=gcc
else
CC=cc
+ if [ "$SYSTEM" = "SunOS" ]
+ then
+ case `cc -V 2>&1` in
+ *4*) CC=sc4;;
+ *5*) CC=sc5;;
+ *) CC=cc;;
+ esac
+ fi
fi
# read the output of the embedded GuessOS
fi
# read the output of the embedded GuessOS
@@
-295,6
+306,7
@@
case "$GUESSOS" in
ppc-*-linux2) OUT="linux-ppc" ;;
*-*-linux2) OUT="linux-elf" ;;
*-*-linux1) OUT="linux-aout" ;;
ppc-*-linux2) OUT="linux-ppc" ;;
*-*-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" ;;
*-*-sunos4) OUT="sunos-$CC" ;;
sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
*86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
*-*-sunos4) OUT="sunos-$CC" ;;
@@
-310,8
+322,8
@@
case "$GUESSOS" in
*-*-osf) OUT="alpha-cc" ;;
*-*-unixware*) OUT="unixware-2.0" ;;
*-sni-sysv4) OUT="SINIX" ;;
*-*-osf) OUT="alpha-cc" ;;
*-*-unixware*) OUT="unixware-2.0" ;;
*-sni-sysv4) OUT="SINIX" ;;
- *-hpux*) OUT="hpux-$CC" ;;
# these are all covered by the catchall below
# these are all covered by the catchall below
+ # *-hpux*) OUT="hpux-$CC" ;;
# *-aix) OUT="aix-$CC" ;;
# *-dgux) OUT="dgux" ;;
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
# *-aix) OUT="aix-$CC" ;;
# *-dgux) OUT="dgux" ;;
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
@@
-371,6
+383,6
@@
if [ $? = "0" ]; then
$PERL ./Configure $OUT $options
fi
else
$PERL ./Configure $OUT $options
fi
else
- echo "This system is not supported. See file INSTALL for details."
+ echo "This system
($OUT)
is not supported. See file INSTALL for details."
fi
)
fi
)