diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-04-01 19:21:56 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-04-01 19:21:56 +0000 |
| commit | 14586b38e82862d7e9565c2b57a1dfc092094b01 (patch) | |
| tree | 63ab7308969e6c46f1181ab172da0c7a37521402 | |
| parent | more optimizations: do not fire knot/handle moved events if the position is i... (diff) | |
| download | inkscape-14586b38e82862d7e9565c2b57a1dfc092094b01.tar.gz inkscape-14586b38e82862d7e9565c2b57a1dfc092094b01.zip | |
Follow-up for missed file
(bzr r393)
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 38 |
2 files changed, 39 insertions, 1 deletions
@@ -1,6 +1,6 @@ 2006-03-28 Jon A. Cruz <jon@joncruz.org> - * configure.ca, src/interface.cpp, src/dialogs/swatches.cpp: + * configure.ac, src/interface.cpp, src/dialogs/swatches.cpp: Introducing optional LittleCms use. diff --git a/configure.ac b/configure.ac index c65fb6b4a..64ca940d5 100644 --- a/configure.ac +++ b/configure.ac @@ -423,6 +423,43 @@ AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LIBS) dnl ****************************** +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]) + +if test "x$enable_lcms" = "xno"; then + dnl Asked to ignore LittleCms + lcms=no +else + dnl Have to test LittleCms presence + PKG_CHECK_MODULES(LCMS, lcms >= 1.15, lcms=yes, lcms=no) + if test "x$lcms" != "xyes"; then + dnl No lcms found + if test "x$enable_lcms" = "xyes"; then + dnl LittleCms was explicitly asked for, so stop + AC_MSG_ERROR([--enable-lcms was specified, but appropriate LittleCms development packages could not be found]) + else + # lcms is no, tell us for the log file + AC_MSG_RESULT($lcms) + fi + else + dnl Working lcms + LCMS_LIBS="-llcms " + 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) + +dnl ****************************** dnl Inkboard dependency checking dnl ****************************** @@ -821,5 +858,6 @@ Configuration: Use relocation support: ${enable_binreloc} Use Python extensions: ${with_python} Use Perl extensions: ${with_perl} + Enable LittleCms: ${enable_lcms} Enable Inkboard: ${with_inkboard} " |