Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Nov 17, 2019
2 parents a0de623 + 003f2de commit b54a09b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions common/JackMetadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
#ifndef __JackMetadata__
#define __JackMetadata__

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include <stdint.h>

#if HAVE_DB
Expand Down
8 changes: 4 additions & 4 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down

0 comments on commit b54a09b

Please sign in to comment.