Follow-up for missed file

diff --git a/ChangeLog b/ChangeLog
index f10be2c81a309936f4d90dc09cb3563362303d69..2e3ce5823dfd1f5a4b07346a9b2557758f5e5377 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 c65fb6b4a4a2b5f6440b5edd7ded1854f1e98083..64ca940d5ce1ecda992f1b467747dc2ddf92afa4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -422,6 +422,43 @@ AM_CONDITIONAL(WITH_PYTHON, test "x$with_python" = "xyes")
 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}
 "