flac-handling fix, from trunk

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2084 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 8ea69bf902d2415ff0f5c6515e2b69634cf42e09..e461ca374dbf2a491781846a6e6c3a5cb35ade87 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -744,6 +744,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_set_read_callback', language='CXX'):
     conf.env.Append(CCFLAGS='-DHAVE_FLAC')
+    use_flac = True
+else:
+    use_flac = False
+    
 libraries['flac'] = conf.Finish ()
 
 # or if that fails...
@@ -1074,7 +1078,7 @@ env = conf.Finish()
 if env['NLS'] == 1:
     env.Append(CCFLAGS="-DENABLE_NLS")
 
-Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict')
+Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict use_flac')
 
 #
 # the configuration file may be system dependent

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