aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 87c6d5b..e2f3cd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,15 +109,17 @@ int main() {return 0;}
109]) 109])
110 110
111AC_ARG_ENABLE([asm], 111AC_ARG_ENABLE([asm],
112 AS_HELP_STRING([--enable-asm], [Enable assembly])) 112 AS_HELP_STRING([--disable-asm], [Disable assembly]))
113# Disable below while updating to support upstream assembly changes 113# Disable below while updating to support upstream assembly changes
114AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = xyes]) 114AM_CONDITIONAL([OPENSSL_NO_ASM], [true])
115# AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"])
115 116
116# Conditionally enable assembly by default 117# Conditionally enable assembly by default
117AM_CONDITIONAL([HOST_ASM_ELF_ARM], 118AM_CONDITIONAL([HOST_ASM_ELF_ARM],
118 [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"]) 119 [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"])
119AM_CONDITIONAL([HOST_ASM_ELF_X86_64], 120AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
120 [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) 121 [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
122
121AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], 123AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
122 [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) 124 [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
123AM_CONDITIONAL([HOST_ASM_MASM_X86_64], 125AM_CONDITIONAL([HOST_ASM_MASM_X86_64],