aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-09-21 17:28:20 -0400
committerJack Lloyd <[email protected]>2017-09-21 17:28:20 -0400
commitc8325d7a363c25e01856082b53cc3f0f3cc33a3e (patch)
tree27c974592b718a85924841b336116b2e7e7bf562
parent5f1afd88522bf3244fdbb031cea055b66fa32e2e (diff)
Fix the amalgamation build
-rwxr-xr-xconfigure.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index 45ff3bc8c..c2b966ffb 100755
--- a/configure.py
+++ b/configure.py
@@ -2439,7 +2439,7 @@ def portable_symlink(file_path, target_dir, method):
class AmalgamationHelper(object):
_any_include_matcher = re.compile(r'#include <(.*)>$')
- _botan_include_matcher = re.compile(r'#include <botan/(.*)>$')
+ _botan_include_matcher = re.compile(r'#include <botan/(.*)>')
_std_include_matcher = re.compile(r'^#include <([^/\.]+|stddef.h)>$')
@staticmethod
@@ -2502,6 +2502,9 @@ class AmalgamationHeader(object):
if name in self.included_already:
return
+ if name == 'botan.h':
+ return
+
self.included_already.add(name)
if name not in self.file_contents: