← Back to branch summary

~gotwig/indicator-pantheon-session/indicator-pantheon-session

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2009-09-24 17:07:51 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090924170751-l7afnthkpri6diwd
Tags: 0.1.5-0ubuntu1
https://launchpad.net/bugs/436223
https://launchpad.net/bugs/418643
https://launchpad.net/bugs/422052
https://launchpad.net/bugs/427643
https://launchpad.net/bugs/428115
* Upstream release 0.1.5 (LP: #436223)
  * PolicyKit-1 support (LP: #418643)
  * GDM User list support (LP: #422052)
  * MissionControl5 support (LP: #427643)
  * Better locking of the screensaver (LP: #428115)
* debian/control: Adding in a libempathy-dev build dependency
  as it's now required by upstream.
* Removing patches 01_polkit-1.patch and 99_autoreconf.patch
  as they were merged 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.4
 
2886
 VERSION=0.1.5
2887
2887
 
2888
2888
 
2889
2889
cat >>confdefs.h <<_ACEOF
11963
11963
GTK_REQUIRED_VERSION=2.12
11964
11964
INDICATOR_REQUIRED_VERSION=0.2.0
11965
11965
DBUSMENUGTK_REQUIRED_VERSION=0.1.1
 
11966
POLKIT_REQUIRED_VERSION=0.92
11966
11967
 
11967
11968
 
11968
11969
 
12192
12193
 
12193
12194
 
12194
12195
DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
 
12196
LIBEMPATHY_REQUIRED_VERSION=2.27.0
12195
12197
 
12196
12198
 
12197
12199
pkg_failed=no
12203
12205
        pkg_cv_STATUSSERVICE_CFLAGS="$STATUSSERVICE_CFLAGS"
12204
12206
    else
12205
12207
        if test -n "$PKG_CONFIG" && \
12206
 
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION\""; } >&5
12207
 
  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION") 2>&5
 
12208
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
 
12209
                                 libempathy >= \$LIBEMPATHY_REQUIRED_VERSION\""; } >&5
 
12210
  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12211
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION") 2>&5
12208
12212
  ac_status=$?
12209
12213
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12210
12214
  test $ac_status = 0; }; then
12211
 
  pkg_cv_STATUSSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION" 2>/dev/null`
 
12215
  pkg_cv_STATUSSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12216
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION" 2>/dev/null`
12212
12217
else
12213
12218
  pkg_failed=yes
12214
12219
fi
12221
12226
        pkg_cv_STATUSSERVICE_LIBS="$STATUSSERVICE_LIBS"
12222
12227
    else
12223
12228
        if test -n "$PKG_CONFIG" && \
12224
 
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION\""; } >&5
12225
 
  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION") 2>&5
 
12229
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
 
12230
                                 libempathy >= \$LIBEMPATHY_REQUIRED_VERSION\""; } >&5
 
12231
  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12232
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION") 2>&5
12226
12233
  ac_status=$?
12227
12234
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12228
12235
  test $ac_status = 0; }; then
12229
 
  pkg_cv_STATUSSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION" 2>/dev/null`
 
12236
  pkg_cv_STATUSSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12237
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION" 2>/dev/null`
12230
12238
else
12231
12239
  pkg_failed=yes
12232
12240
fi
12245
12253
        _pkg_short_errors_supported=no
12246
12254
fi
12247
12255
        if test $_pkg_short_errors_supported = yes; then
12248
 
                STATUSSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION"`
 
12256
                STATUSSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12257
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION"`
12249
12258
        else
12250
 
                STATUSSERVICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION"`
 
12259
                STATUSSERVICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12260
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION"`
12251
12261
        fi
12252
12262
        # Put the nasty error message in config.log where it belongs
12253
12263
        echo "$STATUSSERVICE_PKG_ERRORS" >&5
12254
12264
 
12255
 
        as_fn_error "Package requirements (dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION) were not met:
 
12265
        as_fn_error "Package requirements (dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
 
12266
                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION) were not met:
12256
12267
 
12257
12268
$STATUSSERVICE_PKG_ERRORS
12258
12269
 
12486
12497
    else
12487
12498
        if test -n "$PKG_CONFIG" && \
12488
12499
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
12489
 
                                   polkit-gnome\""; } >&5
 
12500
                                   polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
12490
12501
  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12491
 
                                   polkit-gnome") 2>&5
 
12502
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
12492
12503
  ac_status=$?
12493
12504
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12494
12505
  test $ac_status = 0; }; then
12495
12506
  pkg_cv_GTKLOGOUTHELPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12496
 
                                   polkit-gnome" 2>/dev/null`
 
12507
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
12497
12508
else
12498
12509
  pkg_failed=yes
12499
12510
fi
12507
12518
    else
12508
12519
        if test -n "$PKG_CONFIG" && \
12509
12520
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
12510
 
                                   polkit-gnome\""; } >&5
 
12521
                                   polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
12511
12522
  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12512
 
                                   polkit-gnome") 2>&5
 
12523
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
12513
12524
  ac_status=$?
12514
12525
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12515
12526
  test $ac_status = 0; }; then
12516
12527
  pkg_cv_GTKLOGOUTHELPER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12517
 
                                   polkit-gnome" 2>/dev/null`
 
12528
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
12518
12529
else
12519
12530
  pkg_failed=yes
12520
12531
fi
12534
12545
fi
12535
12546
        if test $_pkg_short_errors_supported = yes; then
12536
12547
                GTKLOGOUTHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12537
 
                                   polkit-gnome"`
 
12548
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"`
12538
12549
        else
12539
12550
                GTKLOGOUTHELPER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12540
 
                                   polkit-gnome"`
 
12551
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"`
12541
12552
        fi
12542
12553
        # Put the nasty error message in config.log where it belongs
12543
12554
        echo "$GTKLOGOUTHELPER_PKG_ERRORS" >&5
12544
12555
 
12545
12556
        as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
12546
 
                                   polkit-gnome) were not met:
 
12557
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) were not met:
12547
12558
 
12548
12559
$GTKLOGOUTHELPER_PKG_ERRORS
12549
12560
 
12578
12589
 
12579
12590
 
12580
12591
 
 
12592
 
12581
12593
# Extract the first word of "gconftool-2", so it can be a program name with args.
12582
12594
set dummy gconftool-2; ac_word=$2
12583
12595
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5