![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index 48d7afe3c2d18a6168fcb0956334cccf8716798c..b752a9633bca9dd817da81664ba2bf0993a5d843 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
-AC_INIT(inkscape, 0.43+devel)
+AC_INIT(inkscape, 0.44+devel)
dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'.
dnl Rationale: (i) placate simple version comparison software such as
dnl `dpkg --compare-versions'. (ii) We don't always know what the next
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 ko lt mk nb nl nn pa pl pt pt_BR ru sk sl sr sr@Latn sv tr uk zh_CN zh_TW"
+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 vi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
dnl ******************************
dnl Win32
dnl ******************************
-AC_MSG_CHECKING([for native Win32])
+AC_MSG_CHECKING([for Win32 platform])
case "$host" in
*-*-mingw*)
- os_win32=yes
+ platform_win32=yes
INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
;;
*)
- os_win32=no
+ platform_win32=no
;;
esac
-AC_MSG_RESULT([$os_win32])
-AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
dnl ******************************
dnl Xft checking
AC_MSG_CHECKING(for Perl development environment)
AC_ARG_WITH(perl,
- AC_HELP_STRING([--with-perl], [use Perl for embedded scripting]),
+ AC_HELP_STRING([--with-perl], [use Perl for embedded scripting (EXPERIMENTAL)]),
[with_perl=$withval], [with_perl=skipped])
if test "x$with_perl" = "xyes"; then
if test "$?" -gt "0"; then
with_perl="no"
else
- checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
+ checkPERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
if test "$?" -gt "0"; then
with_perl="no"
else
if test "x$with_perl" = "xyes"; then
# Test that we actually have the perl libraries installed
oldCFLAGS="$CFLAGS"
- oldLIBS="$LIBS"
+ oldLDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $checkPERL_CFLAGS"
- LIBS="$LIBS $checkPERL_LIBS"
+ LDFLAGS="$LDFLAGS $checkPERL_LDFLAGS"
AC_CHECK_FUNC([perl_parse],[
PERL_CFLAGS="$checkPERL_CFLAGS"
- PERL_LIBS="$checkPERL_LIBS"
+ PERL_LDFLAGS="$checkPERL_LDFLAGS"
AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting])
],[
with_perl="no"
])
CFLAGS="$oldCFLAGS"
- LIBS="$oldLIBS"
+ LDFLAGS="$oldLDFLAGS"
fi
AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes")
AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LIBS)
+AC_SUBST(PERL_LDFLAGS)
dnl ******************************
dnl Python checking
AC_MSG_CHECKING(for Python development environment)
AC_ARG_WITH(python,
- AC_HELP_STRING([--with-python], [use Python for embedded scripting]),
+ AC_HELP_STRING([--with-python], [use Python for embedded scripting (EXPERIMENTAL)]),
[with_python=$withval], [with_python=skipped])
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('LDLIBRARY'),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('LIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
if test "$?" -gt "0"; then
with_python="no"
else
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
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.12: 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.12 $ink_spell_pkg gthread-2.0 >= 2.0)
+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"
LDFLAGS: ${LDFLAGS}
Use Xft font database: ${xft_ok}
- Use gnome-print: ${gp}
Use gnome-vfs: ${gnome_vfs}
Use openoffice files: ${ij}
Use MMX optimizations: ${use_mmx_asm}
Use relocation support: ${enable_binreloc}
- Use Python extensions: ${with_python}
- Use Perl extensions: ${with_perl}
Enable LittleCms: ${enable_lcms}
Enable Inkboard: ${with_inkboard}
"