diff --git a/configure.ac b/configure.ac
index 17b753c6febda506d3647f44e962992fce5a2247..9dec9201b6a8160d60925e0f09427ef69a33f9a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
dnl Add the languages which your application supports here.
-ALL_LINGUAS="am az be ca cs da de el es es_MX et eu fr ga gl hu it ja mk nb nl nn pa pl pt pt_BR ru sk sl sr sr@Latn sv tr uk zh_CN"
+ALL_LINGUAS="am az be ca cs da de el es es_MX et eu fr ga gl hu it ja ko lt mk nb nl nn pa pl pt pt_BR ru sk sl sr sr@Latn sv tr uk zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
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.14, 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 ******************************
dnl *** NOTE: when we move to gtk 2.6 or later, we can remove the
dnl ********* the override for g_ascii_strtod below...
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.4.0 libxml-2.0 >= 2.6.0 libxslt >= 1.0.15 sigc++-2.0 >= 2.0.3 $ink_spell_pkg gthread-2.0 >= 2.0)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.4.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 sigc++-2.0 >= 2.0.3 $ink_spell_pkg gthread-2.0 >= 2.0)
dnl Shouldn't we test for libpng and libz?
INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
share/fonts/Makefile
share/gradients/Makefile
share/icons/Makefile
-share/keyboards/Makefile
+share/keys/Makefile
share/markers/Makefile
share/palettes/Makefile
share/patterns/Makefile
Use relocation support: ${enable_binreloc}
Use Python extensions: ${with_python}
Use Perl extensions: ${with_perl}
+ Enable LittleCms: ${enable_lcms}
Enable Inkboard: ${with_inkboard}
"