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 fc344a7fc544ef1848d6db9671b148727989405c..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
@@
-123,16
+126,23
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-freebsd3"; exit 0
;;
echo "${MACHINE}-whatever-freebsd3"; exit 0
;;
- FreeBSD:*:*:*486*)
- echo "i486-whatever-freebsd"; 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
;;
;;
FreeBSD:*)
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
- NetBSD:*:*:*
4
86*)
-
echo "i486-whateve
r-netbsd"; exit 0
+ NetBSD:*:*:*
3
86*)
+
echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\
r-netbsd"; exit 0
;;
NetBSD:*)
;;
NetBSD:*)
@@
-233,7
+243,7
@@
esac
# At this point we gone through all the one's
# we know of: Punt
# At this point we gone through all the one's
# we know of: Punt
-echo "${MACHINE}-whatever-${SYSTEM}
|${RELEASE}|${VERSION}
"
+echo "${MACHINE}-whatever-${SYSTEM}"
exit 0
) 2>/dev/null | (
exit 0
) 2>/dev/null | (
@@
-243,7
+253,6
@@
exit 0
PREFIX=""
SUFFIX=""
PREFIX=""
SUFFIX=""
-VERBOSE="false"
TEST="false"
# pick up any command line args to config
TEST="false"
# pick up any command line args to config
@@
-251,21
+260,15
@@
for i
do
case "$i" in
-d*) PREFIX="debug-";;
do
case "$i" in
-d*) PREFIX="debug-";;
--v*) VERBOSE="true";;
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
-d Add a debug- prefix to machine choice.
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
-d Add a debug- prefix to machine choice.
- -v Verbose mode.
-t Test mode, do not run the Configure perl script.
-h This help.
Any other text will be passed to the Configure perl script.
-t Test mode, do not run the Configure perl script.
-h This help.
Any other text will be passed to the Configure perl script.
-Useful options include
- no-asm Build with no assember code.
- -Dxxx Add xxx define to compilation.
- -Lxxx Add xxx library include path to build.
- -lxxx Add xxx library to build.
+See INSTALL for instructions.
EOF
;;
EOF
;;
@@
-280,14
+283,20
@@
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
read GUESSOS
fi
# read the output of the embedded GuessOS
read GUESSOS
-if [ "$VERBOSE" = "true" ]; then
- echo GUESSOS $GUESSOS
-fi
+echo Operating system: $GUESSOS
# now map the output into SSLeay terms ... really should hack into the
# script above so we end up with values in vars but that would take
# now map the output into SSLeay terms ... really should hack into the
# script above so we end up with values in vars but that would take
@@
-297,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" ;;
@@
-312,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}'`;;
@@
-363,16
+373,16
@@
fi
OUT="$PREFIX$OUT"
OUT="$PREFIX$OUT"
-# at this point we have the answer ... which we could check again
-# and then fallback to a vanilla SSLeay build but then this script
-# wouldn't get updated
-echo Configuring for $OUT
+$PERL ./Configure 2>&1 | grep "$OUT" > /dev/null
+if [ $? = "0" ]; then
+ echo Configuring for $OUT
-if [ "$TEST" = "true" ]; then
- echo $PERL ./Configure $OUT $options
+ if [ "$TEST" = "true" ]; then
+ echo $PERL ./Configure $OUT $options
+ else
+ $PERL ./Configure $OUT $options
+ fi
else
else
- $PERL ./Configure $OUT $options
+ echo "This system ($OUT) is not supported. See file INSTALL for details."
fi
fi
-
)
)
-