comparison configure.ac @ 998:3a32727986ee

Allow configure with libtomcrypt/libtommath directories missing if using bundled libraries
author Elan Ruusamäe <glen@delfi.ee>
date Wed, 28 Jan 2015 22:05:24 +0800
parents 7cd89d4e0335
children aac0095dc3b4
comparison
equal deleted inserted replaced
996:47643024fc90 998:3a32727986ee
658 fi 658 fi
659 659
660 AC_EXEEXT 660 AC_EXEEXT
661 661
662 # XXX there must be a nicer way to do this 662 # XXX there must be a nicer way to do this
663 if test $BUNDLED_LIBTOM = 1 ; then
663 AS_MKDIR_P(libtomcrypt/src/ciphers/aes) 664 AS_MKDIR_P(libtomcrypt/src/ciphers/aes)
664 AS_MKDIR_P(libtomcrypt/src/ciphers/safer) 665 AS_MKDIR_P(libtomcrypt/src/ciphers/safer)
665 AS_MKDIR_P(libtomcrypt/src/ciphers/twofish) 666 AS_MKDIR_P(libtomcrypt/src/ciphers/twofish)
666 AS_MKDIR_P(libtomcrypt/src/encauth/ccm) 667 AS_MKDIR_P(libtomcrypt/src/encauth/ccm)
667 AS_MKDIR_P(libtomcrypt/src/encauth/eax) 668 AS_MKDIR_P(libtomcrypt/src/encauth/eax)
708 AS_MKDIR_P(libtomcrypt/src/pk/ecc) 709 AS_MKDIR_P(libtomcrypt/src/pk/ecc)
709 AS_MKDIR_P(libtomcrypt/src/pk/katja) 710 AS_MKDIR_P(libtomcrypt/src/pk/katja)
710 AS_MKDIR_P(libtomcrypt/src/pk/pkcs1) 711 AS_MKDIR_P(libtomcrypt/src/pk/pkcs1)
711 AS_MKDIR_P(libtomcrypt/src/pk/rsa) 712 AS_MKDIR_P(libtomcrypt/src/pk/rsa)
712 AS_MKDIR_P(libtomcrypt/src/prngs) 713 AS_MKDIR_P(libtomcrypt/src/prngs)
714 LIBTOM_FILES="libtomcrypt/Makefile libtommath/Makefile"
715 fi
713 AC_CONFIG_HEADER(config.h) 716 AC_CONFIG_HEADER(config.h)
714 AC_CONFIG_FILES(Makefile libtomcrypt/Makefile libtommath/Makefile) 717 AC_CONFIG_FILES(Makefile $LIBTOM_FILES)
715 AC_OUTPUT 718 AC_OUTPUT
716 719
717 AC_MSG_NOTICE() 720 AC_MSG_NOTICE()
718 if test $BUNDLED_LIBTOM = 1 ; then 721 if test $BUNDLED_LIBTOM = 1 ; then
719 AC_MSG_NOTICE(Using bundled libtomcrypt and libtommath) 722 AC_MSG_NOTICE(Using bundled libtomcrypt and libtommath)