Flipped LCMS on

diff --git a/configure.ac b/configure.ac
index ac889fef3bc26e6a98f2a4081f37841e2ffbd6a5..0a5a6dffce34252ed4a217d2f8815255b969bd45 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -427,8 +427,8 @@ dnl LittleCms checking
 dnl ******************************
 
 AC_ARG_ENABLE(lcms,
-       AC_HELP_STRING([--enable-lcms], [enable LittleCms for color management (disabled by default)]),
-       [enable_lcms=$enableval], [enable_lcms=no])
+       AC_HELP_STRING([--enable-lcms], [enable LittleCms for color management]),
+       [enable_lcms=$enableval], [enable_lcms=yes])
 
 if test "x$enable_lcms" = "xno"; then
        dnl Asked to ignore LittleCms

diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index dc9b6fdd6db8ec0f24441ad2e736055bd4acaa82..dc9de8d2b367e7ea2027ec8eb5d91a429aa3974e 100644 (file)
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -98,10 +98,10 @@ typedef enum {
 } colorFlavorType;
 
 static const GtkTargetEntry sourceColorEntries[] = {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
 //    {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
     {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
     {"application/x-color", 0, APP_X_COLOR},
     {"text/plain", 0, TEXT_DATA},
 };
@@ -234,10 +234,10 @@ static void dieDieDie( GtkObject *obj, gpointer user_data )
 }
 
 static const GtkTargetEntry destColorTargets[] = {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
 //    {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
     {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
     {"application/x-color", 0, APP_X_COLOR},
 };
 
@@ -837,7 +837,9 @@ void _loadPaletteFile( gchar const *filename )
                 } while ( result && !hasErr );
                 if ( !hasErr ) {
                     possible.push_back(onceMore);
+#if ENABLE_MAGIC_COLORS
                     ColorItem::_wireMagicColors( onceMore );
+#endif ENABLE_MAGIC_COLORS
                 } else {
                     delete onceMore;
                 }

diff --git a/src/interface.cpp b/src/interface.cpp
index c5d893edea08b2e5b55c72ccb6322a4f6b4340c1..959e231e2a52436c568da2765d89f3c0d4fce738 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -88,9 +88,9 @@ static GtkTargetEntry ui_drop_target_entries [] = {
     {"image/svg",     0, SVG_DATA},
     {"image/png",     0, PNG_DATA},
     {"image/jpeg",    0, JPEG_DATA},
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
     {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
     {"application/x-color", 0, APP_X_COLOR}
 };
 
@@ -978,7 +978,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
                          gpointer user_data)
 {
     switch (info) {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
         case APP_X_INKY_COLOR:
         {
             SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -1052,7 +1052,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
             }
         }
         break;
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
 
         case APP_X_COLOR:
         {