# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1422456580 -28800
# Node ID f19be6a28d7e258ec9048041c85b48a3f100ebbf
# Parent  d63b569a7c8639efc289a8ad838f94fe9c1fe5fe# Parent  3a32727986ee9f287ea271c8dc574070c0ef930a
merge

diff -r d63b569a7c86 -r f19be6a28d7e configure.ac
--- a/configure.ac	Wed Jan 28 22:49:28 2015 +0800
+++ b/configure.ac	Wed Jan 28 22:49:40 2015 +0800
@@ -660,6 +660,7 @@
 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/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()