summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-04-23 12:43:16 +0200
committerraveit65 <[email protected]>2016-04-23 12:44:13 +0200
commit0fbc1989d103cd489ca1040f792d9391c31aeef5 (patch)
tree70f059ea553ffb4886d56b33e20381cf8bbce803
parent8bdb69a082c75d5e9b9e013261925f021de4b870 (diff)
downloadmate-themes-0fbc1989d103cd489ca1040f792d9391c31aeef5.tar.bz2
mate-themes-0fbc1989d103cd489ca1040f792d9391c31aeef5.tar.xz
Revert "Gtk+-3.20 branch: make GreanLaguna optional (not default)"
This reverts commit bed08df0ccc0704cf72f2120e3bcb31e9c2a782f.
-rw-r--r--configure.ac16
-rw-r--r--desktop-themes/Makefile.am15
2 files changed, 0 insertions, 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,23 +1,8 @@
-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 \
- ContrastHighInverse \
GreenLaguna \
Green-Submarine \
Menta \