From: Christian Persch <chpe@gnome.org>
Date: Sat, 6 Jun 2009 13:07:29 +0000 (+0200)
Subject: Disable single instance by DBUS for hildon platform
X-Git-Tag: EVINCE_2_27_3~21
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=bd3cac726fa7c739a146f5ca68fc33e36d4c1132;p=evince.git

Disable single instance by DBUS for hildon platform

And remove the dbus-binding-tool NO_PREFIX check (very old version).
---

diff --git a/configure.ac b/configure.ac
index a023e368..6a8a694c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,34 +232,34 @@ fi
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
 
-dnl ========= Check for DBUS
-AC_ARG_ENABLE(dbus,
- 	[AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
-	enable_dbus="$enableval",enable_dbus=yes)
-if test "x$enable_dbus" != "xno"; then
-   	PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
-	[enable_dbus=yes],[enable_dbus=no])
-
-	if test "x$enable_dbus" = "xno"; then
-	   AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
-	fi	   
-
-	if test "x$enable_dbus" = "xyes" ; then
-           	AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
-
-        	if test x$DBUS_BINDING_TOOL = "xno" ; then
-        	   	AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
-        	fi                                            
-
-        	AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
-	fi
+# ****
+# DBUS
+# ****
+
+AC_ARG_ENABLE([dbus],
+  [AS_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
+  [],
+  [case "$with_platform" in
+      gnome) enable_dbus=yes ;;
+      hildon) enable_dbus=no ;;
+    esac])
+
+if test "$enable_dbus" = "yes"; then
+  PKG_CHECK_MODULES([DBUS],[dbus-glib-1 >= $DBUS_GLIB_REQUIRED],[],
+                    [AC_MSG_ERROR([DBUS not found; use --disable-dbus to disable DBUS support])])
+
+  AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+  if test x$DBUS_BINDING_TOOL = "xno" ; then
+          AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
+  fi
+
+  AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
 fi
 
 AC_SUBST([DBUS_CFLAGS])
 AC_SUBST([DBUS_LIBS])
 
-AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
-AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
+AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
 
 dnl ========= Check for GConf
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0262c37b..0594ac96 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -121,10 +121,5 @@ ev-marshal.c: $(srcdir)/ev-marshal.list
 DISTCLEANFILES= \
 	ev-application-service.h
 
-if DBUS_TOOL_NO_PREFIX
-ev-application-service.h: $(srcdir)/ev-application-service.xml
-	$(QUIET_GEN)dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
-else
 ev-application-service.h: $(srcdir)/ev-application-service.xml
 	$(QUIET_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
-endif