summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorElan Ruusamäe <glen@delfi.ee>2015-01-28 22:05:24 +0800
committerElan Ruusamäe <glen@delfi.ee>2015-01-28 22:05:24 +0800
commitb9073961f7ccb201a9b970b78ce50a496442b0ed (patch)
tree5eed01a43e6ce4ade808657b8c30429ddc03808d
parenta7a79d569a41b282da63c159fc8032b4472a2a73 (diff)
Allow configure with libtomcrypt/libtommath directories missing
if using bundled libraries
-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()