diff --git a/SConstruct b/SConstruct index 34a7071a66..84000ba90a 100644 --- a/SConstruct +++ b/SConstruct @@ -745,11 +745,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_init', language='CXX'): conf.env.Append(CCFLAGS='-DHAVE_FLAC') - use_flac = False -else: use_flac = True +else: + use_flac = False libraries['flac'] = conf.Finish () - # or if that fails... #libraries['flac'] = LibraryInfo (LIBS='FLAC') diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript index 3508a6994e..8401729bb7 100644 --- a/libs/libsndfile/SConscript +++ b/libs/libsndfile/SConscript @@ -29,7 +29,10 @@ sndfile = conf.Finish() libsndfile = sndfile.SharedLibrary('sndfile-ardour', sndfile_files) -sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ) +if use_flac: + sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ) +else: + sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure --disable-flac && cd -', ENV=os.environ) Default([sndfile_h,libsndfile])