add tooltips to text toolbar widgets

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 64ca940d5ce1ecda992f1b467747dc2ddf92afa4..d1e63c755106dbe6d483b8e9204863103875c9a3 100644 (file)
--- 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 lt 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)
@@ -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.15, 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,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"
@@ -818,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