Applied patch for LCMS from bug #182170

diff --git a/configure.ac b/configure.ac
index 412530850e22e21bd969e981db18cbc212a9e924..2ea6ca30515a8d2e7d30c3a8bf626960a9680c3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -449,15 +449,11 @@ else
                fi
        else
                dnl Working lcms
-               LCMS_LIBS="-llcms "
+               LIBS="$LIBS $LCMS_LIBS"
+               AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
        fi
 fi
 
-if test "x$lcms" = "xyes"; then
-       LIBS="$LIBS $LCMS_LIBS"
-       AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
-fi
-AM_CONDITIONAL(USE_LCMS, test "x$lcms" = "xyes")
 AC_SUBST(LCMS_CFLAGS)
 AC_SUBST(LCMS_LIBS)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 72d72c14a02c85469140ab7850ac27baf4a30285..476b78a064c7de644598910dafc5a75a569e613d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ INCLUDES =    \
        $(INKBOARD_CFLAGS) \
        $(LIBWPG_CFLAGS) \
        $(XFT_CFLAGS)   \
+       $(LCMS_CFLAGS)  \
        $(POPPLER_CFLAGS)       \
        $(POPPLER_GLIB_CFLAGS)  \
        -DPOTRACE=\"potrace\"   \