Merged silc_1_1_branch to trunk.

[silc.git] / lib / silccrypt / configure.ad

diff --git a/lib/silccrypt/configure.ad b/lib/silccrypt/configure.ad
index d392563f8acab0ce26d89e35d3885b158240758c..dbc58ab636f0c7f3b64db59676fe106c83d0e16d 100644 (file)
--- a/lib/silccrypt/configure.ad
+++ b/lib/silccrypt/configure.ad
@@ -22,6 +22,8 @@ AC_MSG_NOTICE([configuring crypto library])
 SILC_CRYPTO_CFLAGS=
 
 aes_asm=false
+
+if test "${pic_mode:-default}" != "yes" ; then
 case "$host_cpu" in
   i?86)
     # Don't enable ASM AES with shared libs as the code doesn't support PIC.
@@ -40,9 +42,10 @@ case "$host_cpu" in
     aes_asm=false
     ;;
 esac
+fi
 
 SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
-if test x$summary_debug = xno; then
+if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
   SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer -O3)
 fi