← Back to branch summary

~skypce/indicator-session/indicator-session

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2009-12-10 10:42:21 UTC
  • mfrom: (1.1.9 upstream)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20091210104221-vf7zqsien3deqc1p
Tags: 0.1.7+r58-0ubuntu1
* New snapshot for libindicator 0.3.0
* debian/control
  - build depend on libtelepathy-glib-dev instead of libempathy-dev
  - build depend on libindicator-dev >= 0.3.0
* removed 03_tp_glib.patch and 99_autoreconf.patch, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure
2883
2883
 
2884
2884
# Define the identity of the package.
2885
2885
 PACKAGE=indicator-session
2886
 
 VERSION=0.1.7
 
2886
 VERSION=0.1.7+r58
2887
2887
 
2888
2888
 
2889
2889
cat >>confdefs.h <<_ACEOF
11961
11961
###########################
11962
11962
 
11963
11963
GTK_REQUIRED_VERSION=2.12
11964
 
INDICATOR_REQUIRED_VERSION=0.2.0
 
11964
INDICATOR_REQUIRED_VERSION=0.3.0
11965
11965
DBUSMENUGTK_REQUIRED_VERSION=0.1.1
11966
11966
POLKIT_REQUIRED_VERSION=0.92
11967
11967
 
12193
12193
 
12194
12194
 
12195
12195
DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
12196
 
LIBEMPATHY_REQUIRED_VERSION=2.27.0
 
12196
TELEPATHYGLIB_REQUIRED_VERSION=0.9.0
12197
12197
 
12198
12198
 
12199
12199
pkg_failed=no
12206
12206
    else
12207
12207
        if test -n "$PKG_CONFIG" && \
12208
12208
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
12209
 
                                 libempathy >= \$LIBEMPATHY_REQUIRED_VERSION\""; } >&5
 
12209
                                 telepathy-glib >= \$TELEPATHYGLIB_REQUIRED_VERSION\""; } >&5
12210
12210
  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12211
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION") 2>&5
 
12211
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION") 2>&5
12212
12212
  ac_status=$?
12213
12213
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12214
12214
  test $ac_status = 0; }; then
12215
12215
  pkg_cv_STATUSSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12216
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION" 2>/dev/null`
 
12216
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION" 2>/dev/null`
12217
12217
else
12218
12218
  pkg_failed=yes
12219
12219
fi
12227
12227
    else
12228
12228
        if test -n "$PKG_CONFIG" && \
12229
12229
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
12230
 
                                 libempathy >= \$LIBEMPATHY_REQUIRED_VERSION\""; } >&5
 
12230
                                 telepathy-glib >= \$TELEPATHYGLIB_REQUIRED_VERSION\""; } >&5
12231
12231
  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12232
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION") 2>&5
 
12232
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION") 2>&5
12233
12233
  ac_status=$?
12234
12234
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12235
12235
  test $ac_status = 0; }; then
12236
12236
  pkg_cv_STATUSSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12237
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION" 2>/dev/null`
 
12237
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION" 2>/dev/null`
12238
12238
else
12239
12239
  pkg_failed=yes
12240
12240
fi
12254
12254
fi
12255
12255
        if test $_pkg_short_errors_supported = yes; then
12256
12256
                STATUSSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12257
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION"`
 
12257
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION"`
12258
12258
        else
12259
12259
                STATUSSERVICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12260
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION"`
 
12260
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION"`
12261
12261
        fi
12262
12262
        # Put the nasty error message in config.log where it belongs
12263
12263
        echo "$STATUSSERVICE_PKG_ERRORS" >&5
12264
12264
 
12265
12265
        as_fn_error "Package requirements (dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
12266
 
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION) were not met:
 
12266
                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION) were not met:
12267
12267
 
12268
12268
$STATUSSERVICE_PKG_ERRORS
12269
12269