diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-07-06 11:10:37 (GMT) |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-07-06 11:10:37 (GMT) |
| commit | 9c4285f1754fba201f7355df46dcf589910e15bb (patch) | |
| tree | 4758602693f3d618fe088f73ee5096db01753307 /configure.ac | |
| parent | 938636d838432d71cd8ed1c2aa1604faa6f8d083 (diff) | |
Fix DBUS configure checks.
2005-07-06 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
Fix DBUS configure checks.
* shell/ev-metadata-manager.c: (ev_metadata_manager_set_int),
(ev_metadata_manager_set_double), (ev_metadata_manager_set_string),
(ev_metadata_manager_set_boolean):
Plug mem leaks.
* shell/ev-window.c: (page_changed_cb), (ev_window_run_fullscreen),
(ev_window_stop_fullscreen), (ev_window_run_presentation),
(ev_window_stop_presentation), (ev_window_zoom_changed_cb),
(ev_window_continuous_changed_cb),
(ev_window_dual_mode_changed_cb), (ev_window_new):
Fix the build without DBUS.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index d28f9e8..dbf8157 100644 --- a/configure.ac +++ b/configure.ac @@ -50,12 +50,16 @@ PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= $POPPLER_REQUIRED) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -PKG_CHECK_EXISTS([dbus-glib-1 >= $DBUS_GLIB_REQUIRED], [enable_dbus=yes], - [AC_MSG_WARN("DBUS support is disabled since dbus 0.33 or higher was not found") - enable_dbus=no]) +PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED], + [enable_dbus=yes],[enable_dbus=no]) +AC_SUBST([DBUS_CFLAGS]) +AC_SUBST([DBUS_LIBS]) + +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 - PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) if test x$DBUS_BINDING_TOOL = "xno" ; then |