diff --git a/configure.ac b/configure.ac
index 61d5a8d1ccf43b2ed0e35b8e0e433746f78cda1f..bae3fb78ccc145b0a294775fcbb1045eb0c22aa4 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.44+devel)
+AC_INIT(inkscape, 0.45+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_PROG_INTLTOOL(0.22)
+AC_LANG(C++)
+AC_ISC_POSIX
+AC_PROG_CXX
+AM_PROG_CC_STDC
+AM_PROG_AS
+AC_HEADER_STDC
+
dnl These next few lines are needed only while libcroco is in our source tree.
AC_PROG_CC
AM_PROG_CC_C_O
+AC_MSG_NOTICE([Testing -Wno-pointer-sign])
if test "$GCC" = "yes"; then
# Enable some warnings from gcc.
+ AC_LANG_PUSH(C)
# -Wno-pointer-sign is probably new in gcc 4.0; certainly it isn't accepted
# by gcc 2.95.
ink_svd_CFLAGS="$CFLAGS"
CFLAGS="-Wno-pointer-sign $CFLAGS"
- AC_COMPILE_IFELSE([int dummy;
-], , CFLAGS="$ink_svd_CFLAGS",)
- CFLAGS="-Wall -W $CFLAGS"
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), AC_MSG_NOTICE([ compiler supports -Wno-pointer-sign]), CFLAGS="$ink_svd_CFLAGS")
+ CFLAGS="-Wall -Wformat-security -W -D_FORTIFY_SOURCE=2 $CFLAGS"
+ AC_LANG_POP
fi
-AC_LANG(C++)
-AC_ISC_POSIX
-AC_PROG_CXX
-AM_PROG_CC_STDC
-AM_PROG_AS
-AC_HEADER_STDC
-
dnl Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
if test "x$GXX" = "xyes"; then
AC_MSG_CHECKING([GNU compiler version])
- cc_version=["`$CXX $CXXFLAGS -v 2>&1 </dev/null |grep 'gcc version' |\
+ # Don't pass CXXFLAGS to the following CXX command as some
+ # of them can't be specified along with '-v'.
+ cc_version=["`$CXX -v 2>&1 </dev/null |grep 'gcc version' |\
sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"]
AC_MSG_RESULT([$cc_version])
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 bg ca cs da de dz el en_GB en_CA en_US@piglatin es es_MX et fi fr ga gl hr hu it ja ko lt mk mn nb ne nl nn pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am az be bg bn ca 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@Latn sr sv th tr uk vi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_ERROR(You have to install pkg-config to compile inkscape.)
fi
+dnl Find msgfmt. Without this, po/Makefile fails to set MSGFMT on some platforms.
+AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
dnl ******************************
dnl Check for libpng
dnl ******************************
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_MSG_CHECKING([for Solaris 2.8 platform])
+case "$host" in
+ *-solaris2.8)
+ platform_solaris_2_8=yes
+ CFLAGS="$CFLAGS -DSOLARIS_2_8"
+ CXXFLAGS="$CXXFLAGS -DSOLARIS_2_8"
+ ;;
+ *)
+ platform_solaris_2_8=no
+ ;;
+esac
+AC_MSG_RESULT([$platform_solaris_2_8])
+AM_CONDITIONAL(PLATFORM_SOLARIS_2_8, test "$platform_solaris_2_8" = "yes")
+
dnl ******************************
dnl Xft checking
dnl ******************************
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
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
AC_SUBST(LCMS_CFLAGS)
AC_SUBST(LCMS_LIBS)
+dnl ******************************
+dnl Libpoppler checking
+dnl ******************************
+
+POPPLER_CFLAGS=""
+PKG_CHECK_MODULES(POPPLER, poppler >= 0.5, poppler=yes, poppler=no)
+
+if test "x$poppler" = "xyes"; then
+ dnl Working libpoppler
+ POPPLER_LIBS="-lpoppler "
+ dnl Have to test libpoppler-glib presence
+ PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.5, poppler_glib=yes, poppler_glib=no)
+ if test "x$poppler_glib" = "xyes"; then
+ dnl Working libpoppler-glib found
+ dnl Check whether the Cairo SVG backend is available
+ PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, cairo_svg=yes, cairo_svg=no)
+ if test "x$cairo_svg" = "xyes"; then
+ POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib "
+ fi
+ fi
+fi
+
+if test "x$poppler" = "xyes"; then
+ LIBS="$LIBS $POPPLER_LIBS"
+ AC_DEFINE(HAVE_POPPLER, 1, [Use libpoppler for direct PDF import])
+fi
+if test "x$poppler_glib" = "xyes" -a "x$cairo_svg" = "xyes"; then
+ AC_DEFINE(HAVE_POPPLER_GLIB, 1, [Use libpoppler-glib and Cairo-SVG for PDF import])
+fi
+AC_SUBST(POPPLER_CFLAGS)
+AC_SUBST(POPPLER_LIBS)
+
dnl ******************************
dnl Inkboard dependency checking
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
dnl Unconditional dependencies
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.12: using "visit_each" not available in 2.0.10
if test $cc_vers_major -gt 3; then
min_sigc_version=2.0.12
else
min_sigc_version=2.0.11
fi
-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 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2)
PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, cairo_pdf=yes, cairo_pdf=no)
if test "x$cairo_pdf" = "xyes"; then
AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available])
fi
+PKG_CHECK_MODULES(GTK_UNIX_PRINT, gtk+-unix-print-2.0, gtk_unix_print=yes, gtk_unix_print=no)
+if test "x$gtk_unix_print" = "xyes"; then
+ AC_DEFINE(HAVE_GTK_UNIX_PRINT, 1, [Whether the GTK Unix printing backend is available])
+fi
+
dnl Shouldn't we test for libpng and libz?
INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
# programmer deliberately has an unused parameter (e.g. because it's used
# as a callback or similar function pointer use).
- CXXFLAGS="-Wall -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS"
+ CXXFLAGS="-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -D_FORTIFY_SOURCE=2 $CXXFLAGS"
dnl Test for arch-specific situations.
case "$host_cpu" in
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
-dnl Override the default g_ascii_strtod
-AC_DEFINE(g_ascii_strtod, fixed_g_ascii_strtod, [Pre-1.107 gstrfuncs.c version of g_ascii_strtod is broken])
-
dnl Figure out where the datadir actually is
dnl http://autoconf-archive.cryp.to/ac_define_dir.html
prefix_NONE=
src/svg/makefile
src/trace/makefile
src/traits/makefile
+src/ui/cache/makefile
src/ui/dialog/makefile
src/ui/makefile
src/ui/view/makefile
share/clipart/Makefile
share/examples/Makefile
share/extensions/Makefile
+share/extensions/Barcode/Makefile
share/fonts/Makefile
share/gradients/Makefile
share/icons/Makefile