From 2b2f34669e53cba52e8362bfda2ce1349ce4b58b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 29 Jun 2007 14:45:49 +0000 Subject: flac-handling fix, from trunk git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2084 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/libsndfile/SConscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript index 9e8ccc93f7..150b820f55 100644 --- a/libs/libsndfile/SConscript +++ b/libs/libsndfile/SConscript @@ -6,7 +6,7 @@ import glob sndfile_files = glob.glob('src/*.c') + glob.glob('src/GSM610/*.c') + glob.glob('src/G72x/*.c') -Import('env install_prefix libraries') +Import('env install_prefix libraries use_flac') sndfile = env.Copy() sndfile.Merge([libraries['flac'] ]) @@ -28,7 +28,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]) -- cgit v1.2.3