[gnome-builder] sysprof: make --enable-sysprof=auto by default
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] sysprof: make --enable-sysprof=auto by default
- Date: Wed, 24 Aug 2016 17:44:12 +0000 (UTC)
commit df65b7c9adbecabe962b55ef9f3a17de247d7bee
Author: Christian Hergert <chergert redhat com>
Date: Wed Aug 24 10:44:04 2016 -0700
sysprof: make --enable-sysprof=auto by default
This allows us to disable the sysprof plugin if sysprof is not installed
or lacks the sysprof-ui-2 library.
plugins/sysprof/configure.ac | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/sysprof/configure.ac b/plugins/sysprof/configure.ac
index 198ee55..8526d7e 100644
--- a/plugins/sysprof/configure.ac
+++ b/plugins/sysprof/configure.ac
@@ -7,21 +7,21 @@ PKG_CHECK_MODULES(SYSPROF,
# --enable-sysprof-plugin=yes/no
AC_ARG_ENABLE([sysprof-plugin],
- [AS_HELP_STRING([--enable-sysprof-plugin=@<:@yes/no@:>@],
+ [AS_HELP_STRING([--enable-sysprof-plugin=@<:@yes/no/auto@:>@],
[Build with support for the Sysprof system profiler.])],
[enable_sysprof_plugin=$enableval],
- [enable_sysprof_plugin=yes])
+ [enable_sysprof_plugin=auto])
-AS_IF([test x$enable_sysprof_plugin = xyes && test x$have_sysprof_ui = xno],[
- AC_MSG_ERROR([Failed to locate sysprof-ui dependencies. Try installing Sysprof with GTK support.])
+AS_IF([test x$enable_sysprof_plugin = xauto],[
+ AS_IF([test x$have_sysprof_ui = xyes],[enable_sysprof_plugin=yes],[enable_sysprof_plugin=no])
])
-AS_IF([test x$have_sysprof_ui = xno],[
- enable_sysprof_plugin=no
+AS_IF([test x$enable_sysprof_plugin = xyes && test x$have_sysprof_ui = xno],[
+ AC_MSG_ERROR([Failed to locate sysprof-ui dependencies. Try installing Sysprof with GTK support.])
])
# for if ENABLE_SYSPROF_PLUGIN in Makefile.am
-AM_CONDITIONAL(ENABLE_SYSPROF_PLUGIN, test x$enable_sysprof_plugin != xno)
+AM_CONDITIONAL(ENABLE_SYSPROF_PLUGIN, [test x$enable_sysprof_plugin = xyes])
# Ensure our makefile is generated by autoconf
AC_CONFIG_FILES([plugins/sysprof/Makefile])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]