X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=d1e63c755106dbe6d483b8e9204863103875c9a3;hb=4011abe15a871e90c23eb1f79cfdd2bfe2ad4f49;hp=bd0bdbd0ae61ac325e15313093bea2369188ec4a;hpb=1f272e4de835ccde1c64020e760558f5ad4fe13a;p=inkscape.git

diff --git a/configure.ac b/configure.ac
index bd0bdbd0a..d1e63c755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 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)
@@ -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]),
+	[enable_lcms=$enableval], [enable_lcms=yes])
+
+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.13, 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 ******************************
@@ -457,7 +494,12 @@ 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.11  libxslt >= 1.0.15  sigc++-2.0 >= 2.0.3  $ink_spell_pkg  gthread-2.0 >= 2.0)
+dnl sigc++-2.0 >= 2.0.12: using "visit_each" not available in 2.0.10
+if test $cc_vers_major -gt 3; then
+    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.12  $ink_spell_pkg  gthread-2.0 >= 2.0)
+else
+    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.11  $ink_spell_pkg  gthread-2.0 >= 2.0)
+fi
 
 dnl Shouldn't we test for libpng and libz?
 INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
@@ -781,7 +823,7 @@ share/extensions/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile
-share/keyboards/Makefile
+share/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile
 share/patterns/Makefile
@@ -821,5 +863,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}
 "