#5881: Explicitly state all possible crypto backend source files so that they are...

diff --git a/configure.ac b/configure.ac
index 19930182c54776f8004ac8359df9782fe2135d1f..76272089ff67477984093a7d286d02ccd93eeede 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -173,6 +173,9 @@ AS_IF([test "x$CRYPTO_PKG" = "x"], [
     )
 ])
 
+AM_CONDITIONAL([CRYPTO_USE_OPENSSL],[test "x$CRYPTO_PKG" = "xopenssl"])
+AM_CONDITIONAL([CRYPTO_USE_CYASSL],[test "x$CRYPTO_PKG" = "xcyassl"])
+AM_CONDITIONAL([CRYPTO_USE_POLARSSL],[test "x$CRYPTO_PKG" = "xpolarssl"])
 AC_SUBST(CRYPTO_PKG)
 AC_SUBST(CRYPTO_CFLAGS)
 AC_SUBST(CRYPTO_LIBS)

diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index ae0b7c47bc98985a4b3a74906193d7b5adc7f69f..a77fafbe12f717838793b3b1dc74bc9c4c652a12 100644 (file)
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -31,7 +31,6 @@ libtransmission_a_SOURCES = \
   crypto.c \
   crypto-utils.c \
   crypto-utils-fallback.c \
-  crypto-utils-@CRYPTO_PKG@.c \
   error.c \
   fdlimit.c \
   file.c \
@@ -83,6 +82,16 @@ else
 libtransmission_a_SOURCES += file-posix.c
 endif
 
+if CRYPTO_USE_OPENSSL
+libtransmission_a_SOURCES += crypto-utils-openssl.c
+endif
+if CRYPTO_USE_CYASSL
+libtransmission_a_SOURCES += crypto-utils-cyassl.c
+endif
+if CRYPTO_USE_POLARSSL
+libtransmission_a_SOURCES += crypto-utils-polarssl.c
+endif
+
 noinst_HEADERS = \
   announcer.h \
   announcer-common.h \