X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=2ea6ca30515a8d2e7d30c3a8bf626960a9680c3a;hb=7ef48edbe66c565cd417c7d1acf2757033be5c61;hp=19dfefc019dd7a7dc0b0151f90179e321b28879d;hpb=ba0a645ba636811d5753a4d4c24c88190f74cf24;p=inkscape.git diff --git a/configure.ac b/configure.ac index 19dfefc01..2ea6ca305 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 @@ -9,46 +9,56 @@ dnl version is going to be called until about the time we release it dnl (whereas we always know what the previous version was called). AC_CANONICAL_HOST AC_CONFIG_SRCDIR(src/main.cpp) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax]) + +AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [ + prefix=/opt/inkscape + PATH="/opt/lsb/bin:$PATH" + CC=lsbcc + CXX=lsbc++ + export CC CXX +]) 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-invalid-offsetof -Wno-pointer-sign $CFLAGS" - AC_COMPILE_IFELSE([int dummy; -], , CFLAGS="$ink_svd_CFLAGS",) - CFLAGS="-Wall -W $CFLAGS" + CFLAGS="-Wno-pointer-sign $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" -dnl RANLIB is outdated now -dnl AC_PROG_RANLIB -AM_PROG_LIBTOOL +AC_PROG_RANLIB 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 = 1.2 is needed to compile inkscape]) @@ -157,6 +174,10 @@ if test "x$gc_ok" != "xyes"; then AC_MSG_ERROR([libgc (the Boehm Conservative Collector) 6.4+, is needed to compile inkscape -- http://www.hpl.hp.com/personal/Hans_Boehm/gc]) fi +dnl This check is to get a FIONREAD definition on Solaris 8 +AC_CHECK_HEADERS([sys/filio.h]) + + AC_CHECK_HEADERS([malloc.h]) AC_CHECK_FUNCS([mallinfo], [ AC_CHECK_MEMBERS([struct mallinfo.usmblks, @@ -192,6 +213,20 @@ esac 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 ****************************** @@ -245,39 +280,6 @@ if test "x$xft_ok" = "xyes"; then fi fi -dnl ****************************** -dnl GnomePrint checking -dnl ****************************** - -AC_ARG_WITH(gnome-print, - AC_HELP_STRING([--with-gnome-print], [use gnome print font database and spooler frontend]), - [with_gp=$withval], [with_gp=auto]) - -if test "x$with_gp" = "xyes"; then - dnl Have to test gnome-print presence - PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 >= 1.116.0 libgnomeprintui-2.2 >= 1.116.0, gp=yes, gp=no) - if test "x$gp" != "xyes"; then - dnl No gnome-print found - if test "x$with_gp" = "xyes"; then - dnl Gnome-print was explicitly asked, so stop - AC_MSG_ERROR([--with-gnome-print was specified, but appropriate libgnomeprint development packages could not be found]) - else - # gp is no, tell us for the log file - AC_MSG_RESULT($gp) - fi - fi -else - dnl Asked to ignore gnome-print - gp=no -fi - -AC_SUBST(GNOME_PRINT_CFLAGS) -AC_SUBST(GNOME_PRINT_LIBS) - -AM_CONDITIONAL(USE_GNOME_PRINT, test "x$gp" = "xyes") -if test "x$gp" = "xyes"; then - AC_DEFINE(WITH_GNOME_PRINT, 1, [Use gnome print font database and spooler frontend]) -fi dnl ****************************** dnl gnome vfs checking @@ -350,7 +352,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 +364,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 +395,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 @@ -447,58 +449,160 @@ else fi else dnl Working lcms - LCMS_LIBS="-llcms " + LIBS="$LIBS $LCMS_LIBS" + AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management]) 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 Libpoppler checking +dnl ****************************** + +AC_ARG_ENABLE(poppler-cairo, + AC_HELP_STRING([--enable-poppler-cairo], [Enable libpoppler-cairo for rendering PDF preview]), + [enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes]) + +POPPLER_CFLAGS="" +PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.9, 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.9, 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 + if test "x$enable_poppler_cairo" = "xyes"; then + dnl Have to test libpoppler-cairo presence for PDF preview + dnl AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no) + PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.5.9, poppler_cairo=yes, poppler_cairo=no) + if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \ + "x$cairo_svg" = "xno" + 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_cairo" = "xyes" -a "x$poppler_glib" = "xyes"; then + AC_DEFINE(HAVE_POPPLER_CAIRO, 1, [Use libpoppler-cairo for rendering PDF preview]) +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 ****************************** with_inkboard="no" +with_inkboard_ssl="no" -AC_MSG_CHECKING(for loudmouth-1.0+) +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) if test "x$with_inkboard" = "xyes"; then - PKG_CHECK_MODULES(LIBLOUDMOUTH, loudmouth-1.0, loudmouth_ok=yes, loudmouth_ok=no) - if test "x$loudmouth_ok" = "xyes"; then with_inkboard="yes" AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support]) - else - with_inkboard="no" - fi + + 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 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 -AC_MSG_RESULT($with_inkboard) AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes") -AC_SUBST(LIBLOUDMOUTH_CFLAGS) -AC_SUBST(LIBLOUDMOUTH_LIBS) +AC_SUBST(INKBOARD_LIBS) +AC_SUBST(INKBOARD_CFLAGS) + +dnl ****************************** +dnl Check for libwpg for extension +dnl ****************************** + +PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no) +if test "x$with_libwpg" = "xyes"; then + AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) +fi +AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes") + +AC_SUBST(LIBWPG_LIBS) +AC_SUBST(LIBWPG_CFLAGS) + +dnl ****************************** +dnl Check for ImageMagick Magick++ +dnl ****************************** + +AC_CHECK_LIB(Magick++, InitializeMagick, [AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)], magick_ok=no, -llcms -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lz -lpthread -lm -lpthread) + +if test "x$magick_ok" = "xyes"; then + AC_CHECK_PROG(MAGICKPP_CONFIG, Magick++-config, yes, no) + if test "x$MAGICKPP_CONFIG" = "xyes"; then + IMAGEMAGICK_LIBS=`Magick++-config --libs` + AC_SUBST(IMAGEMAGICK_LIBS) + AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) + fi +fi + +AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes") 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 - 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) + min_sigc_version=2.0.12 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) + min_sigc_version=2.0.11 +fi +PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.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) + +# Check for Apple Mac OS X Carbon framework +carbon_ok=no +AC_MSG_CHECKING([for Mac OS X Carbon support]) +AC_TRY_CPP([ +#include +#include +], carbon_ok=yes) +AC_MSG_RESULT($carbon_ok) +if test "x$carbon_ok" = "xyes"; then + AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) + CARBON_LDFLAGS="-framework Carbon" + AC_SUBST(CARBON_LDFLAGS) +fi +AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes") + +# Check for some boost header files +AC_CHECK_HEADERS([boost/concept_check.hpp], [], AC_MSG_ERROR([You need the boost package (e.g. libboost-dev)])) + +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 dnl Shouldn't we test for libpng and libz? @@ -579,13 +683,6 @@ 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 ****************************** @@ -654,7 +751,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 @@ -667,19 +764,6 @@ if test "$GXX" = "yes"; then esac fi -dnl ****************************** -dnl Plugin Support -dnl ****************************** -dnl -dnl UPDATE: This is unconditional now (Lauris) -dnl -dnl AC_ARG_WITH(modules, AC_HELP_STRING([--with-modules], [Compile with plugin support (experimental)]), [mod=$withval], [mod=yes]) -dnl -dnl AM_CONDITIONAL(USE_MODULES, test "x$mod" = "xyes") -dnl if test "x$mod" = "xyes"; then -dnl AC_DEFINE(WITH_MODULES, 1, [Use experimental module support]) -dnl fi - AC_DEFINE(WITH_MODULES, 1, [Use experimental module support]) dnl ****************************** @@ -749,19 +833,18 @@ 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 -if test "x${datadir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then - runtime_datadir="${ac_default_prefix}/share" - else - runtime_datadir="${prefix}/share" - fi -else - runtime_datadir="${datadir}" -fi +dnl http://autoconf-archive.cryp.to/ac_define_dir.html +prefix_NONE= +exec_prefix_NONE= +test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix +dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn +dnl refers to ${prefix}. Thus we have to use `eval' twice. +eval runtime_datadir="${datadir}" +eval runtime_datadir="${runtime_datadir}" +test "$prefix_NONE" && prefix=NONE +test "$exec_prefix_NONE" && exec_prefix=NONE inkscape_sharedir="${runtime_datadir}/${PACKAGE_NAME}" @@ -791,21 +874,25 @@ src/dom/makefile src/extension/implementation/makefile src/extension/internal/makefile src/extension/makefile -src/extension/plugin/makefile src/extension/script/makefile src/helper/makefile src/inkjar/makefile src/io/makefile src/libcroco/makefile +src/libgdl/makefile src/libnr/makefile src/libnrtype/makefile src/libavoid/makefile src/livarot/makefile +src/live_effects/makefile +src/live_effects/parameter/makefile +src/pedro/makefile src/jabber_whiteboard/makefile 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 @@ -814,12 +901,15 @@ src/utest/makefile src/util/makefile src/widgets/makefile src/xml/makefile +src/2geom/makefile doc/Makefile po/Makefile.in share/Makefile share/clipart/Makefile share/examples/Makefile share/extensions/Makefile +share/extensions/Barcode/Makefile +share/extensions/xaml2svg/Makefile share/fonts/Makefile share/gradients/Makefile share/icons/Makefile @@ -856,10 +946,16 @@ Configuration: LDFLAGS: ${LDFLAGS} Use Xft font database: ${xft_ok} - Use gnome-vfs: ${gnome_vfs} + Use gnome-vfs: ${gnome_vfs} Use openoffice files: ${ij} Use MMX optimizations: ${use_mmx_asm} Use relocation support: ${enable_binreloc} - Enable LittleCms: ${enable_lcms} - Enable Inkboard: ${with_inkboard} + 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} "