From a9aa144d93c2979fce232396594925f3f295ea49 Mon Sep 17 00:00:00 2001 From: Douglas Stebila Date: Sun, 12 May 2019 14:58:16 -0400 Subject: [PATCH] Fix configure.ac auto-generation --- configure.ac | 4 ++-- .../configure.ac/ac_config_files.fragment | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1370155f0..b12ad12af 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,7 @@ SRCDIR=${SRCDIR}" src/kem \ SET_AM_CFLAGS AC_SUBST(SRCDIR) +##### OQS_COPY_FROM_PQCLEAN_FRAGMENT_AC_CONFIG_FILES_START AC_CONFIG_FILES([Makefile src/common/Makefile src/kem/Makefile @@ -71,13 +72,12 @@ AC_CONFIG_FILES([Makefile src/sig/picnic/Makefile src/sig/qtesla/Makefile src/kem/bike/Makefile -##### OQS_COPY_FROM_PQCLEAN_FRAGMENT_AC_CONFIG_FILES_START src/kem/frodokem/Makefile -##### OQS_COPY_FROM_PQCLEAN_FRAGMENT_AC_CONFIG_FILES_END src/kem/sike/Makefile src/kem/newhopenist/Makefile src/kem/kyber/Makefile tests/Makefile ]) +##### OQS_COPY_FROM_PQCLEAN_FRAGMENT_AC_CONFIG_FILES_END AC_OUTPUT diff --git a/scripts/copy_from_pqclean/configure.ac/ac_config_files.fragment b/scripts/copy_from_pqclean/configure.ac/ac_config_files.fragment index 64508af38..ebf8b7be3 100644 --- a/scripts/copy_from_pqclean/configure.ac/ac_config_files.fragment +++ b/scripts/copy_from_pqclean/configure.ac/ac_config_files.fragment @@ -1,3 +1,18 @@ -{% for family in families %} - src/kem/{{ family['name'] }}/Makefile{% endfor %} + +AC_CONFIG_FILES([Makefile + src/common/Makefile + src/kem/Makefile + src/crypto/sha3/Makefile + src/crypto/aes/Makefile + src/sig/Makefile + src/sig/picnic/Makefile + src/sig/qtesla/Makefile + src/kem/bike/Makefile +{%- for family in families %} + src/kem/{{ family['name'] }}/Makefile{% endfor %} + src/kem/sike/Makefile + src/kem/newhopenist/Makefile + src/kem/kyber/Makefile + tests/Makefile + ])