← Back to branch summary

~ted/indicator-application/lp829961

« back to all changes in this revision

Viewing changes to configure.ac

Migrated to libindicator 0.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
47
47
AS_IF([test "x$with_gtk" = x3],
48
48
        [PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
49
49
                                       gio-2.0 >= $GIO_REQUIRED_VERSION
50
 
                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
 
50
                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
51
51
                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
52
52
                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
53
53
                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
59
59
      [test "x$with_gtk" = x2],
60
60
        [PKG_CHECK_MODULES(INDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
61
61
                                       gio-2.0 >= $GIO_REQUIRED_VERSION
62
 
                                       indicator >= $INDICATOR_REQUIRED_VERSION 
 
62
                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION 
63
63
                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
64
64
                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
65
65
                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
66
66
 
67
 
         PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
 
67
         PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
68
68
        ],
69
69
      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
70
70
)
92
92
        INDICATORDIR="${libdir}/indicators/2/"
93
93
        INDICATORICONSDIR="${datadir}/libindicate/icons/"
94
94
elif test "x$with_gtk" = x2; then
95
 
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
96
 
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
 
95
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
 
96
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
97
97
else
98
 
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
99
 
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
 
98
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
 
99
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
100
100
fi
101
101
AC_SUBST(INDICATORDIR)
102
102
AC_SUBST(INDICATORICONSDIR)