From: Ted Gould <ted@gould.cx>
Date: Sun, 29 Nov 2009 19:01:07 +0000 (-0600)
Subject: Merging in from trunk
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=45660a4d22b900c4e70963313065f2f9bf57c9f7;p=inkscape.git

Merging in from trunk
---

45660a4d22b900c4e70963313065f2f9bf57c9f7
diff --cc configure.ac
index 418990602,fbfa2e5df..5e7c9aa31
--- a/configure.ac
+++ b/configure.ac
@@@ -1021,9 -1008,6 +1021,7 @@@ Configuration
          Internal Python:          ${with_python}
          Internal Perl:            ${with_perl}
          Enable LittleCms:         ${enable_lcms}
 +        Enable DBUS               ${with_dbus} 
-         Enable Inkboard:          ${with_inkboard}
-         Enable SSL in Inkboard:   ${with_inkboard_ssl}
          Enable Poppler-Cairo:     ${enable_poppler_cairo}
          ImageMagick Magick++:     ${magick_ok}
          Libwpg:                   ${with_libwpg}