diff options
| author | Josh Andler <scislac@gmail.com> | 2009-09-01 21:18:27 +0000 |
|---|---|---|
| committer | scislac <scislac@users.sourceforge.net> | 2009-09-01 21:18:27 +0000 |
| commit | f08220ae5271d5a642b9ad8611db9febc599b2f2 (patch) | |
| tree | 75e89ba4eaf0431e5c7eaf03d1d93c2f63964f73 | |
| parent | Fixed crash when invoked and no profile is set. (diff) | |
| download | inkscape-f08220ae5271d5a642b9ad8611db9febc599b2f2.tar.gz inkscape-f08220ae5271d5a642b9ad8611db9febc599b2f2.zip | |
Commenting out Whiteboard configure flag
(bzr r8552)
| -rw-r--r-- | configure.ac | 46 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/ui/dialog/Makefile_insert | 4 |
3 files changed, 29 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index e2b5f8ff3..fbfa2e5df 100644 --- a/configure.ac +++ b/configure.ac @@ -573,35 +573,35 @@ dnl ****************************** 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 @@ -1008,8 +1008,6 @@ Configuration: 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} diff --git a/src/Makefile.am b/src/Makefile.am index fb876f231..4d57de850 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,9 +16,9 @@ bin_PROGRAMS = inkscape inkview # Libraries which should be compiled by "make" but not installed. # Use this only for libraries that are really standalone, rather than for # source tree subdirectories. -if WITH_INKBOARD -libpedro = pedro/libpedro.a -endif +#if WITH_INKBOARD +#libpedro = pedro/libpedro.a +#endif noinst_LIBRARIES = \ libinkscape.a \ dom/libdom.a \ @@ -111,8 +111,8 @@ include filters/Makefile_insert include helper/Makefile_insert include inkjar/Makefile_insert include io/Makefile_insert -include pedro/Makefile_insert -include jabber_whiteboard/Makefile_insert +#include pedro/Makefile_insert +#include jabber_whiteboard/Makefile_insert include libcroco/Makefile_insert include libgdl/Makefile_insert include libnr/Makefile_insert diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert index 5cd437c26..565a24ecc 100644 --- a/src/ui/dialog/Makefile_insert +++ b/src/ui/dialog/Makefile_insert @@ -1,6 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -if WITH_INKBOARD +##if WITH_INKBOARD ## inkboard_dialogs = \ ## ui/dialog/whiteboard-connect.cpp \ ## ui/dialog/whiteboard-connect.h \ @@ -8,7 +8,7 @@ if WITH_INKBOARD ## ui/dialog/whiteboard-sharewithchat.h \ ## ui/dialog/whiteboard-sharewithuser.cpp \ ## ui/dialog/whiteboard-sharewithuser.h -endif +##endif ink_common_sources += \ ui/dialog/aboutbox.cpp \ |