diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-06-29 14:45:49 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-06-29 14:45:49 +0000 |
commit | 2b2f34669e53cba52e8362bfda2ce1349ce4b58b (patch) | |
tree | 8f6cfec63c5df674b9f3a51696645f6668a67f7a /SConstruct | |
parent | 1cf9ed976abb2aa0c85175d91893990ff298d428 (diff) |
flac-handling fix, from trunk
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2084 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 8ea69bf902..e461ca374d 100644 --- a/SConstruct +++ b/SConstruct @@ -744,6 +744,10 @@ libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local conf = Configure (libraries['flac']) if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'): conf.env.Append(CCFLAGS='-DHAVE_FLAC') + use_flac = True +else: + use_flac = False + libraries['flac'] = conf.Finish () # or if that fails... @@ -1074,7 +1078,7 @@ env = conf.Finish() if env['NLS'] == 1: env.Append(CCFLAGS="-DENABLE_NLS") -Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict') +Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict use_flac') # # the configuration file may be system dependent |