Changeset 13394


Ignore:
Timestamp:
Jul 22, 2012, 4:55:50 PM (9 years ago)
Author:
jordan
Message:

(trunk) #4977 "Rev 13388: gtk required" -- fix r13388 regression in configure.ac that required GTK+ even if only building transmission-daemon.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r13388 r13394  
    353353              [AS_HELP_STRING([--enable-nls],[enable native language support])],,
    354354              [enable_nls=yes])
    355 AC_ARG_WITH([gtk],
    356             AC_HELP_STRING([--with-gtk],[with Gtk]),
     355PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK_MINIMUM
     356                  glib-2.0 >= $GLIB_MINIMUM
     357                  gio-2.0 >= $GIO_MINIMUM,
     358                  gmodule-2.0 >= $GLIB_MINIMUM
     359                  gthread-2.0 >= $GLIB_MINIMUM],
     360                 [have_gtk=yes],
     361                 [have_gtk=no])
     362AC_ARG_WITH([gtk], AC_HELP_STRING([--with-gtk],[with Gtk]),
    357363            [with_gtk=$withval],
    358             [with_gtk=yes])
     364            [with_gtk=$have_gtk])
    359365AM_CONDITIONAL([BUILD_GTK],[test "x$with_gtk" = "xyes"])
    360366use_libappindicator=no
     
    374380                      [have_libappindicator=yes],
    375381                      [have_libappindicator=no])
    376     AC_MSG_NOTICE([using GTK+ 3])
    377 
    378382    if test "x$have_libappindicator" = "xyes"; then
    379383        use_libappindicator=yes
Note: See TracChangeset for help on using the changeset viewer.