[SyncEvolution] configuration parameters: command line update
by Patrick Ohly
Hello!
I'd like to solicit some feedback about configuring local sync, in
particular command line options for it. I'm still debating this with
myself, so consider the following email as "thinking aloud"...
As you might remember from the "local sync" mail thread, local sync uses
two configurations (using a "foo" server implementing some protocol
"bar" as example):
1. "source" config @foo defines sources which access "foo" using
the "bar" protocol; source-config@foo provides additional
per-peer settings like a URL or username/password
2. "sync" config foo has syncURL=local://@foo and does a sync
involving local databases (the same ones also used with other
peers) and the databases accessible via @foo
The original plan was to avoid the need for the source-config@foo
settings. But that neglected that credentials for "foo" should be tried
to the @foo context, instead of putting them elsewhere, and that there
was no other property which could have been used for the URL, to name
just one example.
This setup with two configs leads to two usability problems:
* How can such a config be created from a template? "syncevolution
--configure foo" would be nice.
* How can properties of both contexts be modified in a single
command? This is necessary for the single configure command
above and for running a sync.
Related to this is the question:
* How can multiple source properties be set in a single command?
Not being able to do that has made the instructions for
configuring SyncEvolution as a server unnecessarily complex.
Syntax for property values
==========================
Currently there is "--[sync|source]-property <property>=<value>".
<property> is the name of one of the builtin properties. I can imagine
extending this syntax as follows:
[<config>/]<property>[/<source>]=<value> (syntax I)
where <config> is a configuration name (which may contain @ signs) and
<source> is a source name (like "addressbook"). The rational for
introducing the slash as separator is that neither config nor source
names are allowed to contain it.
Examples:
evolutionsource=My Address Boook
evolutionsource/addressbook=My Address Book
@foo/evolutionsource/addressbook=Foo's Address Book
The drawback is that splitting the left side of the assignment is
ambiguous. In "foo/bar", either "foo" or "bar" could be the property
name. This can only be decided when property names are well-known. Typos
would break this detection, leading to bad error messages.
So perhaps the following syntax would be better:
[<source>/]<property>[@<config>]=<value> (syntax II)
The ordering of source, property and config is more natural:
addressbook/evolutionsource=My Address Book
syncURL@foo=local://@foo
But now the meaning of @ is overloaded:
syncURL@source-config@foo=Foo's URL
That is not a problem for a syntax parser, but less readable. The
ambiguity is resolved by declaring that @foo always a context.
I prefer the second syntax. Any other opinions?
As before, unqualified properties apply to all sources and all configs.
Templates for local sync
========================
The current set of templates provide properties for just one
configuration, the one which uses SyncML to talk to a server or a
client. Creating a local sync involves creating two configs.
There is no 1:1 mapping between the two. It is possible to define the
@foo sources, then synchronize them with a) the @default sources with
foo@default and b) with a second set of sources in @bar config with
foo@bar.
In the "syncevolution --configure foo" invocation, "foo" is the name of
the sync config. But what is the name of the source config? I propose
the following heuristic:
* if syncURL=local:// (no explicit context): use @foo for peer
name foo[@context]
* if syncURL=local://@bar: use @bar
That way a command line user still has the chance to override the source
context name, while the right thing will happen by default. Examples:
syncevolution --configure \
--sync-property username=xyz \
--sync-property password=abc \
foo
=> create or update @foo and foo, setting username/password in both
because they apply to both contexts
syncevolution --configure \
--sync-property syncURL=local://@bar \
foo
=> create or update @bar and foo; credentials must have been set in
@bar before
A template for "foo" then might look like this:
--------------------
=== template.ini ===
fingerprint = Foo Server
description = sync with Foo using protocol Bar
=== config.ini ===
PeerIsClient = 1
syncURL = local://
=== sources/addressbook/config.ini ===
sync = two-way
uri = addressbook
=== config.ini@source-config@foo ===
syncURL = http://foo.com/
=== sources/addressbook/config.ini@foo ===
uri = /contacts
type = Bar Protocol
--------------------
In the D-Bus interface, this would be returned by GetConfig() with "" as
key for "config.ini", "source-config@foo" for config.ini inside the
source-config@foo config, "sources/addressbook" for
sources/addressbook/config.ini and sources/addressbook@foo for
sources/addressbook/config.ini@foo.
My hope is that sync-ui will simply preserve these additional entries in
the hash. When it does a "SetConfig()" call with the modified hash
(credentials inserted, sync mode for "adddressbook" set), these
additional entries tell the syncevo-dbus-server to do its magic and also
configure the @foo context. The advantage is that no or only minimal
changes to sync-ui and D-Bus interface will be needed.
The drawback is that this additional magic increases the complexity. For
example, SetConfig() is called for the "foo" config, but suddenly ends
up modifying a different config.
Password handling in local sync
===============================
Credentials in the sync config are not needed for the sync itself,
because the peer is part of the same process. But users and frontends
like the GTK sync-ui are used to setting credentials in the sync config.
Therefore I suggest that local sync should always apply sync credentials
to the context it is synchronizing with, if they are set in the sync
config. If they are empty, the values from the source config are used.
Make --sync-property/--source-property optional
===============================================
A purely cosmetic change. It has irked me for a long time that the
command line was not able to determine automatically what username=foo
means. It had to be told explicitly that this is a property assignment,
and more specifically, a sync property (--sync-property username=foo).
This was necessary because theoretically, there might be sync and source
properties with the same name. But that would be confusing and thus was
avoided (and should be in the future).
That leaves the question of distinguishing parameters and the config
name from property assignments. That's easy, anything starting with a
dash is a parameter, anything with an equal sign an assignment. Explicit
--sync-property and --source-property parameters can be used to resolve
ambiguities.
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
9 years, 9 months
[SyncEvolution] [PATCH] Replace "" with [] in call to PKG_CHECK_MODULES
by david＠tethera.net
From: David Bremner <bremner(a)unb.ca>
If not, then autoconf 2.68 generates ""synthesis >= 3.4"" and the
extra level of quoting causes the pkg-config call to fail.
---
configure-pre.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure-pre.in b/configure-pre.in
index 1c9c8eb..a195903 100644
--- a/configure-pre.in
+++ b/configure-pre.in
@@ -686,7 +686,7 @@ elif test "$SYNTHESISSRC" != "none" && test -d $srcdir/src/synthesis; then
esac
elif test "$enable_shared" = "no"; then
# link against engine
- PKG_CHECK_MODULES(SYNTHESIS, "synthesis >= 3.4")
+ PKG_CHECK_MODULES(SYNTHESIS, [synthesis >= 3.4])
SYNTHESIS_ENGINE="$SYNTHESIS_LIBS -lsynthesis"
else
# link against SDK alone, except in client-test
@@ -694,7 +694,7 @@ else
#SYNTHESIS_ENGINE="`echo $SYNTHESIS_LIBS | sed -e 's/-lsynthesisstubs/-lsynthesis/'`"
# can't use the SDK alone because of sysync::SySyncDebugPuts()
- PKG_CHECK_MODULES(SYNTHESIS, "synthesis >= 3.4")
+ PKG_CHECK_MODULES(SYNTHESIS, [synthesis >= 3.4])
SYNTHESIS_ENGINE="$SYNTHESIS_LIBS"
fi
--
1.7.4.4
9 years, 10 months
[SyncEvolution] new shared libraries
by David Bremner
I see 1.1.99.4 provides libsyncevolution and libsyncevo-dbus in
/usr/lib.
Are these intended to by publicly usable (i.e. by other software?). If
so, is the API documented somewhere?
d
9 years, 10 months
[SyncEvolution] Clean Cancel of synchronisation
by Laurent Emil
Hi all,
I am testing sync evolution client and i encounter some problems when
stopping it with signal kill.
The problem is that server which i am testing against force slow sync at the
next synchronization session. I tried to implement a signal catcher (to
signal term) and i used the method api
syncDone<http://www.google.com/search?hl=en&client=ubuntu&hs=3ot&channel=fs&sa=X&e...>.
The fact is that synchronization is stopped cleanly but that didn't solve
the slow sync issue already mentioned.
I know that Syncml standard require slow sync after a session failure but i
want to know if is there a method we call from client to close session
before we stop synchronization so we prevent slow sync in the next
synchronization.
In other words, Is it possible to stop a synchronization session between
Syncevolution client and server without launching a slow sync in the next
session ?
Thanks for help guys.
Regards.
9 years, 10 months
[SyncEvolution] http server sync stops at "could not allocate SoupMessage"
by Hans de Jonge
Hi,
On my debian testing machines I am trying to realize syncevolution by
implementing the http-server howto of the development-pages:
On the server I Issue the commands:
syncevo-dbus-server &
and
/usr/bin/syncevo-http-server http://192.168.6.2:9000/syncevolution
(All sources are files configured according to the method I described in my post
at march 23rd)
When I enter the address " http://192.168.6.2:9000/syncevolution" in browsers
on both the server(192.168.6.2) and client machine(192.168.6.3) a page
containing the comforting phrase
"SyncEvolution SyncML Server"
appears.
When I try to connect (and synchronise) from the client machine, using
"syncevolution servername"
the connection fails at an early stage with an error:
"could not allocate SoupMessage"
and not even any reaction on the prompt of the server machine where the
syncevo-http-server-process is running (e.g. to verify the ID mentioned in
steps 8-10 of the HOWTO)
Any idea what might be wrong or what I should investigate further to get
things working?
PS. I want to get this working because:
The Bluetooth-obex solution between the ics-file on computer and N900 is
failing lately: I cannot get it working from the preferred OS again. From the
syncevolution pages I got the impression that this is due to a known and
bug in the BT-NokiaSyncMLserver system outside the scope of syncevolution?
Also a HTTP route feels more reliable and versatile than BT.
Regards, Hans de Jonge
9 years, 10 months
[SyncEvolution] CardDAV, CalDAV: New protocols for SyncEvolution
by knipp＠m-otion.com
Hi Patrick! Hello to all!
I read the list since several months, but I must have overseen one point
about the new CardDAV and CalDAV capabilites.
Will the new version synchronise Evolution to a CardDAV/CalDAV server?
Will the new version synchronise my Bluetooth SyncML device to a
CardDAV/CalDAV server?
May I use the new version to synchronise my application using the XMLRPC
backend to a CardDAV/CalDAV server?
Would it be possible to synchronise a SyncML server to a CardDAV/CalDAV
server?
Thanks in advance for clarification,
kind regards,
Franz
--
Franz Knipp, Dipl.-Ing.
---------------------------------------------------------------------
knipp(a)m-otion.com
+43 660 4859550
https://www.xing.com/profile/Franz_Knipp
---------------------------------------------------------------------
m-otion GmbH
Favoritenstr 4-6/III, 1040 Wien
+43 1 205705 (Fax 99)
---------------------------------------------------------------------
www.m-otion.com
9 years, 10 months
[SyncEvolution] Qt bindings
by Gabriel Schulhof
Hi!
I have just received access to the syncevolution repo on gitorious. I
pushed a branch called qt-bindings, which should create the bindings
necessary for talking to the syncevolution D-Bus server from a Qt app.
The bindings are enabled with --enable-qt-dbus from configure.
HTH,
Gabriel
I work for Intel.
9 years, 11 months
[SyncEvolution] [PATCH] Add DBUS_LIBS to syncevo_dbus_server_LDADD
by Jussi Kukkonen
---
syncevo-dbus-server seems to be missing link info for dbus, without
this patch I get:
/usr/bin/ld: syncevo_dbus_server-syncevo-dbus-server.o:
undefined reference to symbol 'dbus_connection_ref'
src/Makefile-gen.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile-gen.am b/src/Makefile-gen.am
index 88ffa21..35244a8 100644
--- a/src/Makefile-gen.am
+++ b/src/Makefile-gen.am
@@ -191,7 +191,7 @@ if ENABLE_UNIT_TESTS
nodist_syncevo_dbus_server_SOURCES = ../test/test.cpp
endif
-syncevo_dbus_server_LDADD = gdbus/libgdbussyncevo.la $(CORE_LDADD) $(KEYRING_LIBS) $(LIBNOTIFY_LIBS) $(KDE_KWALLET_LIBS)
+syncevo_dbus_server_LDADD = gdbus/libgdbussyncevo.la $(CORE_LDADD) $(KEYRING_LIBS) $(LIBNOTIFY_LIBS) $(KDE_KWALLET_LIBS) $(DBUS_LIBS)
syncevo_dbus_server_CPPFLAGS = -DHAVE_CONFIG_H -I$(srcdir)/gdbus $(AM_CPPFLAGS) -DSYNCEVOLUTION_LOCALEDIR=\"${SYNCEVOLUTION_LOCALEDIR}\"
syncevo_dbus_server_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(LIBSOUP_CFLAGS) $(KEYRING_CFLAGS) $(LIBNOTIFY_CFLAGS) $(KDE_KWALLET_CFLAGS)
syncevo_dbus_server_LDFLAGS = $(CORE_LD_FLAGS) $(LIBSOUP_LIBS)
--
1.7.5.1
9 years, 11 months
[SyncEvolution] [PATCH] Use single equals sign for string comparison in configure
by Jussi Kukkonen
Accepting "==" is a bashism.
---
My Debian box has started choking on configure: Dash does not seem to
like double equals signs in comparisons.
configure-post.in | 14 ++++++------
configure-pre.in | 34 +++++++++++++++---------------
src/backends/evolution/configure-sub.in | 6 ++--
src/backends/file/configure-sub.in | 2 +-
src/backends/maemo/configure-sub.in | 2 +-
src/backends/sqlite/configure-sub.in | 2 +-
src/backends/xmlrpc/configure-sub.in | 2 +-
7 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/configure-post.in b/configure-post.in
index 61e3c36..a8af9c2 100644
--- a/configure-post.in
+++ b/configure-post.in
@@ -9,7 +9,7 @@ backend_is_enabled () {
eval echo \${enable_${1}}
}
for backend in $BACKENDS; do
- if test `backend_is_enabled $backend` == "yes"; then
+ if test `backend_is_enabled $backend` = "yes"; then
enable_any="yes"
SYNCEVOLUTION_MODULES="$SYNCEVOLUTION_MODULES src/backends/sync${backend}.la"
fi
@@ -72,8 +72,8 @@ if test "$have_sha" = "no"; then
fi
dnl figure out whether we link all code statically or as modules
-AM_CONDITIONAL([ENABLE_MODULES], [test "$enable_shared" == "yes"])
-if test "$enable_shared" == "yes"; then
+AM_CONDITIONAL([ENABLE_MODULES], [test "$enable_shared" = "yes"])
+if test "$enable_shared" = "yes"; then
AC_DEFINE(ENABLE_MODULES, 1, [enable dynamically opening sync source backends])
fi
AC_SUBST(SYNCEVOLUTION_LDADD)
@@ -85,23 +85,23 @@ dnl to the sources in the SyncEvolution repository.
AC_SUBST(SYNCEVOLUTION_CXXFLAGS)
dnl a quick-and-dirty way to detect compilation for the iPhone
-if test "$host" == "arm-apple-darwin"; then
+if test "$host" = "arm-apple-darwin"; then
AC_DEFINE(IPHONE, 1, [compiling for iPhone])
DEVICE_TYPE=iPhone
fi
dnl --enable-evolution-compatibility
-if test "$enable_evolution_compatibility" == "yes"; then
+if test "$enable_evolution_compatibility" = "yes"; then
AC_DEFINE(EVOLUTION_COMPATIBILITY, 1, [avoid hard dependency on Evolution shared objects])
fi
-AM_CONDITIONAL([ENABLE_EVOLUTION_COMPATIBILITY], [test "$enable_evolution_compatibility" == "yes"])
+AM_CONDITIONAL([ENABLE_EVOLUTION_COMPATIBILITY], [test "$enable_evolution_compatibility" = "yes"])
PKG_CHECK_MODULES(LIBICAL_AVAILABLE,
libical >= 0.43,
AC_DEFINE(HAVE_LIBICAL_R, 1, [have recent enough libical with _r variants]),
pass)
dnl --enable-developer-mode
-if test "$enable_developer_mode" == "yes"; then
+if test "$enable_developer_mode" = "yes"; then
backendsearchdir="`pwd`/src/backends/"
else
backendsearchdir='$(libdir)'/syncevolution/backends/
diff --git a/configure-pre.in b/configure-pre.in
index 1c9c8eb..1415386 100644
--- a/configure-pre.in
+++ b/configure-pre.in
@@ -149,7 +149,7 @@ AC_SUBST(MODIFY_SYNCCOMPARE)
AC_CHECK_HEADERS(signal.h dlfcn.h)
# cppunit needed?
-if test $enable_unit_tests == "yes" || test $enable_integration_tests == yes; then
+if test $enable_unit_tests = "yes" || test $enable_integration_tests = yes; then
CPPUNIT_CXXFLAGS=`cppunit-config --cflags` || AC_MSG_ERROR("cppunit-config --cflags failed - is it installed?")
CPPUNIT_LDFLAGS=`cppunit-config --libs` || AC_MSG_ERROR("cppunit-config --libs failed - is it installed?")
fi
@@ -174,7 +174,7 @@ AM_CONDITIONAL([ENABLE_UNIT_TESTS], [test "$enable_unit_tests" = "yes"])
AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_unit_tests" = "yes" || test "$enable_integration_tests" = "yes" ])
AM_CONDITIONAL([ENABLE_BUTEO_TESTS], [test "$enable_buteo_tests" = "yes"])
-if test $enable_static_cxx == "yes"; then
+if test $enable_static_cxx = "yes"; then
LIBS="$LIBS -L."
CORE_LDADD_DEP=libstdc++.a
fi
@@ -405,7 +405,7 @@ AC_ARG_ENABLE(dbus-service,
[enables building the dbus service executable and all related features
(the DBus wrapper library, command line usage of server, etc).]),
enable_dbus_service="$enableval",
- [if test $enable_gui == "no"; then
+ [if test $enable_gui = "no"; then
enable_dbus_service="no"
else
enable_dbus_service="yes"
@@ -420,10 +420,10 @@ AC_ARG_ENABLE(gnome-keyring,
test "$enable_gnome_keyring" = "yes" || test "$enable_gnome_keyring" = "no" || AC_ERROR([invalid value for --enable-gnome-keyring: $enable_gnome_keyring])
test "$enable_gnome_keyring" = "no" || test "$HAVE_KEYRING" = "yes" || AC_ERROR([gnome-keyring-1 pkg not found, needed for --enable-gnome-keyring])],
enable_gnome_keyring="$HAVE_KEYRING")
-if test $enable_gnome_keyring == "yes"; then
+if test $enable_gnome_keyring = "yes"; then
AC_DEFINE(USE_GNOME_KEYRING, 1, [define if gnome keyring should be used in dbus service])
PKG_CHECK_MODULES([KEYRING_2_20], [gnome-keyring-1 >= 2.20 ], KEYRING220=yes, KEYRING220=no)
- if test $KEYRING220 == "yes"; then
+ if test $KEYRING220 = "yes"; then
AC_DEFINE(GNOME_KEYRING_220, 1, [define if gnome keyring version is above 2.20])
fi
fi
@@ -475,7 +475,7 @@ AM_CONDITIONAL([USE_KDE_KWALLET], [test "$use_kde_kwallet" = "yes"])
## End KWallet ################################
-if test $enable_dbus_service == "yes"; then
+if test $enable_dbus_service = "yes"; then
if test -z "$XSLT"; then
AC_ERROR([xsltproc not found, is required for D-Bus service])
fi
@@ -495,7 +495,7 @@ if test $enable_dbus_service == "yes"; then
[send notifications for automatic sync events]),
[ test "$enableval" = "no" || test $HAVE_LIBNOTIFY = "yes" || AC_ERROR([required libnotify package not found]) ],
[ test $HAVE_LIBNOTIFY = "yes" || AC_ERROR([required libnotify package not found, use --disable-notify to compile without notifications]) ])
- if test $HAVE_LIBNOTIFY == "yes"; then
+ if test $HAVE_LIBNOTIFY = "yes"; then
AC_DEFINE(HAS_NOTIFY, 1, [define if libnotify could be used in dbus service])
fi
AC_DEFINE(DBUS_SERVICE, 1, [define if dbus service is enabled])
@@ -518,7 +518,7 @@ DBUS_SERVICES_DIR="${datadir}/dbus-1/services"
AC_SUBST(DBUS_SERVICES_DIR)
AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Location of D-Bus services directory])
-if test $enable_gui != "no" || test $enable_dbus_service == "yes"; then
+if test $enable_gui != "no" || test $enable_dbus_service = "yes"; then
IT_PROG_INTLTOOL([0.37.1])
GETTEXT_PACKAGE=syncevolution
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext package name])
@@ -541,16 +541,16 @@ if test $enable_gui != "no"; then
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
gui_modules="glib-2.0 dbus-glib-1 >= 0.60 gtk+-2.0 libglade-2.0 gio-2.0"
- if test $enable_gui == "moblin"; then
+ if test $enable_gui = "moblin"; then
AC_DEFINE(USE_MOBLIN_UX, 1, [Use Moblin UI widgets])
fi
- if test $enable_gui == "moblin" -o $enable_gui == "all"; then
+ if test $enable_gui = "moblin" -o $enable_gui = "all"; then
gui_modules="$guimodules mx-gtk-1.0"
PKG_CHECK_MODULES(MX_GTK_0_99_1, mx-gtk-1.0 >= 0.99.1,
have_mx_gtk_0_99_1="yes",
have_mx_gtk_0_99_1="no")
- if test $have_mx_gtk_0_99_1 == "yes"; then
+ if test $have_mx_gtk_0_99_1 = "yes"; then
AC_DEFINE(MX_GTK_0_99_1, 1, [we have Mx-Gtk 0.99.1 or better])
fi
fi
@@ -558,7 +558,7 @@ if test $enable_gui != "no"; then
PKG_CHECK_MODULES(UNIQUE, unique-1.0,
have_unique="yes",
have_unique="no")
- if test $have_unique == "yes"; then
+ if test $have_unique = "yes"; then
gui_modules="$gui_modules unique-1.0"
AC_DEFINE(ENABLE_UNIQUE, 1, [enable single-app-instance functionality])
fi
@@ -566,7 +566,7 @@ if test $enable_gui != "no"; then
PKG_CHECK_MODULES(GTK_2_18, gtk+-2.0 >= 2.18,
have_gtk_2_18="yes",
have_gtk_2_18="no")
- if test $have_gtk_2_18 == "yes"; then
+ if test $have_gtk_2_18 = "yes"; then
AC_DEFINE(GTK_2_18, 1, [we have GTK+ 2.18 or better])
fi
@@ -600,10 +600,10 @@ AC_ARG_WITH(rst2man,
An explicit --without-rst2man or not having it installed turn off
building of man pages.]),
[RST2MAN=$withval
- if test "$RST2MAN" == "yes"; then
+ if test "$RST2MAN" = "yes"; then
AC_PATH_PROG(RST2MAN, rst2man, "no")
fi
- test "$RST2MAN" == "no" || test -x "$RST2MAN" || AC_ERROR([--with-rst2man=$RST2MAN: tool not found])],
+ test "$RST2MAN" = "no" || test -x "$RST2MAN" || AC_ERROR([--with-rst2man=$RST2MAN: tool not found])],
[AC_PATH_PROG(RST2MAN, rst2man, "no")])
AM_CONDITIONAL([COND_MAN_PAGES], [test "$RST2MAN" != "no"])
@@ -614,10 +614,10 @@ AC_ARG_WITH(rst2html,
An explicit --without-rst2html or not having it installed turn off
building of README in HTML format.]),
[RST2HTML=$withval
- if test "$RST2HTML" == "yes"; then
+ if test "$RST2HTML" = "yes"; then
AC_PATH_PROG(RST2HTML, rst2html, "no")
fi
- test "$RST2HTML" == "no" || test -x "$RST2HTML" || AC_ERROR([--with-rst2html=$RST2HTML: tool not found])],
+ test "$RST2HTML" = "no" || test -x "$RST2HTML" || AC_ERROR([--with-rst2html=$RST2HTML: tool not found])],
[AC_PATH_PROG(RST2HTML, rst2html, "no")])
AM_CONDITIONAL([COND_HTML_README], [test "$RST2HTML" != "no"])
diff --git a/src/backends/evolution/configure-sub.in b/src/backends/evolution/configure-sub.in
index 541c13c..51fe0e3 100644
--- a/src/backends/evolution/configure-sub.in
+++ b/src/backends/evolution/configure-sub.in
@@ -63,7 +63,7 @@ AC_ARG_ENABLE_BACKEND(ecal, evolution,
enable_evo="no"
if test "$enable_ebook" = "yes"; then
- test "x${EBOOKFOUND}" == "xyes" || AC_MSG_ERROR([--enable-ebook requires pkg-config information for libebook, which was not found])
+ test "x${EBOOKFOUND}" = "xyes" || AC_MSG_ERROR([--enable-ebook requires pkg-config information for libebook, which was not found])
AC_DEFINE(ENABLE_EBOOK, 1, [libebook available])
enable_evo="yes"
else
@@ -71,10 +71,10 @@ else
EBOOK_LIBS=
fi
-AM_CONDITIONAL([ENABLE_ECAL], [test "$enable_ecal" == "yes"])
+AM_CONDITIONAL([ENABLE_ECAL], [test "$enable_ecal" = "yes"])
AM_CONDITIONAL([ENABLE_ICAL], [test "$enable_ecal" = "yes"])
if test "$enable_ecal" = "yes"; then
- test "x${ECALFOUND}" == "xyes" || AC_MSG_ERROR([--enable-ecal requires pkg-config information for libecal, which was not found"])
+ test "x${ECALFOUND}" = "xyes" || AC_MSG_ERROR([--enable-ecal requires pkg-config information for libecal, which was not found"])
AC_DEFINE(ENABLE_ECAL, 1, [libecal available])
AC_DEFINE(ENABLE_ICAL, 1, [libical in use])
enable_evo="yes"
diff --git a/src/backends/file/configure-sub.in b/src/backends/file/configure-sub.in
index e0762f3..a2bbf78 100644
--- a/src/backends/file/configure-sub.in
+++ b/src/backends/file/configure-sub.in
@@ -32,6 +32,6 @@ AC_ARG_ENABLE_BACKEND(file,
if test "$enable_file" = "yes"; then
dnl It's good to check the prerequisites here, in case --enable-file was used.
- dnl test "x${SQLITEFOUND}" == "xyes" || AC_MSG_ERROR([--enable-sqlite requires pkg-config information for sqlite3, which was not found])
+ dnl test "x${SQLITEFOUND}" = "xyes" || AC_MSG_ERROR([--enable-sqlite requires pkg-config information for sqlite3, which was not found])
AC_DEFINE(ENABLE_FILE, 1, [file available])
fi
diff --git a/src/backends/maemo/configure-sub.in b/src/backends/maemo/configure-sub.in
index b97da6f..a5f5d21 100644
--- a/src/backends/maemo/configure-sub.in
+++ b/src/backends/maemo/configure-sub.in
@@ -13,6 +13,6 @@ AC_ARG_ENABLE_BACKEND(maemocal, maemo,
[enable_maemocal="$enableval"], [enable_maemocal="no"])
if test "$enable_maemocal" = "yes"; then
- test "x${MCALBFOUND}" == "xyes" || AC_MSG_ERROR([--enable-maemo-calendar requires pkg-config information for calendar-backend, which was not found])
+ test "x${MCALBFOUND}" = "xyes" || AC_MSG_ERROR([--enable-maemo-calendar requires pkg-config information for calendar-backend, which was not found])
AC_DEFINE(ENABLE_MAEMO_CALENDAR, 1, [Maemo 5 calendar available])
fi
diff --git a/src/backends/sqlite/configure-sub.in b/src/backends/sqlite/configure-sub.in
index 908fbee..e3cb22b 100644
--- a/src/backends/sqlite/configure-sub.in
+++ b/src/backends/sqlite/configure-sub.in
@@ -12,7 +12,7 @@ AC_ARG_ENABLE_BACKEND(sqlite, sqlite,
[enable_sqlite="$enableval"], [enable_sqlite="no"])
if test "$enable_sqlite" = "yes"; then
- test "x${SQLITEFOUND}" == "xyes" || AC_MSG_ERROR([--enable-sqlite requires pkg-config information for sqlite3, which was not found])
+ test "x${SQLITEFOUND}" = "xyes" || AC_MSG_ERROR([--enable-sqlite requires pkg-config information for sqlite3, which was not found])
AC_DEFINE(ENABLE_SQLITE, 1, [sqlite available])
else
# avoid linking against it if not needed
diff --git a/src/backends/xmlrpc/configure-sub.in b/src/backends/xmlrpc/configure-sub.in
index b4a6866..7f6b860 100644
--- a/src/backends/xmlrpc/configure-sub.in
+++ b/src/backends/xmlrpc/configure-sub.in
@@ -26,7 +26,7 @@ AC_ARG_ENABLE_BACKEND(xmlrpc,
if test "$enable_xmlrpc" = "yes"; then
dnl It's good to check the prerequisites here, in case --enable-xmlrpc was used.
- dnl test "x${SQLITEFOUND}" == "xyes" || AC_MSG_ERROR([--enable-sqlite requires pkg-config information for sqlite3, which was not found])
+ dnl test "x${SQLITEFOUND}" = "xyes" || AC_MSG_ERROR([--enable-sqlite requires pkg-config information for sqlite3, which was not found])
test -e /usr/bin/xmlrpc-c-config || AC_MSG_ERROR([--enable-xmlrpc requires xmlrpc-c-config, which was not found])
--
1.7.5.1
9 years, 11 months
