X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=6dab04287fadc8b5a5c05a034fdca52369d03a47;hb=0dd12485e26b98c7eb9963768ec4bd9869186d98;hp=61d5a8d1ccf43b2ed0e35b8e0e433746f78cda1f;hpb=5eafac1adbe055014ece10b5c33df29a82289c8d;p=inkscape.git diff --git a/configure.ac b/configure.ac index 61d5a8d1c..6dab04287 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ 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 @@ -23,28 +23,30 @@ AM_CONFIG_HEADER(config.h) 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" @@ -54,7 +56,9 @@ dnl Verify our GCC version if test "x$GXX" = "xyes"; then AC_MSG_CHECKING([GNU compiler version]) - cc_version=["`$CXX $CXXFLAGS -v 2>&1 &1 /dev/null` + checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null` if test "$?" -gt "0"; then with_perl="no" else @@ -375,22 +397,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 @@ -494,6 +516,8 @@ if test "x$with_inkboard" = "xyes"; then 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 @@ -508,21 +532,24 @@ dnl ****************************** 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" @@ -669,7 +696,7 @@ if test "$GXX" = "yes"; then # 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 @@ -751,9 +778,6 @@ fi 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= @@ -810,6 +834,7 @@ src/removeoverlap/makefile src/svg/makefile src/trace/makefile src/traits/makefile +src/ui/cache/makefile src/ui/dialog/makefile src/ui/makefile src/ui/view/makefile @@ -824,6 +849,7 @@ share/Makefile share/clipart/Makefile share/examples/Makefile share/extensions/Makefile +share/extensions/Barcode/Makefile share/fonts/Makefile share/gradients/Makefile share/icons/Makefile