diff options
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | shell/Makefile.am | 17 |
2 files changed, 12 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index b2718d8..8c508c8 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,6 @@ AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"]) AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"]) dnl Specify required versions of dependencies -DBUS_GLIB_REQUIRED=0.70 GTK_REQUIRED=2.21.0 GLIB_REQUIRED=2.25.6 KEYRING_REQUIRED=2.22.0 @@ -277,26 +276,13 @@ AC_ARG_ENABLE([dbus], 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]) + PKG_CHECK_MODULES([EV_DAEMON], [gio-2.0 >= $GLIB_REQUIRED]) +fi AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"]) -if test "$enable_dbus" = "yes"; then - PKG_CHECK_MODULES([EV_DAEMON], [gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) -fi - dnl ========= Check for GConf AC_MSG_CHECKING([whether GConf support is requested]) @@ -360,8 +346,8 @@ BACKEND_LIBS="$BACKEND_LIBS -lm" AC_SUBST(BACKEND_CFLAGS) AC_SUBST(BACKEND_LIBS) -SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" -SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm" +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS" +SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm" AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) diff --git a/shell/Makefile.am b/shell/Makefile.am index c801b78..af105eb 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -30,13 +30,6 @@ if ENABLE_DBUS libexec_PROGRAMS += evinced endif -EV_MEDIA_PLAYER_KEYS_SOURCES = ev-media-player-keys.c ev-media-player-keys.h -if ENABLE_DBUS -DBUS_SOURCES = $(EV_MEDIA_PLAYER_KEYS_SOURCES) -else -DBUS_SOURCES = $(null) -endif - evince_SOURCES= \ eggfindbar.c \ eggfindbar.h \ @@ -91,6 +84,13 @@ evince_SOURCES= \ ev-sidebar-thumbnails.h \ main.c +if ENABLE_DBUS +evince_SOURCES += \ + ev-media-player-keys.c \ + ev-media-player-keys.h +endif + + evince_LDFLAGS = $(AM_LDFLAGS) if PLATFORM_WIN32 @@ -144,8 +144,7 @@ evinced_LDADD= \ endif EXTRA_DIST = ev-marshal.list \ - evince-icon.rc \ - $(EV_MEDIA_PLAYER_KEYS_SOURCES) + evince-icon.rc ev-marshal.h: $(srcdir)/ev-marshal.list $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h |