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

diff --git a/configure.ac b/configure.ac
index 9d5049774..d1e63c755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -427,15 +427,15 @@ 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])
+	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.14, lcms=yes, lcms=no)
+	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
@@ -494,8 +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...
-dnl sigc++-2.0 >= 2.0.11: using "visit_each" not available in 2.0.10
-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)
+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"