diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 86 |
1 files changed, 41 insertions, 45 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for indicator-application 0.3.90. +# Generated by GNU Autoconf 2.68 for indicator-application 0.3.91. # # Report bugs to <ted@canonical.com>. # @@ -572,8 +572,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='indicator-application' PACKAGE_TARNAME='indicator-application' -PACKAGE_VERSION='0.3.90' -PACKAGE_STRING='indicator-application 0.3.90' +PACKAGE_VERSION='0.3.91' +PACKAGE_STRING='indicator-application 0.3.91' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -1317,7 +1317,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures indicator-application 0.3.90 to adapt to many kinds of systems. +\`configure' configures indicator-application 0.3.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1388,7 +1388,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-application 0.3.90:";; + short | recursive ) echo "Configuration of indicator-application 0.3.91:";; esac cat <<\_ACEOF @@ -1509,7 +1509,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-application configure 0.3.90 +indicator-application configure 0.3.91 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1789,7 +1789,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by indicator-application $as_me 0.3.90, which was +It was created by indicator-application $as_me 0.3.91, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2610,7 +2610,7 @@ fi # Define the identity of the package. PACKAGE=indicator-application - VERSION=0.3.90 + VERSION=0.3.91 cat >>confdefs.h <<_ACEOF @@ -8494,10 +8494,6 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -12301,13 +12297,13 @@ if test -n "$INDICATOR_CFLAGS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION gio-2.0 >= \$GIO_REQUIRED_VERSION - indicator3 >= \$INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 @@ -12316,7 +12312,7 @@ if test -n "$INDICATOR_CFLAGS"; then test $ac_status = 0; }; then pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` @@ -12333,13 +12329,13 @@ if test -n "$INDICATOR_LIBS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION gio-2.0 >= \$GIO_REQUIRED_VERSION - indicator3 >= \$INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 @@ -12348,7 +12344,7 @@ if test -n "$INDICATOR_LIBS"; then test $ac_status = 0; }; then pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` @@ -12374,14 +12370,14 @@ fi if test $_pkg_short_errors_supported = yes; then INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` else INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` @@ -12391,7 +12387,7 @@ fi as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: @@ -12535,13 +12531,13 @@ if test -n "$INDICATOR_CFLAGS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION gio-2.0 >= \$GIO_REQUIRED_VERSION - indicator >= \$INDICATOR_REQUIRED_VERSION + indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 @@ -12550,7 +12546,7 @@ if test -n "$INDICATOR_CFLAGS"; then test $ac_status = 0; }; then pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` @@ -12567,13 +12563,13 @@ if test -n "$INDICATOR_LIBS"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION gio-2.0 >= \$GIO_REQUIRED_VERSION - indicator >= \$INDICATOR_REQUIRED_VERSION + indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 @@ -12582,7 +12578,7 @@ if test -n "$INDICATOR_LIBS"; then test $ac_status = 0; }; then pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` @@ -12608,14 +12604,14 @@ fi if test $_pkg_short_errors_supported = yes; then INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` else INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` @@ -12625,7 +12621,7 @@ fi as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: @@ -12670,12 +12666,12 @@ if test -n "$APPINDICATOR_CFLAGS"; then pkg_cv_APPINDICATOR_CFLAGS="$APPINDICATOR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1 >= \$LIBAPPINDICATOR_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$LIBAPPINDICATOR_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12687,12 +12683,12 @@ if test -n "$APPINDICATOR_LIBS"; then pkg_cv_APPINDICATOR_LIBS="$APPINDICATOR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1 >= \$LIBAPPINDICATOR_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$LIBAPPINDICATOR_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12713,14 +12709,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>&1` + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>&1` else - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>&1` + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$APPINDICATOR_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) were not met: + as_fn_error $? "Package requirements (appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) were not met: $APPINDICATOR_PKG_ERRORS @@ -12797,11 +12793,11 @@ if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/libindicate/icons/" elif test "x$with_gtk" = x2; then - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4` else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` fi @@ -13369,7 +13365,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by indicator-application $as_me 0.3.90, which was +This file was extended by indicator-application $as_me 0.3.91, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13435,7 +13431,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -indicator-application config.status 0.3.90 +indicator-application config.status 0.3.91 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |