[gnome-session] Remove GTK2 compilation option



commit 9d0ee2ef615e27d3b612b36a0b7d2916d6759b32
Author: Colin Walters <walters verbum org>
Date:   Mon Feb 28 12:12:18 2011 -0500

    Remove GTK2 compilation option
    
    Acked by vuntz on IRC; if someone really cares and has a rationale
    they can come by with a patch.  I don't want to have to worry
    about testing with GTK2 for some new changes.

 configure.ac |   27 ++++-----------------------
 1 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 39ee95d..adef19b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,29 +37,11 @@ if test "x$enable_deprecation_flags" = "xyes"; then
    AC_SUBST([DISABLE_DEPRECATED_CFLAGS])
 fi
 
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-  [case "$with_gtk" in
-     2.0|3.0) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=3.0])
-AC_MSG_RESULT([$with_gtk])
-
 GLIB_REQUIRED=2.16.0
+GTK3_REQUIRED=2.90.7
 DBUS_GLIB_REQUIRED=0.76
 UPOWER_REQUIRED=0.9.0
 
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.22.0
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=2.90.7
-       ;;
-esac
-
 dnl ====================================================================
 dnl Dependency Checks
 dnl ====================================================================
@@ -68,7 +50,7 @@ PKG_PROG_PKG_CONFIG()
 PKG_CHECK_MODULES(GNOME_SESSION,
         glib-2.0 >= $GLIB_REQUIRED
         gio-2.0 >= $GLIB_REQUIRED
-        gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+        gtk+-3.0 >= $GTK3_REQUIRED
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED
         upower-glib >= $UPOWER_REQUIRED
 	librsvg-2.0
@@ -76,7 +58,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
 
 PKG_CHECK_MODULES(SESSION_PROPERTIES,
         glib-2.0 >= $GLIB_REQUIRED
-        gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+        gtk+-3.0 >= $GTK3_REQUIRED
 )
 
 PKG_CHECK_MODULES(SM, sm)
@@ -86,7 +68,7 @@ PKG_CHECK_MODULES(XEXT, xext xau)
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 
-PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-$GTK_API_VERSION)
+PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0)
 
 PKG_CHECK_MODULES(GL_TEST, xcomposite gl)
 
@@ -375,7 +357,6 @@ echo "
         Maintainer mode:          ${USE_MAINTAINER_MODE}
         Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags}
 
-        GTK+ version:             ${with_gtk}
         IPv6 support:             ${have_full_ipv6}
         Backtrace support:        ${have_backtrace}
         XRender support:          ${have_xrender}



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