diff --git a/configure.ac b/configure.ac
index d30dd281d046dfd5a76e201bbcf1271b609ad9c9..27e04548406bcbcbca2d0ee8ae0c7ac6dc2855f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# `dpkg --compare-versions'. (ii) We don't always know what the next
# version is going to be called until about the time we release it
# (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.46+devel)
+AC_INIT(inkscape, 0.47+devel)
AC_CANONICAL_HOST
AC_CONFIG_SRCDIR([src/main.cpp])
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 ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fi fr ga gl he hr hu id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fi fr ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv th tr uk vi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
dnl ******************************
dnl Check for libpng
dnl ******************************
-AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm)
+AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm)
if test "x$png_ok" != "xyes"; then
AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
fi
dnl Inkboard dependency checking
dnl ******************************
-with_inkboard="no"
-with_inkboard_ssl="no"
+dnl with_inkboard="no"
+dnl with_inkboard_ssl="no"
-INKBOARD_CFLAGS=""
+dnl INKBOARD_CFLAGS=""
-AC_ARG_ENABLE(inkboard,
- AS_HELP_STRING([--enable-inkboard], [enable Inkboard online whiteboard facility (disabled by default)]),
- with_inkboard=$enableval,with_inkboard=no)
+dnl AC_ARG_ENABLE(inkboard,
+dnl AS_HELP_STRING([--enable-inkboard], [enable Inkboard online whiteboard facility (disabled by default)]),
+dnl with_inkboard=$enableval,with_inkboard=no)
-if test "x$with_inkboard" = "xyes"; then
- with_inkboard="yes"
- AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support])
+dnl if test "x$with_inkboard" = "xyes"; then
+dnl with_inkboard="yes"
+dnl AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support])
dnl Test for OpenSSL
- PKG_CHECK_MODULES(INKBOARD, openssl, with_inkboard_ssl=yes, with_inkboard_ssl=no)
- if test "x$with_inkboard_ssl" = "xyes"; then
+dnl PKG_CHECK_MODULES(INKBOARD, openssl, with_inkboard_ssl=yes, with_inkboard_ssl=no)
+dnl if test "x$with_inkboard_ssl" = "xyes"; then
dnl OpenSSL found; enable SSL support in Pedro
- INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL"
- RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
- RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
- AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard])
- fi
-else
- with_inkboard="no"
-fi
+dnl INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL"
+dnl RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
+dnl RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
+dnl AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard])
+dnl fi
+dnl else
+dnl with_inkboard="no"
+dnl fi
-AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes")
-AC_SUBST(INKBOARD_LIBS)
-AC_SUBST(INKBOARD_CFLAGS)
+dnl AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes")
+dnl AC_SUBST(INKBOARD_LIBS)
+dnl AC_SUBST(INKBOARD_CFLAGS)
dnl ******************************
dnl Check for libwpg for extension
# Add even more stuff
CXXFLAGS="-Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS"
- dnl Test for arch-specific situations.
- case "$host_cpu" in
- mips|mipsel)
- dnl Symbol tables can get too large: this uses alternate tables
- dnl See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=283476
- CXXFLAGS="$CXXFLAGS -Wa,-xgot"
- CFLAGS="$CFLAGS -Wa,-xgot"
- ;;
- esac
fi
dnl ******************************
share/fonts/Makefile
share/gradients/Makefile
share/icons/Makefile
-share/icons/tango/Makefile
-share/icons/tango/scalable/Makefile
-share/icons/tango/scalable/actions/Makefile
-share/icons/tango/scalable/places/Makefile
-share/icons/tango/scalable/status/Makefile
-share/icons/tango/16x16/Makefile
-share/icons/tango/16x16/actions/Makefile
-share/icons/tango/16x16/places/Makefile
-share/icons/tango/16x16/status/Makefile
-share/icons/tango/24x24/Makefile
-share/icons/tango/24x24/actions/Makefile
-share/icons/tango/24x24/places/Makefile
-share/icons/tango/24x24/status/Makefile
+share/icons/application/Makefile
+share/icons/application/16x16/Makefile
+share/icons/application/22x22/Makefile
+share/icons/application/24x24/Makefile
+share/icons/application/32x32/Makefile
+share/icons/application/48x48/Makefile
+share/icons/application/256x256/Makefile
share/keys/Makefile
share/markers/Makefile
share/palettes/Makefile
Internal Python: ${with_python}
Internal Perl: ${with_perl}
Enable LittleCms: ${enable_lcms}
- Enable Inkboard: ${with_inkboard}
- Enable SSL in Inkboard: ${with_inkboard_ssl}
Enable Poppler-Cairo: ${enable_poppler_cairo}
ImageMagick Magick++: ${magick_ok}
Libwpg: ${with_libwpg}