Sun May 13 12:16:30 CEST 2007 Jochen Eisinger <coffee@silcnet.org>

	* Disable ASM if --with-pic was given.  Affected file is
	  lib/silccrypt/configure.ad

diff --git a/CHANGES b/CHANGES
index 4641fae1505dba1095a94b0b2384eba1cce6cfec..5c6211bc4a7d6f2cf462ae4e1f23a44a1107b9de 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Sun May 13 12:16:30 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
+
+       * Disable ASM if --with-pic was given.  Affected file is
+         lib/silccrypt/configure.ad
+
 Fri May 11 19:10:54 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Wakeup scheduler in silc_fsm_continue and silc_fsm_next_later

diff --git a/lib/silccrypt/configure.ad b/lib/silccrypt/configure.ad
index d392563f8acab0ce26d89e35d3885b158240758c..283a5ee92ec21c37d91e97ceb36fec3ebff7c3a3 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,6 +42,7 @@ case "$host_cpu" in
     aes_asm=false
     ;;
 esac
+fi
 
 SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
 if test x$summary_debug = xno; then