X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fconfigure.ad;fp=lib%2Fsilccrypt%2Fconfigure.ad;h=d392563f8acab0ce26d89e35d3885b158240758c;hb=1c41d8bb1303a036c2c16abe416fdb7628f75c3d;hp=b9ccd4dadb01ee9bc548c765c4514dcd7f2d3bba;hpb=4dc3f89eed4c7e716873df2daf65fb8bd2bcc314;p=silc.git

diff --git a/lib/silccrypt/configure.ad b/lib/silccrypt/configure.ad
index b9ccd4da..d392563f 100644
--- a/lib/silccrypt/configure.ad
+++ b/lib/silccrypt/configure.ad
@@ -1,9 +1,10 @@
+#ifdef SILC_DIST_CRYPTO
 #
 #  lib/silccrypt/configure.ad
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2006 Pekka Riikonen
+#  Copyright (C) 2006 - 2007 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
@@ -23,13 +24,14 @@ SILC_CRYPTO_CFLAGS=
 aes_asm=false
 case "$host_cpu" in
   i?86)
-    if test x$have_assembler = xtrue; then
+    # Don't enable ASM AES with shared libs as the code doesn't support PIC.
+    if test x$have_assembler = xtrue -a "$enable_shared" != "yes"; then
       aes_asm=true
       AC_DEFINE([SILC_AES_ASM], [], [SILC_AES_ASM])
     fi
     ;;
   x86_64)
-    if test x$have_assembler = xtrue; then
+    if test x$have_assembler = xtrue -a "$enable_shared" != "yes"; then
       aes_asm=true
       AC_DEFINE([SILC_AES_ASM], [], [SILC_AES_ASM])
     fi
@@ -38,7 +40,6 @@ case "$host_cpu" in
     aes_asm=false
     ;;
 esac
-AM_CONDITIONAL(SILC_AES_ASM, test x$aes_asm = xtrue)
 
 SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
 if test x$summary_debug = xno; then
@@ -55,3 +56,8 @@ lib/silccrypt/tests/Makefile
 )
 
 fi	# compile_libs
+
+# 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