projects
/
crypto.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enabled AES assembler support on x86-64 in shared libraries.
[crypto.git]
/
lib
/
silccrypt
/
configure.ad
diff --git
a/lib/silccrypt/configure.ad
b/lib/silccrypt/configure.ad
index 721bea2aca855da7f26da32ae1ffbabd8f6a566a..64cf800b6938d2f144d1f7badf7026d72962a852 100644
(file)
--- a/
lib/silccrypt/configure.ad
+++ b/
lib/silccrypt/configure.ad
@@
-1,10
+1,9
@@
-#ifdef SILC_DIST_CRYPTO
#
# lib/silccrypt/configure.ad
#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
#
# lib/silccrypt/configure.ad
#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
-# Copyright (C) 2006 - 200
7
Pekka Riikonen
+# Copyright (C) 2006 - 200
8
Pekka Riikonen
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-16,16
+15,15
@@
# GNU General Public License for more details.
#
# GNU General Public License for more details.
#
-if test x$compile_libs = xtrue; then
-
AC_MSG_NOTICE([configuring crypto library])
SILC_CRYPTO_CFLAGS=
aes_asm=false
AC_MSG_NOTICE([configuring crypto library])
SILC_CRYPTO_CFLAGS=
aes_asm=false
+SILC_AES_ASM_FLAGS=
case "$host_cpu" in
i?86)
case "$host_cpu" in
i?86)
- AC_DEFINE([SILC_SHA256_
ASM], [], [SILC_SHA256_ASM
])
+ AC_DEFINE([SILC_SHA256_
X86], [], [SILC_SHA256_X86
])
if test "${pic_mode:-default}" != "yes" ; then
# Don't enable ASM AES with shared libs as the code doesn't support PIC.
if test "${pic_mode:-default}" != "yes" ; then
# Don't enable ASM AES with shared libs as the code doesn't support PIC.
@@
-38,8
+36,9
@@
case "$host_cpu" in
x86_64)
if test "${pic_mode:-default}" != "yes" ; then
x86_64)
if test "${pic_mode:-default}" != "yes" ; then
- if test x$have_assembler = xtrue
-a "$enable_shared" != "yes"
; then
+ if test x$have_assembler = xtrue; then
aes_asm=true
aes_asm=true
+ SILC_AES_ASM_FLAGS=-prefer-non-pic
AC_DEFINE([SILC_AES_ASM], [], [SILC_AES_ASM])
fi
fi
AC_DEFINE([SILC_AES_ASM], [], [SILC_AES_ASM])
fi
fi
@@
-55,17
+54,7
@@
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
-
-AC_CONFIG_FILES(
-lib/silccrypt/Makefile
-#ifdef SILC_DIST_INPLACE
-lib/silccrypt/tests/Makefile
-#endif SILC_DIST_INPLACE
-)
-
-fi # compile_libs
+AC_SUBST(SILC_AES_ASM_FLAGS)
# AM_CONDITIONAL is so bad that it itself cannot be defined in conditional
AM_CONDITIONAL(SILC_AES_ASM, test x$aes_asm = xtrue)
# AM_CONDITIONAL is so bad that it itself cannot be defined in conditional
AM_CONDITIONAL(SILC_AES_ASM, test x$aes_asm = xtrue)
-
-#endif SILC_DIST_CRYPTO