projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make update
[openssl.git]
/
config
diff --git
a/config
b/config
index 26a79c91e0889c1ed2f61ae36d5e0475c8ef67db..94534cb3bb0834146b3fa18407378e8e591396f3 100755
(executable)
--- a/
config
+++ b/
config
@@
-20,7
+20,6
@@
# Be as similar to the output of config.guess/config.sub
# as possible.
# Be as similar to the output of config.guess/config.sub
# as possible.
-PREFIX=""
SUFFIX=""
TEST="false"
EXE=""
SUFFIX=""
TEST="false"
EXE=""
@@
-29,7
+28,7
@@
EXE=""
for i
do
case "$i" in
for i
do
case "$i" in
--d*)
PREFIX="debug-
";;
+-d*)
options=$options" --debug
";;
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
-t*) TEST="true";;
-h*) TEST="true"; cat <<EOF
Usage: config [options]
@@
-102,10
+101,6
@@
fi
# Now we simply scan though... In most cases, the SYSTEM info is enough
#
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
# 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
;;
@@
-122,18
+117,6
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-ibm-aix3"; exit 0
;;
echo "${MACHINE}-ibm-aix3"; exit 0
;;
- BeOS:*:BePC)
- if [ -e /boot/develop/headers/be/bone ]; then
- echo "beos-x86-bone"; exit 0
- else
- echo "beos-x86-r5"; exit 0
- fi
- ;;
-
- dgux:*)
- echo "${MACHINE}-dg-dgux"; exit 0
- ;;
-
HI-UX:*)
echo "${MACHINE}-hi-hiux"; exit 0
;;
HI-UX:*)
echo "${MACHINE}-hi-hiux"; exit 0
;;
@@
-336,10
+319,6
@@
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;
- ;;
-
MINGW*)
echo "${MACHINE}-whatever-mingw"; exit 0;
;;
MINGW*)
echo "${MACHINE}-whatever-mingw"; exit 0;
;;
@@
-355,18
+334,6
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
exit 0
;;
exit 0
;;
- *"CRAY T3E")
- echo "t3e-cray-unicosmk"; exit 0;
- ;;
-
- *CRAY*)
- echo "j90-cray-unicos"; exit 0;
- ;;
-
- NONSTOP_KERNEL*)
- echo "nsr-tandem-nsk"; exit 0;
- ;;
-
vxworks*)
echo "${MACHINE}-whatever-vxworks"; exit 0;
;;
vxworks*)
echo "${MACHINE}-whatever-vxworks"; exit 0;
;;
@@
-551,10
+518,12
@@
case "$GUESSOS" in
ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke './Configure darwin64-x86_64-cc' *manually*."
+ echo " invoke './Configure darwin64-x86_64-cc
$options
' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+ # The stty technique used elsewhere doesn't work on
+ # MacOS. At least, right now on this Mac.
+ sleep 5
fi
fi
if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
fi
fi
if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
@@
-845,14
+814,8
@@
case "$GUESSOS" in
fi
;;
# these are all covered by the catchall below
fi
;;
# these are all covered by the catchall below
- # *-dgux) OUT="dgux" ;;
- mips-sony-newsos4) OUT="newsos4-gcc" ;;
*-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
*-*-cygwin) OUT="Cygwin" ;;
*-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
*-*-cygwin) OUT="Cygwin" ;;
- t3e-cray-unicosmk) OUT="cray-t3e" ;;
- j90-cray-unicos) OUT="cray-j90" ;;
- nsr-tandem-nsk) OUT="tandem-c89" ;;
- beos-*) OUT="$GUESSOS" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
@@
-969,7
+932,7
@@
if [ $? = "0" ]; then
OUT="$OUT-$CC"
fi
OUT="$OUT-$CC"
fi
-OUT="$
PREFIX$
OUT"
+OUT="$OUT"
$PERL ./Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then
$PERL ./Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then