make libsndfile build with or without flac support based on flac version checking

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

diff --git a/SConstruct b/SConstruct
index 34a7071a664555d5c955f909827cc8af651dfc32..84000ba90a561fcb957324e5fe2a82ee633ad11c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -745,11 +745,10 @@ libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local
 conf = Configure (libraries['flac'])
 if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_init', language='CXX'):
     conf.env.Append(CCFLAGS='-DHAVE_FLAC')
-    use_flac = False
-else:
     use_flac = True
+else:
+    use_flac = False
 libraries['flac'] = conf.Finish ()
-
 # or if that fails...
 #libraries['flac']    = LibraryInfo (LIBS='FLAC')
 

diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript
index 3508a6994e2e608e08df1829c29cac1727bbd5ab..8401729bb758184943d1af3afccd11d8bdd6c029 100644 (file)
--- a/libs/libsndfile/SConscript
+++ b/libs/libsndfile/SConscript
@@ -29,7 +29,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])