summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-12-25 15:45:15 +0100
committerDr. Stephen Henson <steve@openssl.org>2011-12-25 15:45:15 +0100
commit7e159e0133d28bec9148446e8f4dd86c0216d819 (patch)
treea5ba445a32046f01da4e5a1346f0f974909cbe60 /Configure
parenttypo (diff)
downloadopenssl-7e159e0133d28bec9148446e8f4dd86c0216d819.tar.xz
openssl-7e159e0133d28bec9148446e8f4dd86c0216d819.zip
PR: 2535
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de> Reviewed by: steve Add SCTP support for DTLS (RFC 6083).
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure13
1 files changed, 12 insertions, 1 deletions
diff --git a/Configure b/Configure
index 75bd162f33..fec3a70777 100755
--- a/Configure
+++ b/Configure
@@ -10,7 +10,7 @@ use strict;
# see INSTALL for instructions.
-my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
+my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
# Options:
#
@@ -56,6 +56,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
# [no-]zlib [don't] compile support for zlib compression.
# zlib-dynamic Like "zlib", but the zlib library is expected to be a shared
# library and will be loaded in run-time by the OpenSSL library.
+# sctp include SCTP support
# 386 generate 80386 code
# no-sse2 disables IA-32 SSE2 code, above option implies no-sse2
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
@@ -709,6 +710,7 @@ my %disabled = ( # "what" => "comment" [or special keyword "experimental
"md2" => "default",
"rc5" => "default",
"rfc3779" => "default",
+ "sctp" => "default",
"shared" => "default",
"store" => "experimental",
"zlib" => "default",
@@ -791,6 +793,7 @@ PROCESS_ARGS:
# rewrite some options in "enable-..." form
s /^-?-?shared$/enable-shared/;
+ s /^sctp$/enable-sctp/;
s /^threads$/enable-threads/;
s /^zlib$/enable-zlib/;
s /^zlib-dynamic$/enable-zlib-dynamic/;
@@ -1445,6 +1448,14 @@ if (!$IsMK1MF)
}
}
+if (!defined($disabled{"sctp"}))
+ {
+ if ($target =~ /^solaris/)
+ {
+ $cflags = "$cflags -D_XPG4_2 -D__EXTENSIONS__";
+ }
+ }
+
$cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
#