[shotwell] Add option to install apport hook
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Add option to install apport hook
- Date: Tue, 30 May 2017 20:16:52 +0000 (UTC)
commit c9f414307468dd3f9706b4702646cb7ed162b06f
Author: Jens Georg <mail jensge org>
Date: Tue May 30 22:15:13 2017 +0200
Add option to install apport hook
https://bugzilla.gnome.org/show_bug.cgi?id=716547
Makefile.am | 2 +-
configure.ac | 12 ++++++++++++
meson.build | 4 ++++
meson_options.txt | 1 +
4 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5400484..f6e5c17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = misc help po app-icons icons ui
+SUBDIRS = misc help po app-icons icons ui apport
EXTRA_DIST = AUTHORS
diff --git a/configure.ac b/configure.ac
index 028cbc7..2ed72cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,17 @@ AC_SUBST([HAVE_UNITY])
AM_CONDITIONAL([HAVE_UNITY],[test "x$HAVE_UNITY" = "xyes"])
dnl ***********************************************************************
+dnl Ubuntu apport hook
+dnl ***********************************************************************
+AC_ARG_ENABLE([apport-hook],
+ AS_HELP_STRING([--enable-apport-hook],
+ [Install apport hook]),
+ [],
+ [enable_apport_hook=no])
+
+AM_CONDITIONAL([INSTALL_APPORT_HOOK], [test "x$enable_apport_hook" != "xno"])
+
+dnl ***********************************************************************
dnl Publishers
dnl ***********************************************************************
@@ -275,6 +286,7 @@ AC_CONFIG_FILES([
app-icons/Makefile
icons/Makefile
ui/Makefile
+ apport/Makefile
],[],
[API_VERSION='$API_VERSION'])
AC_OUTPUT
diff --git a/meson.build b/meson.build
index 88c445f..06f9fc2 100644
--- a/meson.build
+++ b/meson.build
@@ -99,3 +99,7 @@ subdir('misc')
subdir('thumbnailer')
subdir('settings-migrator')
subdir('app-icons')
+
+if get_option('install-apport-hook')
+ subdir('apport')
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 2bb4315..ba11c1c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,3 +4,4 @@ option('enable-extra-plugins', type : 'boolean', value : 'true', description: 'E
option('trace', type: 'string', value : '', description: 'Enable various trace options (available: dtors,
import, md5, metadata-writer, monitoring, pixbuf-cache, reflow, reflow-items)')
option('measure', type: 'string', value : '', description : 'Enable various timing measurements(available :
enhance, import, pipeline, view-filtering, thumbnail-cache)')
option('disable-dupe-detection', type: 'boolean', value : 'false', description: 'Disable duplicate checks')
+option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]