~ubuntu-branches/ubuntu/maverick/indicator-applet/maverick

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2009-12-10 11:34:33 UTC
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: james.westby@ubuntu.com-20091210113433-knaby236z2nanspv
Tags: upstream-0.3.0
ImportĀ upstreamĀ versionĀ 0.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
2841
2841
 
2842
2842
# Define the identity of the package.
2843
2843
 PACKAGE=indicator-applet
2844
 
 VERSION=0.2.0
 
2844
 VERSION=0.3.0
2845
2845
 
2846
2846
 
2847
2847
cat >>confdefs.h <<_ACEOF
11932
11932
GTK_REQUIRED_VERSION=2.12
11933
11933
PANEL_REQUIRED_VERSION=2.0.0
11934
11934
DBUS_REQUIRED_VERSION=0.76
11935
 
INDICATOR_REQUIRED_VERSION=0.1.0
 
11935
INDICATOR_REQUIRED_VERSION=0.3.0
11936
11936
 
11937
11937
 
11938
11938
 
12062
12062
        if test -n "$PKG_CONFIG" && \
12063
12063
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
12064
12064
                          libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
12065
 
                                                  libgnomeui-2.0
12066
12065
                                                  indicator >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
12067
12066
  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12068
12067
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12069
 
                                                  libgnomeui-2.0
12070
12068
                                                  indicator >= $INDICATOR_REQUIRED_VERSION") 2>&5
12071
12069
  ac_status=$?
12072
12070
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12073
12071
  test $ac_status = 0; }; then
12074
12072
  pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12075
12073
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12076
 
                                                  libgnomeui-2.0
12077
12074
                                                  indicator >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
12078
12075
else
12079
12076
  pkg_failed=yes
12089
12086
        if test -n "$PKG_CONFIG" && \
12090
12087
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
12091
12088
                          libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
12092
 
                                                  libgnomeui-2.0
12093
12089
                                                  indicator >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
12094
12090
  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12095
12091
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12096
 
                                                  libgnomeui-2.0
12097
12092
                                                  indicator >= $INDICATOR_REQUIRED_VERSION") 2>&5
12098
12093
  ac_status=$?
12099
12094
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12100
12095
  test $ac_status = 0; }; then
12101
12096
  pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12102
12097
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12103
 
                                                  libgnomeui-2.0
12104
12098
                                                  indicator >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
12105
12099
else
12106
12100
  pkg_failed=yes
12122
12116
        if test $_pkg_short_errors_supported = yes; then
12123
12117
                APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12124
12118
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12125
 
                                                  libgnomeui-2.0
12126
12119
                                                  indicator >= $INDICATOR_REQUIRED_VERSION"`
12127
12120
        else
12128
12121
                APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
12129
12122
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12130
 
                                                  libgnomeui-2.0
12131
12123
                                                  indicator >= $INDICATOR_REQUIRED_VERSION"`
12132
12124
        fi
12133
12125
        # Put the nasty error message in config.log where it belongs
12135
12127
 
12136
12128
        as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
12137
12129
                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
12138
 
                                                  libgnomeui-2.0
12139
12130
                                                  indicator >= $INDICATOR_REQUIRED_VERSION) were not met:
12140
12131
 
12141
12132
$APPLET_PKG_ERRORS