From 1639f9f624aabaaebd035d27f2e560fd1f56341b Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 19 Mar 2011 17:47:42 +0100 Subject: [PATCH] Add possibility to build all extensions For testing, for packaging, and for jhbuild installations, you can use --enable-extensions=all to get back to previous behaviour of installing all extensions. --- Makefile.am | 2 ++ configure.ac | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fba0d5fc..faea6d66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = extensions po + +DISTCHECK_CONFIGURE_FLAGS = --enable-extensions=all diff --git a/configure.ac b/configure.ac index 8997f77f..7297205b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,16 +26,22 @@ dock user-theme alternative-status-menu" DEFAULT_EXTENSIONS="alternate-tab windowsNavigator dock alternative-status-menu" AC_ARG_ENABLE([extensions], [AS_HELP_STRING([--enable-extensions],[Space separated list of extensions to enable. - The default is to build all extensions that can be installed in the home directory and have no external depedencies.])], + The default is to build all extensions that can be installed in the home directory and have no external depedencies. + Use "all" to enable all available extensions.])], [], [enable_extensions=$DEFAULT_EXTENSIONS] ) +if test x$enable_extensions = xall; then + enable_extensions="$ALL_EXTENSIONS" +fi + +ADDITIONAL_PACKAGES= ENABLED_EXTENSIONS= for e in $enable_extensions; do case $e in xrandr-indicator) ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e" - ADDITIONAL_PACKAGES="gnome-desktop-3.0 >= 2.91.6" + ADDITIONAL_PACKAGES="$ADDITIONAL_PAGKAGES gnome-desktop-3.0 >= 2.91.6" ;; alternate-tab|example|windowsNavigator|auto-move-windows|dock|user-theme|alternative-status-menu) ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"