From 003f2deb4eb938b2de7a3bff035f6a1171895b4b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 17 Nov 2019 21:18:17 +0000 Subject: Proper fix for mixed mode Signed-off-by: falkTX --- common/JackMetadata.h | 4 ++++ wscript | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/JackMetadata.h b/common/JackMetadata.h index cd66f8ac..7469737a 100644 --- 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 #if HAVE_DB diff --git a/wscript b/wscript index 513ac1cb..0621ae71 100644 --- 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') -- cgit v1.2.1