[banshee] build: Remove GTK3 detection and conditional compilation
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] build: Remove GTK3 detection and conditional compilation
- Date: Wed, 17 Aug 2011 10:54:48 +0000 (UTC)
commit 7918fba0e19a8d68708cbdf2c152f6a91960e399
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Wed Aug 17 12:45:37 2011 +0200
build: Remove GTK3 detection and conditional compilation
We're not doing to do any conditional compilation for GTK3 stuff, the
port is happening in the gtk3 branch which will be merged in when it's
ready.
build/build.rules.mk | 6 +-----
build/m4/banshee/gtk-sharp.m4 | 26 +++++---------------------
2 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 5447db9..348e7cd 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/')
@@ -64,7 +60,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
$(ASSEMBLY_BUILD_FLAGS) \
-nowarn:0278 -nowarn:0078 $$warn \
-debug -target:$(TARGET) -out:$@ \
- $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) \
+ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) \
$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
@if [ -e $(srcdir)/$(notdir $ config) ]; then \
cp $(srcdir)/$(notdir $ config) $(top_builddir)/bin; \
diff --git a/build/m4/banshee/gtk-sharp.m4 b/build/m4/banshee/gtk-sharp.m4
index b57140f..529a0e7 100644
--- a/build/m4/banshee/gtk-sharp.m4
+++ b/build/m4/banshee/gtk-sharp.m4
@@ -1,28 +1,12 @@
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(GTKSHARP, gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED)
+ AC_SUBST(GTKSHARP_LIBS)
- PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-3.0 >= $GTKSHARP3_REQUIRED)
- AC_SUBST(GLIBSHARP_LIBS)
+ PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GTKSHARP2_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
+ gtk_version="2"
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]