Enabled conditional FLAC importing.

git-svn-id: svn://localhost/ardour2/trunk@1653 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 7ad9dd84510f90c5c2fdf61e48bfb2ffbf6fea23..efcff18a8e3c2fe9b428640e8dd551e81fbdfba5 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -728,7 +728,8 @@ prep_libcheck(env, libraries['flac'])
 libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
 
 conf = Configure (libraries['flac'])
-conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX')
+if conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX'):
+    conf.env.Append('-DHAVE_FLAC')
 libraries['flac'] = conf.Finish ()
 
 # or if that fails...

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 717ac91e3b66eac365d012448ec394f298fdadea..9a3bf266ae6930d1003ad796df20041934602bb0 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -565,6 +565,9 @@ AudioFileSource::safe_file_extension(ustring file)
                file.rfind(".maud")== ustring::npos &&
                file.rfind(".vwe") == ustring::npos &&
                file.rfind(".paf") == ustring::npos &&
+#ifdef HAVE_FLAC
+               file.rfind(".flac")== ustring::npos &&
+#endif // HAVE_FLAC
 #ifdef HAVE_COREAUDIO
                file.rfind(".mp3") == ustring::npos &&
                file.rfind(".aac") == ustring::npos &&