diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2008-03-04 09:13:28 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2008-03-04 09:13:28 +0000 |
| commit | 33128f6dfe357e69806050dd23eebe41fe74a506 (patch) | |
| tree | f0a4186d5e1fb78ca24de90a9631f1da85fa876d | |
| parent | Fixed whitespace after backslash at end of line (diff) | |
| download | inkscape-33128f6dfe357e69806050dd23eebe41fe74a506.tar.gz inkscape-33128f6dfe357e69806050dd23eebe41fe74a506.zip | |
Applied patch for LCMS from bug #182170
(bzr r4949)
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
2 files changed, 3 insertions, 6 deletions
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\" \ |