[rhythmbox/gobject-introspection] drop gtk2, api differences are too great to deal with
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/gobject-introspection] drop gtk2, api differences are too great to deal with
- Date: Sun, 7 Nov 2010 03:46:35 +0000 (UTC)
commit 43d363b916ee355815c87f78e156919d920855c2
Author: Jonathan Matthew <jonathan d14n org>
Date: Sun Nov 7 13:45:33 2010 +1000
drop gtk2, api differences are too great to deal with
configure.ac | 45 +++++++++------------------------------------
1 files changed, 9 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 795a214..a7ee33b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,9 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
AC_C_BIGENDIAN
AC_CHECK_SIZEOF(long)
-GTK3_REQS=2.90.6
+GTK_REQS=2.91.4
+GTK_MAJ_VER=3.0
+AC_SUBST(GTK_MAJ_VER)
DBUS_MIN_REQS=0.35
GST_0_10_REQS=0.10.20
@@ -61,39 +63,11 @@ LIBMTP_REQS=0.3.0
PYGOBJECT_REQUIRED=2.15.4
GLIB_GDBUS_REQS=2.25.12
-dnl gtk+ version
-AC_ARG_ENABLE(gtk3,
- AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
- [build with GTK+3]), ,
- enable_gtk3=auto)
-PKG_CHECK_EXISTS(gtk+-3.0 >= $GTK3_REQS, [have_gtk3=yes], [have_gtk3=no])
-if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" = "xno"; then
- AC_MSG_ERROR([Gtk+3 explicitly requested, but not available])
-elif test "x$enable_gtk3" != "xno" -a "x$have_gtk3" = "xyes"; then
- GTK_MAJ_VER=3.0
- GTK_REQS=$GTK3_REQS
-
- dnl require GTK+3 compatible library versions
- GNOME_MEDIA_PROFILES_PKG=libgnome-media-profiles-3.0
- GNOME_MEDIA_PROFILES_REQS=2.91.0
- LIBNOTIFY_REQS=0.5.1
- BRASERO_MIN_REQS=2.31.5
- BRASERO_MAX_REQS=99999
- dnl XXX webkit version unknown
- WEBKIT_MIN_REQS=99999
-else
- GTK_MAJ_VER=2.0
- GTK_REQS=2.18.0
-
- dnl somewhat more relaxed GTK+2 requirements
- GNOME_MEDIA_PROFILES_PKG=gnome-media-profiles
- GNOME_MEDIA_PROFILES_REQS=2.8
- LIBNOTIFY_REQS=0.4.1
- BRASERO_MIN_REQS=0.9.1
- BRASERO_MAX_REQS=2.31.4
- WEBKIT_MIN_REQS=1.1.17
-fi
-AC_SUBST(GTK_MAJ_VER)
+GNOME_MEDIA_PROFILES_REQS=2.91.0
+LIBNOTIFY_REQS=0.5.1
+BRASERO_MIN_REQS=2.31.5
+dnl XXX webkit version unknown
+WEBKIT_MIN_REQS=99999
@@ -130,7 +104,7 @@ PKG_CHECK_MODULES(RHYTHMBOX, \
glib-2.0 >= $GLIB_REQS \
gio-2.0 >= $GLIB_REQS \
gio-unix-2.0 >= $GLIB_REQS \
- $GNOME_MEDIA_PROFILES_PKG >= $GNOME_MEDIA_PROFILES_REQS \
+ libgnome-media-profiles-3.0 >= $GNOME_MEDIA_PROFILES_REQS \
libsoup-2.4 >= $LIBSOUP_REQS \
libsoup-gnome-2.4 >= $LIBSOUP_REQS)
@@ -456,7 +430,6 @@ AC_ARG_WITH(libbrasero-media,
if test x"$with_libbrasero_media" != "xno"; then
PKG_CHECK_MODULES(LIBBRASERO_MEDIA, [
libbrasero-media >= $BRASERO_MIN_REQS \
- libbrasero-media <= $BRASERO_MAX_REQS \
gtk+-x11-$GTK_MAJ_VER],
have_libbrasero_media=yes,
have_libbrasero_media=no)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]