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 /libs | |
| 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 'libs')
| -rw-r--r-- | libs/libsndfile/SConscript | 7 |
1 files changed, 5 insertions, 2 deletions
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]) |