[evolution-data-server] Check for dbus-binding-tool during configure.

[Fridrich Strba <strba src gnome org>]

commit 1aa9a2c8695a0bc736bc291a6deedfe29f16bf26
Author: Fridrich Strba <fridrich strba bluewin ch>
Date:   Mon Mar 8 12:12:53 2010 +0100

    Check for dbus-binding-tool during configure.
    
    When cross-compiling, this tool is a native tool that can be in a
    different package then the dbus-1-glib libraries.

 addressbook/libebook/Makefile.am             |    2 +-
 addressbook/libedata-book/Makefile.am        |    2 +-
 calendar/libecal/Makefile.am                 |    2 +-
 calendar/libedata-cal/Makefile.am            |    2 +-
 camel/providers/imapx/camel-imapx-tokenise.h |   16 ++++++++--------
 configure.ac                                 |    7 +++++++
 6 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 2210723..18150e6 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -63,7 +63,7 @@ pkgconfig_DATA = libebook-$(API_VERSION).pc
 
 DBUS_GENERATED_H = e-data-book-factory-bindings.h e-data-book-bindings.h e-data-book-view-bindings.h
 %-bindings.h: $(top_srcdir)/addressbook/libedata-book/%.xml
-	dbus-binding-tool --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
+	@DBUS_BINDING_TOOL@ --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
 BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
 CLEANFILES    = $(BUILT_SOURCES)
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index f21594c..e11a15e 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -1,6 +1,6 @@
 DBUS_GENERATED_H = e-data-book-glue.h e-data-book-factory-glue.h e-data-book-view-glue.h
 %-glue.h: %.xml
-	dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
+	@DBUS_BINDING_TOOL@ --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
 include $(top_srcdir)/glib-gen.mak
 glib_enum_headers=e-data-book-types.h
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 45daa94..7d0d17f 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -59,7 +59,7 @@ pkgconfig_DATA = libecal-$(API_VERSION).pc
 DBUS_GENERATED_H = e-data-cal-factory-bindings.h e-data-cal-bindings.h e-data-cal-view-bindings.h
 
 %-bindings.h: $(top_srcdir)/calendar/libedata-cal/%.xml
-	dbus-binding-tool --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
+	@DBUS_BINDING_TOOL@ --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
 BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index 31851da..7bd113b 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -3,7 +3,7 @@ MARSHAL_GENERATED = e-data-cal-marshal.c e-data-cal-marshal.h
 
 DBUS_GENERATED_H = e-data-cal-glue.h e-data-cal-factory-glue.h e-data-cal-view-glue.h
 %-glue.h: %.xml
-	dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
+	@DBUS_BINDING_TOOL@ --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
 include $(top_srcdir)/glib-gen.mak
 glib_enum_headers=e-data-cal-types.h
diff --git a/camel/providers/imapx/camel-imapx-tokenise.h b/camel/providers/imapx/camel-imapx-tokenise.h
index 2dedf38..be70a54 100644
--- a/camel/providers/imapx/camel-imapx-tokenise.h
+++ b/camel/providers/imapx/camel-imapx-tokenise.h
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.2 */
-/* Command-line: gperf -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k'1,$' camel-imapx-tokens.txt  */
+/* Command-line: /usr/bin/gperf -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k'1,$' camel-imapx-tokens.txt  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -45,10 +45,10 @@ __inline
 inline
 #endif
 #endif
-static guint
-imapx_hash (register const gchar *str, register guint len)
+static unsigned int
+imapx_hash (register const char *str, register unsigned int len)
 {
-  static guchar asso_values[] =
+  static unsigned char asso_values[] =
     {
       57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
       57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
@@ -77,14 +77,14 @@ imapx_hash (register const gchar *str, register guint len)
       57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
       57, 57, 57, 57, 57, 57
     };
-  return len + asso_values[(guchar)str[len - 1]] + asso_values[(guchar)str[0]];
+  return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
 }
 
 #ifdef __GNUC__
 __inline
 #endif
 struct _imapx_keyword *
-imapx_tokenise_struct (register const gchar *str, register guint len)
+imapx_tokenise_struct (register const char *str, register unsigned int len)
 {
   static struct _imapx_keyword wordlist[] =
     {
@@ -174,11 +174,11 @@ imapx_tokenise_struct (register const gchar *str, register guint len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register gint key = imapx_hash (str, len);
+      register int key = imapx_hash (str, len);
 
       if (key <= MAX_HASH_VALUE && key >= 0)
         {
-          register const gchar *s = wordlist[key].name;
+          register const char *s = wordlist[key].name;
 
           if (*str == *s && !strcmp (str + 1, s + 1))
             return &wordlist[key];
diff --git a/configure.ac b/configure.ac
index c420163..b81c123 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1175,6 +1175,13 @@ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_minimum_version)
 AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
 
+AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, [no])
+if test x$DBUS_BINDING_TOOL -eq xno; then
+  AC_MSG_ERROR(["Could not find dbus-binding-tools"])
+fi
+AC_SUBST(DBUS_BINDING_TOOL)
+
+
 dnl ***********************
 dnl Gnome keyring support
 dnl ***********************