[gedit] Better conditionally compile old metadata manager
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Better conditionally compile old metadata manager
- Date: Sun, 18 Apr 2010 11:02:54 +0000 (UTC)
commit 940d150d4ce8d9f35ba396c6229ce334cd7298b0
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Sun Apr 18 12:48:26 2010 +0200
Better conditionally compile old metadata manager
configure.ac | 17 +++++++++++++++++
gedit/Makefile.am | 4 ++--
gedit/gedit-document.c | 6 +++---
3 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7f45264..3f604ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,23 @@ AM_GNU_GETTEXT_VERSION([0.17])
AM_GLIB_GNU_GETTEXT
AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
+if test "x$os_osx" != "xno" || test "x$os_win32" != "xno"; then
+ file_metadata_default="no"
+else
+ file_metadata_default="yes"
+fi
+
+AC_ARG_ENABLE([file-metadata],
+ AS_HELP_STRING([--enable-file-metadata], [Enable file metadata]),
+ [enable_file_metadata=$enableval],
+ [enable_file_metadata=$file_metadata_default])
+
+AM_CONDITIONAL(ENABLE_FILE_METADATA, test "x$enable_file_metadata" != "xno")
+
+if test "x$enable_file_metadata" != "xno"; then
+ AC_DEFINE([ENABLE_FILE_METADATA], [1], [Define to enable file metadata])
+fi
+
dnl ================================================================
dnl check update plugin
dnl ================================================================
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 9c61383..c707a68 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -117,7 +117,7 @@ INST_H_FILES = \
gedit-view.h \
gedit-window.h
-if OS_WIN32
+if !ENABLE_FILE_METADATA
INST_H_FILES += gedit-metadata-manager.h
endif
@@ -188,7 +188,7 @@ libgedit_la_SOURCES = \
$(NOINST_H_FILES) \
$(INST_H_FILES)
-if OS_WIN32
+if !ENABLE_FILE_METADATA
libgedit_la_SOURCES += gedit-metadata-manager.c
endif
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 6af85b2..2149ef9 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -52,7 +52,7 @@
#include "gedit-enum-types.h"
#include "gedittextregion.h"
-#ifdef G_OS_WIN32
+#ifndef ENABLE_FILE_METADATA
#include "gedit-metadata-manager.h"
#else
#define METADATA_QUERY "metadata::*"
@@ -745,7 +745,7 @@ on_uri_changed (GeditDocument *doc,
GParamSpec *pspec,
gpointer useless)
{
-#ifndef G_OS_WIN32
+#ifdef ENABLE_FILE_METADATA
GFile *location;
location = gedit_document_get_location (doc);
@@ -2571,7 +2571,7 @@ _gedit_document_create_mount_operation (GeditDocument *doc)
doc->priv->mount_operation_userdata);
}
-#ifdef G_OS_WIN32
+#ifndef ENABLE_FILE_METADATA
gchar *
gedit_document_get_metadata (GeditDocument *doc,
const gchar *key)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]