From 28df8004a43a579e93ea905a2426fe42e1e6dfa7 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Thu, 7 Jul 2005 15:35:16 +0000
Subject: [PATCH] Ever build metadata manager since it's just disabled at
runtime now.
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
* configure.ac:
* shell/Makefile.am:
Ever build metadata manager since it's just
disabled at runtime now.
---
ChangeLog | 8 ++++++++
configure.ac | 2 --
shell/Makefile.am | 8 ++------
shell/main.c | 7 +------
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6d69b82e..75627886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * configure.ac:
+ * shell/Makefile.am:
+
+ Ever build metadata manager since it's just
+ disabled at runtime now.
+
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
* shell/ev-metadata-manager.c: (ev_metadata_manager_init),
diff --git a/configure.ac b/configure.ac
index a0459df9..4b91c1aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,6 @@ if test "x$enable_dbus" = "xyes" ; then
fi
AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
- AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled])
DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'`
AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
@@ -90,7 +89,6 @@ AC_SUBST(FRONTEND_CFLAGS)
AC_SUBST(FRONTEND_LIBS)
AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
-AM_CONDITIONAL([ENABLE_METADATA], [test "x$enable_dbus" = "xyes"])
AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
dnl Check for Nautilus property page build
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8b6cd7d7..dffbb750 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -30,6 +30,8 @@ evince_SOURCES= \
ev-job-xfer.h \
ev-marshal.c \
ev-marshal.h \
+ ev-metadata-manager.c \
+ ev-metadata-manager.h \
ev-page-action.c \
ev-page-action.h \
ev-page-cache.h \
@@ -66,12 +68,6 @@ evince_SOURCES= \
ev-stock-icons.h \
main.c
-if ENABLE_METADATA
-evince_SOURCES += \
- ev-metadata-manager.h \
- ev-metadata-manager.c
-endif
-
evince_LDADD= \
$(SHELL_LIBS) \
$(top_builddir)/cut-n-paste/recent-files/librecent.la \
diff --git a/shell/main.c b/shell/main.c
index 7a070912..f6600f0f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -149,9 +149,7 @@ load_files_remote (const char **files)
int
main (int argc, char *argv[])
{
-#ifdef ENABLE_METADATA
gboolean enable_metadata = FALSE;
-#endif
poptContext context;
GValue context_as_value = { 0 };
GnomeProgram *program;
@@ -189,11 +187,10 @@ main (int argc, char *argv[])
gnome_authentication_manager_init ();
-#if ENABLE_METADATA
+
if (enable_metadata) {
ev_metadata_manager_init ();
}
-#endif
ev_job_queue_init ();
g_set_application_name (_("Evince Document Viewer"));
@@ -211,11 +208,9 @@ main (int argc, char *argv[])
poptFreeContext (context);
ev_file_helpers_shutdown ();
-#if ENABLE_METADATA
if (enable_metadata) {
ev_metadata_manager_shutdown ();
}
-#endif
return 0;
}
--
2.43.5