[banshee/gtk3] build: Fix the configure phase to complain about gtk3 missing



commit f43bcf073dcd65d8a196d0c290e0eb8cb2bc67d6
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Tue Jul 26 19:02:10 2011 +0100

    build: Fix the configure phase to complain about gtk3 missing
    
    As we're in the gtk3 branch, Banshee cannot work against gtk#2.x
    branches. We probably need more cleanup than this though.

 build/build.rules.mk          |    4 ----
 build/m4/banshee/gtk-sharp.m4 |   25 +++----------------------
 configure.ac                  |    2 +-
 3 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 5447db9..b799156 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -22,10 +22,6 @@ if ENABLE_TESTS
     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
 endif
 
-if HAVE_GTK3
-    GTK3_FLAG = "-define:GTK3"
-endif
-
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
 DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
diff --git a/build/m4/banshee/gtk-sharp.m4 b/build/m4/banshee/gtk-sharp.m4
index b57140f..708d8ef 100644
--- a/build/m4/banshee/gtk-sharp.m4
+++ b/build/m4/banshee/gtk-sharp.m4
@@ -1,28 +1,9 @@
 AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
 [
 	GTKSHARP3_REQUIRED=2.99
-	GTKSHARP2_REQUIRED=2.12.10
 
-	dnl First check for gtk-sharp-3.0
-	PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED, have_gtk3=yes, have_gtk3=no)
-	if test "x$have_gtk3" = "xyes"; then
-		AC_SUBST(GTKSHARP_LIBS)
+	PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-3.0 >= $GTKSHARP3_REQUIRED)
+	PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-3.0 >= GTKSHARP3_REQUIRED)
 
-		PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-3.0 >= $GTKSHARP3_REQUIRED)
-		AC_SUBST(GLIBSHARP_LIBS)
-
-		gtk_version=3
-		AM_CONDITIONAL(HAVE_GTK3, true)
-	else
-		dnl Fall back to gtk-sharp-2.0
-
-		PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED)
-		AC_SUBST(GTKSHARP_LIBS)
-
-		PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GTKSHARP2_REQUIRED)
-		AC_SUBST(GLIBSHARP_LIBS)
-
-		AM_CONDITIONAL(HAVE_GTK3, false)
-		gtk_version="2"
-	fi
+	AC_SUBST(GLIBSHARP_LIBS)
 ])
diff --git a/configure.ac b/configure.ac
index 8f347ee..8f7ba4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ BANSHEE_CHECK_LIBWEBKIT
 dnl gdata (optional through --disable-youtube)
 BANSHEE_CHECK_YOUTUBE
 
-dnl gtk#-beans and gio#
+dnl gio#
 BANSHEE_CHECK_GIO_SHARP
 
 dnl Moonlight (optional through --enable-moonlight)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]