From 0fbc1989d103cd489ca1040f792d9391c31aeef5 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 23 Apr 2016 12:43:16 +0200 Subject: Revert "Gtk+-3.20 branch: make GreanLaguna optional (not default)" This reverts commit bed08df0ccc0704cf72f2120e3bcb31e9c2a782f. --- configure.ac | 16 ---------------- desktop-themes/Makefile.am | 15 --------------- 2 files changed, 31 deletions(-) diff --git a/configure.ac b/configure.ac index 7c15e287..fcb91453 100644 --- a/configure.ac +++ b/configure.ac @@ -41,18 +41,6 @@ AC_SUBST_FILE(media_stock_icons_rc) AC_SUBST_FILE(capplet_stock_icons_rc) AC_SUBST_FILE(marco_stock_icons_rc) -dnl *************************************************************************** -dnl *** Greenlaguna checks *** -dnl *************************************************************************** -AC_ARG_ENABLE(GreenLaguna, - [ --enable-GreenLaguna Install the GreenLaguna desktop theme.], - [enable_greenlaguna=$enableval], [enable_greenlaguna=no]) - -AM_CONDITIONAL(BUILD_GREENLAGUNA, test "x$enable_greenlaguna" = "xyes") -if test "$enable_greenlaguna" = yes; then - AC_DEFINE(BUILD_GREENLAGUNA, 1, [Install the GreenLaguna desktop theme.]) -fi - AC_CONFIG_FILES([ Makefile common/Makefile @@ -254,8 +242,4 @@ mate-themes-$VERSION: Installation prefix: ${prefix} - Building extra themes: ${enable_greenlaguna} - - configuration successfully :) now type make - " diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am index de5f46ff..be35d672 100644 --- a/desktop-themes/Makefile.am +++ b/desktop-themes/Makefile.am @@ -1,19 +1,4 @@ -if BUILD_GREENLAGUNA -greenlaguna_SUBDIR = GreenLaguna -endif - SUBDIRS = \ - BlackMATE \ - BlueMenta \ - Blue-Submarine \ - ContrastHighInverse \ - $(greenlaguna_SUBDIR) \ - Green-Submarine \ - Menta \ - TraditionalGreen \ - TraditionalOk - -DIST_SUBDIRS = \ BlackMATE \ BlueMenta \ Blue-Submarine \ -- cgit v1.2.1