From: joncruz <joncruz@users.sourceforge.net>
Date: Tue, 4 Mar 2008 09:13:28 +0000 (+0000)
Subject: Applied patch for LCMS from bug #182170
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e914757d11e3e0d1f2bb469508b14ff4822859a3;p=inkscape.git

Applied patch for LCMS from bug #182170
---

diff --git a/configure.ac b/configure.ac
index 412530850..2ea6ca305 100644
--- 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 72d72c14a..476b78a06 100644
--- 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\"	\