Changeset 12578 for trunk/configure.ac


Ignore:
Timestamp:
Jul 23, 2011, 5:23:12 PM (11 years ago)
Author:
jordan
Message:

(trunk gtk) #4372 "make notification and system sounds configurable" -- fixed.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r12566 r12578  
    6161##
    6262##
    63 # play the XDG "download done" sound...
    64 CANBERRA_MINIMUM=0.10
    65 AC_SUBST(CANBERRA_MINIMUM)
    6663# inhibit hibernation when a torrent is active...
    6764DBUS_GLIB_MINIMUM=0.70
     
    7067GIO_MINIMUM=2.15.5
    7168AC_SUBST(GIO_MINIMUM)
    72 # pop up a "download done" notice...
    73 LIBNOTIFY_MINIMUM=0.4.3
    74 AC_SUBST(LIBNOTIFY_MINIMUM)
    7569# create the tray icon with AppIndicator
    7670LIBAPPINDICATOR_MINIMUM=0.0.11
     
    261255use_gio=no
    262256use_libappindicator=no
    263 use_libnotify=no
    264257use_dbus_glib=no
    265 use_canberra=no
    266258if test "x$want_gtk" = "xyes" ; then
    267259    if test "x$have_gtk" = "xyes"; then
     
    281273    if test "x$use_gio" = "xyes"; then
    282274        AC_DEFINE([HAVE_GIO], 1)
    283     fi
    284 
    285     PKG_CHECK_MODULES([LIBNOTIFY],
    286                       [libnotify >= $LIBNOTIFY_MINIMUM],
    287                       [have_libnotify=yes],
    288                       [have_libnotify=no])
    289     AC_ARG_ENABLE([libnotify],
    290                   AS_HELP_STRING([--enable-libnotify],[enable notifications]),,
    291                   [enable_libnotify=yes])
    292     use_libnotify=no
    293     if test "x$have_libnotify" = "xyes"; then
    294         if test "x$enable_libnotify" = "xyes" ; then
    295             use_libnotify=yes
    296             AC_DEFINE([HAVE_LIBNOTIFY], 1)
    297         else
    298             LIBNOTIFY_CFLAGS=
    299             LIBNOTIFY_LIBS=
    300         fi
    301275    fi
    302276
     
    317291            LIBAPPINDICATOR_CFLAGS=
    318292            LIBAPPINDICATOR_LIBS=
    319         fi
    320     fi
    321 
    322     PKG_CHECK_MODULES([LIBCANBERRA],
    323                       [libcanberra-gtk >= $CANBERRA_MINIMUM],
    324                       [have_libcanberra=yes],
    325                       [have_libcanberra=no])
    326     AC_ARG_ENABLE([libcanberra],
    327                   AS_HELP_STRING([--enable-libcanberra],[enable sounds]),,
    328                   [enable_libcanberra=yes])
    329     if test "x$have_libcanberra" = "xyes"; then
    330         if test "x$enable_libcanberra" = "xyes" ; then
    331             use_canberra=yes
    332             AC_DEFINE([HAVE_LIBCANBERRA], 1)
    333         else
    334             LIBCANBERRA_CFLAGS=
    335             LIBCANBERRA_LIBS=
    336293        fi
    337294    fi
     
    517474      * dbus support:                                 ${use_dbus_glib}
    518475      * gio for watchdir and mime-type support:       ${use_gio}
    519       * libnotify for 'download completed' popups:    ${use_libnotify}
    520       * libcanberra for 'download completed' sounds:  ${use_canberra}
    521476      * libappindicator for an Ubuntu-style tray:     ${use_libappindicator}
    522477
Note: See TracChangeset for help on using the changeset viewer.