X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=blobdiff_plain;f=lib%2Fsilccrypt%2Fconfigure.ad;h=64cf800b6938d2f144d1f7badf7026d72962a852;hp=53949e4ad360ba7b11d654cee5cd1fb3763b7316;hb=6d9fec66fd86ab5bc5de8f63c45363ef2c26b490;hpb=80dc2a39c614ea1376a2e19ebe2460af11c9afee

diff --git a/lib/silccrypt/configure.ad b/lib/silccrypt/configure.ad
index 53949e4a..64cf800b 100644
--- a/lib/silccrypt/configure.ad
+++ b/lib/silccrypt/configure.ad
@@ -19,6 +19,7 @@ AC_MSG_NOTICE([configuring crypto library])
 SILC_CRYPTO_CFLAGS=
 
 aes_asm=false
+SILC_AES_ASM_FLAGS=
 
 case "$host_cpu" in
   i?86)
@@ -35,8 +36,9 @@ case "$host_cpu" in
   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
+	SILC_AES_ASM_FLAGS=-prefer-non-pic
         AC_DEFINE([SILC_AES_ASM], [], [SILC_AES_ASM])
       fi
     fi
@@ -52,6 +54,7 @@ if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
 fi
 
 AC_SUBST(SILC_CRYPTO_CFLAGS)
+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)