X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=f2b3f7797142dc894b56ee8c05655ce7d0fed582;hb=35dd4ece01bd554d77541205157c8d2a50641de0;hp=859706a8f4b7ead48c19f758dda95dbbad7c03be;hpb=b39e78d48b6a104671bd0bd8ed43757ea35d2eae;p=inkscape.git diff --git a/configure.ac b/configure.ac index 859706a8f..f2b3f7797 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.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 @@ -11,6 +11,14 @@ AC_CANONICAL_HOST AC_CONFIG_SRCDIR(src/main.cpp) AM_INIT_AUTOMAKE +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) @@ -40,9 +48,7 @@ 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 @@ -74,7 +80,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME" 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 en_GB en_CA 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 tr uk vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -82,6 +88,9 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR(You have to install pkg-config to compile inkscape.) fi +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) if test "x$png_ok" != "xyes"; then AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape]) @@ -157,6 +166,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, @@ -464,29 +477,33 @@ 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" + 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 Unconditional dependencies @@ -496,10 +513,11 @@ 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 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) dnl Shouldn't we test for libpng and libz? INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz" @@ -579,13 +597,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 ****************************** @@ -667,19 +678,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 ****************************** @@ -791,7 +789,6 @@ 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 @@ -801,6 +798,7 @@ src/libnr/makefile src/libnrtype/makefile src/libavoid/makefile src/livarot/makefile +src/pedro/makefile src/jabber_whiteboard/makefile src/removeoverlap/makefile src/svg/makefile @@ -862,4 +860,5 @@ Configuration: Use relocation support: ${enable_binreloc} Enable LittleCms: ${enable_lcms} Enable Inkboard: ${with_inkboard} + Enable SSL in Inkboard: ${with_inkboard_ssl} "