flac-handling fix, from trunk

[ardour.git] / libs / libsndfile / SConscript

diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript
index 9e8ccc93f721a86ea7f09eb3ba2fdd240598cd42..150b820f55d99726ff37f9c7e097214fe06ce4cc 100644 (file)
--- 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])