projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix extension for various no- options
[openssl.git]
/
config
diff --git
a/config
b/config
index eef07d8436e7292d38fef0c1b2f4263870022894..4e7fd104309d9a61686d402c4e585b885ea9e988 100755
(executable)
--- a/
config
+++ b/
config
@@
-187,6
+187,10
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
;;
echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
;;
+ DragonFly:*)
+ echo "${MACHINE}-whatever-dragonfly"; exit 0
+ ;;
+
FreeBSD:*)
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
FreeBSD:*)
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
@@
-636,7
+640,14
@@
case "$GUESSOS" in
else
OUT="linux-x86_64"
fi ;;
else
OUT="linux-x86_64"
fi ;;
- *86-*-linux2) OUT="linux-elf" ;;
+ *86-*-linux2)
+ # On machines where the compiler understands -m32, prefer a
+ # config target that uses it
+ if $CC -m32 -E -x c /dev/null > /dev/null 2>&1; then
+ OUT="linux-x86"
+ else
+ OUT="linux-elf"
+ fi ;;
*86-*-linux1) OUT="linux-aout" ;;
*-*-linux?) OUT="linux-generic32" ;;
sun4[uv]*-*-solaris2)
*86-*-linux1) OUT="linux-aout" ;;
*-*-linux?) OUT="linux-generic32" ;;
sun4[uv]*-*-solaris2)
@@
-697,6
+708,7
@@
case "$GUESSOS" in
powerpc64-*-*bsd*) OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
ia64-*-*bsd*) OUT="BSD-ia64" ;;
powerpc64-*-*bsd*) OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
ia64-*-*bsd*) OUT="BSD-ia64" ;;
+ x86_64-*-dragonfly*) OUT="BSD-x86_64" ;;
amd64-*-*bsd*) OUT="BSD-x86_64" ;;
*86*-*-*bsd*) # mimic ld behaviour when it's looking for libc...
if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
amd64-*-*bsd*) OUT="BSD-x86_64" ;;
*86*-*-*bsd*) # mimic ld behaviour when it's looking for libc...
if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
@@
-903,8
+915,6
@@
OUT="$OUT"
$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then
$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then
- echo Configuring for $OUT
-
if [ "$VERBOSE" = "true" ]; then
echo $PERL $THERE/Configure $OUT $options
fi
if [ "$VERBOSE" = "true" ]; then
echo $PERL $THERE/Configure $OUT $options
fi
@@
-913,5
+923,6
@@
if [ $? = "0" ]; then
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."
+ exit 1
fi
)
fi
)