# HG changeset patch # User Elan Ruusamäe # Date 1422453924 -28800 # Node ID 3a32727986ee9f287ea271c8dc574070c0ef930a # Parent 47643024fc9062b0e9ed22ab4252b53d339d0cdc Allow configure with libtomcrypt/libtommath directories missing if using bundled libraries diff -r 47643024fc90 -r 3a32727986ee configure.ac --- a/configure.ac Wed Jan 28 21:38:27 2015 +0800 +++ b/configure.ac Wed Jan 28 22:05:24 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()