remove superfluous line, compile warning

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dd3981c60d0dba5b3b147ea70fc213b12700e309..2160021ce26cfa3bb9b3e406a7fa2456272ba165 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 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 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)
@@ -179,18 +179,18 @@ AC_SUBST(FREETYPE_LIBS)
 dnl ******************************
 dnl Win32
 dnl ******************************
-AC_MSG_CHECKING([for Win32 platform])
+AC_MSG_CHECKING([for native Win32])
 case "$host" in
   *-*-mingw*)
-    platform_win32=yes
+    os_win32=yes
     INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
     ;;
   *)
-    platform_win32=no
+    os_win32=no
     ;;
 esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 
 dnl ******************************
 dnl Xft checking
@@ -350,7 +350,7 @@ if test "x$with_perl" = "xyes"; then
     if test "$?" -gt "0"; then
         with_perl="no"
     else
-        checkPERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
+        checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
         if test "$?" -gt "0"; then
             with_perl="no"
         else
@@ -362,22 +362,22 @@ AC_MSG_RESULT([$with_perl])
 if test "x$with_perl" = "xyes"; then
     # Test that we actually have the perl libraries installed
     oldCFLAGS="$CFLAGS"
-    oldLDFLAGS="$LDFLAGS"
+    oldLIBS="$LIBS"
     CFLAGS="$CFLAGS $checkPERL_CFLAGS"
-    LDFLAGS="$LDFLAGS $checkPERL_LDFLAGS"
+    LIBS="$LIBS $checkPERL_LIBS"
     AC_CHECK_FUNC([perl_parse],[
        PERL_CFLAGS="$checkPERL_CFLAGS"
-       PERL_LDFLAGS="$checkPERL_LDFLAGS"
+       PERL_LIBS="$checkPERL_LIBS"
         AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting])
         ],[
        with_perl="no"
        ])
     CFLAGS="$oldCFLAGS"
-    LDFLAGS="$oldLDFLAGS"
+    LIBS="$oldLIBS"
 fi
 AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes")
 AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
+AC_SUBST(PERL_LIBS)
 
 dnl ******************************
 dnl Python checking
@@ -393,7 +393,7 @@ if test "x$with_python" = "xyes"; then
     if test "$?" -gt "0"; then
         with_python="no"
     else
-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
         if test "$?" -gt "0"; then
             with_python="no"
         else
@@ -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.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 ******************************
@@ -457,7 +494,7 @@ 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"
@@ -537,6 +574,13 @@ if test "$enable_osxapp" = "yes"; then
    AC_DEFINE(ENABLE_OSX_APP_LOCATIONS,,[Build with OSX .app data dir paths?])
 fi
 
+dnl ******************************
+dnl   Boost graph library is required for graphlayout functions
+dnl ******************************
+AC_CHECK_HEADER([boost/graph/adjacency_list.hpp],
+                [AC_DEFINE([HAVE_BOOST_GRAPH_LIB],[],[Will enable connector network layout])],
+                [AC_MSG_WARN([Boost graph lib not found, can't include connector network layout functionality.])])
+
 dnl ******************************
 dnl   Reported by autoscan
 dnl ******************************
@@ -774,7 +818,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
@@ -814,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}
 "