Fix sndfile pkg-config name and SYSLIBS.

git-svn-id: svn://localhost/ardour2/branches/3.0@3748 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index d8bb19e1fbb39ad7b7868d965855b17e4fc7d9a3..9bfd864ea0f0c1e9055dcb0a3d38b6779be37ee3 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1071,7 +1071,11 @@ if env['SYSLIBS']:
                                             CPPPATH='#libs/appleutility')
     
     libraries['sndfile'] = LibraryInfo()
-    libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs libsndfile')
+    libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
+    
+    libraries['taglib'] = LibraryInfo(LIBS='libtaglib',
+                                      LIBPATH='#libs/taglib',
+                                      CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib'])
 
     coredirs = [
         'templates',

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index b3b710f990b0e0ce988dbf8146331d716d4f82c2..90202aa3d94e4f3deb2dcd7b2e2b8cd6b91292aa 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -228,7 +228,7 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
                        message = string_compose(_("A source file %1 already exists. This operation will not update that source but import the file %2 as a new source, please confirm."), wave_name, wave_name);
 
                }
-               MessageDialog dialog(message, false,Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
+               MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
 
                if (all_or_nothing) {
                        // disabled