From 7d22b6c1bc7270f24e92fa4cdad0d844691616e2 Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 25 Feb 2013 09:33:47 +0100 Subject: add gtk-3 themes in configure enable creation of gtk.gresource file for gtk-3 in configure --- configure.ac | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5d613e70..fcff3c3e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,26 @@ AC_SUBST(localedir) # Workaround to make aclocal get the right flags AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") +AC_ARG_ENABLE([gtk3-engines], + AC_HELP_STRING([--disable-gtk3-engines], + [Disable Gtk+ 3.x engines [default=no]]), + enable_gtk3=$enableval, + enable_gtk3=yes) +AC_MSG_CHECKING([building gtk3 engines]) +AM_CONDITIONAL(GTK3, test "x$enable_gtk3" = "xyes") +AC_MSG_RESULT([$enable_gtk3]) +GTK_VERSION_REQUIRED=3.5.17 + +if test "x$enable_gtk3" = "xyes"; then + PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0]) + PKG_CHECK_MODULES([CONTRASTHIGH], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0]) +fi +AC_SUBST(DEPENDENCIES_CFLAGS) +AC_SUBST(DEPENDENCIES_LIBS) + +GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` +AC_SUBST(GTK_VERSION) + # Check GTK+ theme engines PKG_CHECK_MODULES(THEME_ENGINE, [gtk+-2.0 >= 2.0.0 dnl @@ -35,6 +55,9 @@ PKG_CHECK_MODULES(THEME_ENGINE, GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` AC_SUBST(GTK_VERSION) +GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` +AC_SUBST(GLIB_COMPILE_RESOURCES) + # Check if it's a development (odd minor) version (obsolete with date versions) #AC_MSG_CHECKING([development series build]) #MINOR_VERSION="`echo $PACKAGE_VERSION|cut -d. -f2`" @@ -213,7 +236,10 @@ gtk-themes/TraditionalOkClassic/gtk-3.0/Makefile gtk-themes/TraditionalOkClassic/gtk-3.0/assets/Makefile gtk-themes/TraditionalOkTest/Makefile gtk-themes/ContrastHigh/Makefile -gtk-themes/ContrastHigh/gtkrc +gtk-themes/ContrastHigh/gtk-2.0/Makefile +gtk-themes/ContrastHigh/gtk-2.0/gtkrc +gtk-themes/ContrastHigh/gtk-3.0/Makefile +gtk-themes/ContrastHigh/metacity-1/Makefile gtk-themes/ContrastHighInverse/Makefile gtk-themes/ContrastHighInverse/gtkrc gtk-themes/ContrastHighLargePrint/Makefile @@ -353,6 +379,7 @@ mate-themes-$VERSION: Enable placeholders: ${enable_placeholders} Enable legacy icons: ${enable_mapping} Enable all themes: ${enable_all_themes} + Enable gtk-3.0 themes: ${enable_gtk3} Enable test themes: ${enable_test_themes} LargePrint cursor theme: ${LARGEPRINT_CURSOR_THEME} HC LargePrint cursor theme: ${LARGEPRINT_HC_CURSOR_THEME} -- cgit v1.2.1 From 4ee5feb503166fb3fb06af46abb4f5cbf93a453f Mon Sep 17 00:00:00 2001 From: raveit Date: Wed, 13 Mar 2013 15:33:35 +0100 Subject: remove gresource implementation from ContrastHigh theme rename High Contrast to ContrastHigh in index.theme update german and english translations --- configure.ac | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fcff3c3e..cb25c692 100644 --- a/configure.ac +++ b/configure.ac @@ -26,26 +26,6 @@ AC_SUBST(localedir) # Workaround to make aclocal get the right flags AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") -AC_ARG_ENABLE([gtk3-engines], - AC_HELP_STRING([--disable-gtk3-engines], - [Disable Gtk+ 3.x engines [default=no]]), - enable_gtk3=$enableval, - enable_gtk3=yes) -AC_MSG_CHECKING([building gtk3 engines]) -AM_CONDITIONAL(GTK3, test "x$enable_gtk3" = "xyes") -AC_MSG_RESULT([$enable_gtk3]) -GTK_VERSION_REQUIRED=3.5.17 - -if test "x$enable_gtk3" = "xyes"; then - PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0]) - PKG_CHECK_MODULES([CONTRASTHIGH], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0]) -fi -AC_SUBST(DEPENDENCIES_CFLAGS) -AC_SUBST(DEPENDENCIES_LIBS) - -GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` -AC_SUBST(GTK_VERSION) - # Check GTK+ theme engines PKG_CHECK_MODULES(THEME_ENGINE, [gtk+-2.0 >= 2.0.0 dnl @@ -55,9 +35,6 @@ PKG_CHECK_MODULES(THEME_ENGINE, GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` AC_SUBST(GTK_VERSION) -GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` -AC_SUBST(GLIB_COMPILE_RESOURCES) - # Check if it's a development (odd minor) version (obsolete with date versions) #AC_MSG_CHECKING([development series build]) #MINOR_VERSION="`echo $PACKAGE_VERSION|cut -d. -f2`" @@ -379,7 +356,6 @@ mate-themes-$VERSION: Enable placeholders: ${enable_placeholders} Enable legacy icons: ${enable_mapping} Enable all themes: ${enable_all_themes} - Enable gtk-3.0 themes: ${enable_gtk3} Enable test themes: ${enable_test_themes} LargePrint cursor theme: ${LARGEPRINT_CURSOR_THEME} HC LargePrint cursor theme: ${LARGEPRINT_HC_CURSOR_THEME} -- cgit v1.2.1