Changeset 12638 for trunk/configure.ac


Ignore:
Timestamp:
Aug 7, 2011, 4:42:38 PM (10 years ago)
Author:
jordan
Message:

(trunk gtk) bump the glib2 requirement from 2.8 to 2.26 s.t. transmission-gtk can use glib's GDBus module and drop the glib-dbus library dependency

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r12578 r12638  
    5151##
    5252##
    53 GLIB_MINIMUM=2.8.0
    54 AC_SUBST(GLIB_MINIMUM)
    5553GTK_MINIMUM=2.8.0
    5654AC_SUBST(GTK_MINIMUM)
     55GLIB_MINIMUM=2.26.0
     56AC_SUBST(GLIB_MINIMUM)
     57GIO_MINIMUM=2.26.0
     58AC_SUBST(GIO_MINIMUM)
    5759
    5860##
     
    6163##
    6264##
    63 # inhibit hibernation when a torrent is active...
    64 DBUS_GLIB_MINIMUM=0.70
    65 AC_SUBST(DBUS_GLIB_MINIMUM)
    66 # implement "watch" directories to use new .torrent files...
    67 GIO_MINIMUM=2.15.5
    68 AC_SUBST(GIO_MINIMUM)
     65
    6966# create the tray icon with AppIndicator
    7067LIBAPPINDICATOR_MINIMUM=0.0.11
     
    244241                  [gtk+-2.0 >= $GTK_MINIMUM
    245242                   glib-2.0 >= $GLIB_MINIMUM
     243                   gio-2.0 >= $GIO_MINIMUM],
    246244                   gmodule-2.0 >= $GLIB_MINIMUM
    247245                   gthread-2.0 >= $GLIB_MINIMUM],
     
    253251              [want_gtk=${have_gtk}])
    254252build_gtk=no
    255 use_gio=no
    256253use_libappindicator=no
    257 use_dbus_glib=no
    258254if test "x$want_gtk" = "xyes" ; then
    259255    if test "x$have_gtk" = "xyes"; then
     
    266262
    267263if test "x$build_gtk" = "xyes"; then
    268 
    269     PKG_CHECK_MODULES([GIO],
    270                       [gio-2.0 >= $GIO_MINIMUM],
    271                       [use_gio=yes],
    272                       [use_gio=no])
    273     if test "x$use_gio" = "xyes"; then
    274         AC_DEFINE([HAVE_GIO], 1)
    275     fi
    276264
    277265    PKG_CHECK_MODULES([LIBAPPINDICATOR],
     
    291279            LIBAPPINDICATOR_CFLAGS=
    292280            LIBAPPINDICATOR_LIBS=
    293         fi
    294     fi
    295 
    296     PKG_CHECK_MODULES([DBUS_GLIB],
    297                       [dbus-glib-1 >= $DBUS_GLIB_MINIMUM],
    298                       [use_dbus_glib=yes],
    299                       [use_dbus_glib=no])
    300     if test "x$use_dbus_glib" = "xyes"; then
    301         AC_DEFINE([HAVE_DBUS_GLIB], 1)
    302     fi
    303     if test "x$use_dbus_glib" = "xyes"; then
    304         AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
    305         if test "x$DBUS_BINDING_TOOL" = xno; then
    306           AC_MSG_WARN([Cannot find dbus-binding-tool])
    307           use_dbus_glib="no (dbus-binding-tool not found)"
    308281        fi
    309282    fi
     
    462435
    463436   Build libtransmission:                             yes
    464 
    465437      * optimized for low-resource systems:           ${enable_lightweight}
    466438      * µTP enabled:                                  ${build_utp}
     
    469441
    470442   Build GTK+ client:                                 ${build_gtk}
    471 
    472      Optional dependencies for GTK+ client:
    473 
    474       * dbus support:                                 ${use_dbus_glib}
    475       * gio for watchdir and mime-type support:       ${use_gio}
    476443      * libappindicator for an Ubuntu-style tray:     ${use_libappindicator}
    477444
Note: See TracChangeset for help on using the changeset viewer.