diff options
| author | Ted Gould <ted@gould.cx> | 2011-06-10 16:21:50 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-06-10 16:21:50 -0500 |
| commit | b5aec1c606133969188642d2f74f0c96c56bca40 (patch) | |
| tree | 235ff32c5f8a78f09e2e0df284475a573a71dbea | |
| parent | ba6c0b194bd2072f98574a22db89a8dfe93734e5 (diff) | |
| parent | fc4bf64e283cc0d8961e551e620def2ca1d4e242 (diff) | |
| download | ayatana-indicator-application-b5aec1c606133969188642d2f74f0c96c56bca40.tar.gz ayatana-indicator-application-b5aec1c606133969188642d2f74f0c96c56bca40.tar.bz2 ayatana-indicator-application-b5aec1c606133969188642d2f74f0c96c56bca40.zip | |
Add path for GTK3 indicator and make GTK3 default
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d29a293..c7be913 100644 --- a/configure.ac +++ b/configure.ac @@ -39,9 +39,9 @@ DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=2@:>@])], + [Which version of gtk to use @<:@default=3@:>@])], [], - [with_gtk=2]) + [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION @@ -93,9 +93,12 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/libindicate/icons/" -else +elif test "x$with_gtk" = x2; then INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) |