flac-handling fix, from trunk

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2084 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-06-29 14:45:49 +00:00
parent 1cf9ed976a
commit 2b2f34669e
2 changed files with 10 additions and 3 deletions

View file

@ -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])