Merge branch 'develop'

Signed-off-by: falkTX <falktx@falktx.com>
jackaudio · Nov 17, 2019 · b54a09b · b54a09b
2 parents a0de623 + 003f2de
commit b54a09b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/common/JackMetadata.h b/common/JackMetadata.h
@@ -20,6 +20,10 @@
 #ifndef __JackMetadata__
 #define __JackMetadata__
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 
 #if HAVE_DB

diff --git a/wscript b/wscript
@@ -398,11 +398,11 @@ def configure(conf):
         else:
             conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32'
         # libdb does not work in mixed mode
-        conf.env['HAVE_DB'] = 0
-        conf.env['HAVE_DB_H'] = 0
-        conf.env['LIB_DB'] = []
+        conf.all_envs[lib32]['HAVE_DB'] = 0
+        conf.all_envs[lib32]['HAVE_DB_H'] = 0
+        conf.all_envs[lib32]['LIB_DB'] = []
         # no need for opus in 32bit mixed mode clients
-        conf.env['LIB_OPUS'] = []
+        conf.all_envs[lib32]['LIB_OPUS'] = []
         # someone tell me where this file gets written please..
         conf.write_config_header('config.h')