Enable LCMS2 for other than OSX, where it still has some issues. Fixes bug #885324.

Fixed bugs:
  - https://launchpad.net/bugs/885324

(bzr r10969)

3 files changed, 20 insertions, 20 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index b52bb4062..fa6ef2726 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -42,9 +42,9 @@
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
 
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 #include "color-profile.h"
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 #include <gtkmm/stock.h>
 
@@ -151,9 +151,9 @@ DocumentProperties::DocumentProperties()
     build_guides();
     build_gridspage();
     build_snap();
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     build_cms();
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     build_scripting();
 
     _grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid));
@@ -312,7 +312,7 @@ void DocumentProperties::build_snap()
     attach_all(_page_snap.table(), array, G_N_ELEMENTS(array));
  }
 
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 /// Populates the available color profiles combo box
 void DocumentProperties::populate_available_profiles(){
 #if WITH_GTKMM_2_24
@@ -577,7 +577,7 @@ void DocumentProperties::build_cms()
     }
     _emb_profiles_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_linked_profiles_box));
 }
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 void DocumentProperties::build_scripting()
 {
@@ -702,13 +702,13 @@ void DocumentProperties::build_scripting()
     _new_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::addEmbeddedScript));
 
 
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     _ExternalScriptsList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::external_scripts_list_button_release));
     external_create_popup_menu(_ExternalScriptsList, sigc::mem_fun(*this, &DocumentProperties::removeExternalScript));
 
     _EmbeddedScriptsList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::embedded_scripts_list_button_release));
     embedded_create_popup_menu(_EmbeddedScriptsList, sigc::mem_fun(*this, &DocumentProperties::removeEmbeddedScript));
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 //TODO: review this observers code:
     const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
@@ -1054,10 +1054,10 @@ void DocumentProperties::update()
 
     //------------------------------------------------Color Management page
 
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     populate_linked_profiles_box();
     populate_available_profiles();
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
     _wr.setUpdating (false);
 }
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 103ace10b..783dfa208 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -50,21 +50,21 @@ protected:
     void  build_guides();
     void  build_snap();
     void  build_gridspage();
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     void  build_cms();
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     void  build_scripting();
     void  init();
 
     virtual void  on_response (int);
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     void  populate_available_profiles();
     void  populate_linked_profiles_box();
     void  linkSelectedProfile();
     void  removeSelectedProfile();
     void  linked_profiles_list_button_release(GdkEventButton* event);
     void  cms_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem);
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
     void  external_scripts_list_button_release(GdkEventButton* event);
     void  embedded_scripts_list_button_release(GdkEventButton* event);
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 845316f1a..4ae9d96af 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -689,7 +689,7 @@ void InkscapePreferences::initPageUI()
     this->AddPage(_page_grids, _("Grids"), iter_ui, PREFS_PAGE_UI_GRIDS);
 }
 
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 static void profileComboChanged( Gtk::ComboBoxText* combo )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -729,7 +729,7 @@ static void gamutColorChanged( Gtk::ColorButton* btn ) {
     prefs->setString("/options/softproof/gamutcolor", tmp);
     g_free(tmp);
 }
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 void InkscapePreferences::initPageIO()
 {
@@ -833,10 +833,10 @@ void InkscapePreferences::initPageIO()
     Glib::ustring intentLabels[numIntents] = {_("Perceptual"), _("Relative Colorimetric"), _("Saturation"), _("Absolute Colorimetric")};
     int intentValues[numIntents] = {0, 1, 2, 3};
 
-#if !ENABLE_LCMS
+#if !defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     Gtk::Label* lbl = new Gtk::Label(_("(Note: Color management has been disabled in this build)"));
     _page_cms.add_line( false, "", *lbl, "", "", true);
-#endif // !ENABLE_LCMS
+#endif // !defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
     _page_cms.add_group_header( _("Display adjustment"));
 
@@ -908,7 +908,7 @@ void InkscapePreferences::initPageIO()
 #endif // !defined(cmsFLAGS_PRESERVEBLACK)
 
 
-#if ENABLE_LCMS
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     {
         std::vector<Glib::ustring> names = ::Inkscape::CMSSystem::getDisplayNames();
         Glib::ustring current = prefs->getString( "/options/displayprofile/uri" );
@@ -969,7 +969,7 @@ void InkscapePreferences::initPageIO()
     _cms_proof_profile.set_sensitive( false );
     _cms_proof_blackpoint.set_sensitive( false );
     _cms_proof_preserveblack.set_sensitive( false );
-#endif // ENABLE_LCMS
+#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
     this->AddPage(_page_cms, _("Color management"), iter_io, PREFS_PAGE_IO_CMS);