summaryrefslogtreecommitdiffhomepage
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
commit30ec18d9382a24378baca4b2522541a3484bc817 (patch)
treee9a23f83052ee04b70e05c4d8aa08f105d9485fa
parent9d495ab2b5ab69ebb2cc65cc748a86d19d6be1d7 (diff)
parentb9073961f7ccb201a9b970b78ce50a496442b0ed (diff)
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()