summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2015-01-28 22:49:40 +0800
committerMatt Johnston <matt@ucc.asn.au>2015-01-28 22:49:40 +0800
commit6b885c2df19144337bd2019646b6636ae547c451 (patch)
treed64acb2f521e73fc00408a466e0e93cd48d9bbc7
parent584afdc653a422ae34d7a23c38a88ae5205fc03a (diff)
parentc18ee5a041c9f5b71312b2009af022328f52c923 (diff)
downloaddropbear-6b885c2df19144337bd2019646b6636ae547c451.tar.gz
merge
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 29c0d40..b0e85e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,6 +660,7 @@ fi
AC_EXEEXT
# XXX there must be a nicer way to do this
+if test $BUNDLED_LIBTOM = 1 ; then
AS_MKDIR_P(libtomcrypt/src/ciphers/aes)
AS_MKDIR_P(libtomcrypt/src/ciphers/safer)
AS_MKDIR_P(libtomcrypt/src/ciphers/twofish)
@@ -710,8 +711,10 @@ AS_MKDIR_P(libtomcrypt/src/pk/katja)
AS_MKDIR_P(libtomcrypt/src/pk/pkcs1)
AS_MKDIR_P(libtomcrypt/src/pk/rsa)
AS_MKDIR_P(libtomcrypt/src/prngs)
+LIBTOM_FILES="libtomcrypt/Makefile libtommath/Makefile"
+fi
AC_CONFIG_HEADER(config.h)
-AC_CONFIG_FILES(Makefile libtomcrypt/Makefile libtommath/Makefile)
+AC_CONFIG_FILES(Makefile $LIBTOM_FILES)
AC_OUTPUT
AC_MSG_NOTICE()