aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-07-07 15:37:26 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-07-07 15:37:26 -0400
commit4fe864d53eea581c95685e31a4372a83f87fce55 (patch)
treebea6d34e86a2f4f4dd91a2fac0f1c862c0069f81 /configure
parentfbe33a6d8e37468d5f01c5747c9ccb1763208db6 (diff)
parent14f54b95128ac1d17d1c7aa8b2bcf46853fff3d5 (diff)
downloadayatana-indicator-sound-4fe864d53eea581c95685e31a4372a83f87fce55.tar.gz
ayatana-indicator-sound-4fe864d53eea581c95685e31a4372a83f87fce55.tar.bz2
ayatana-indicator-sound-4fe864d53eea581c95685e31a4372a83f87fce55.zip
Import upstream version 0.7.3
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure466
1 files changed, 295 insertions, 171 deletions
diff --git a/configure b/configure
index ba58090..12aa807 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.2.
+# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.3.
#
# Report bugs to <conor.curran@canonical.com>.
#
@@ -630,8 +630,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-sound'
PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.7.2'
-PACKAGE_STRING='indicator-sound 0.7.2'
+PACKAGE_VERSION='0.7.3'
+PACKAGE_STRING='indicator-sound 0.7.3'
PACKAGE_BUGREPORT='conor.curran@canonical.com'
PACKAGE_URL=''
@@ -704,10 +704,10 @@ GCONF_SCHEMA_CONFIG_SOURCE
GCONFTOOL
SOUNDSERVICE_LIBS
SOUNDSERVICE_CFLAGS
-PULSEAUDIO_LIBS
-PULSEAUDIO_CFLAGS
APPLET_LIBS
APPLET_CFLAGS
+PULSEAUDIO_LIBS
+PULSEAUDIO_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
@@ -887,10 +887,10 @@ CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-APPLET_CFLAGS
-APPLET_LIBS
PULSEAUDIO_CFLAGS
PULSEAUDIO_LIBS
+APPLET_CFLAGS
+APPLET_LIBS
SOUNDSERVICE_CFLAGS
SOUNDSERVICE_LIBS
GCONF_CFLAGS
@@ -1437,7 +1437,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-sound 0.7.2 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.7.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1507,7 +1507,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-sound 0.7.2:";;
+ short | recursive ) echo "Configuration of indicator-sound 0.7.3:";;
esac
cat <<\_ACEOF
@@ -1563,13 +1563,13 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- APPLET_CFLAGS
- C compiler flags for APPLET, overriding pkg-config
- APPLET_LIBS linker flags for APPLET, overriding pkg-config
PULSEAUDIO_CFLAGS
C compiler flags for PULSEAUDIO, overriding pkg-config
PULSEAUDIO_LIBS
linker flags for PULSEAUDIO, overriding pkg-config
+ APPLET_CFLAGS
+ C compiler flags for APPLET, overriding pkg-config
+ APPLET_LIBS linker flags for APPLET, overriding pkg-config
SOUNDSERVICE_CFLAGS
C compiler flags for SOUNDSERVICE, overriding pkg-config
SOUNDSERVICE_LIBS
@@ -1644,7 +1644,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-sound configure 0.7.2
+indicator-sound configure 0.7.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2013,7 +2013,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-sound $as_me 0.7.2, which was
+It was created by indicator-sound $as_me 0.7.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2833,7 +2833,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-sound
- VERSION=0.7.2
+ VERSION=0.7.3
cat >>confdefs.h <<_ACEOF
@@ -9347,10 +9347,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=
@@ -13066,6 +13062,109 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5
+$as_echo_n "checking for PULSEAUDIO... " >&6; }
+
+if test -n "$PULSEAUDIO_CFLAGS"; then
+ pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PULSEAUDIO_LIBS"; then
+ pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0" 2>&1`
+ else
+ PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PULSEAUDIO_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+ gio-unix-2.0) were not met:
+
+$PULSEAUDIO_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
+and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
+and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS
+ PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
if test "x$with_gtk" = x3; then :
pkg_failed=no
@@ -13077,12 +13176,12 @@ if test -n "$APPLET_CFLAGS"; then
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
- indicator3 >= \$INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
@@ -13090,7 +13189,7 @@ if test -n "$APPLET_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
@@ -13106,12 +13205,12 @@ if test -n "$APPLET_LIBS"; then
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
- indicator3 >= \$INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
@@ -13119,7 +13218,7 @@ if test -n "$APPLET_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
@@ -13144,13 +13243,13 @@ else
fi
if test $_pkg_short_errors_supported = yes; then
APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
else
APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
@@ -13159,7 +13258,7 @@ fi
echo "$APPLET_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
libnotify >= $LIBNOTIFY_REQUIRED_VERSION) were not met:
@@ -13195,34 +13294,33 @@ $as_echo "yes" >&6; }
fi
-elif test "x$with_gtk" = x2; then :
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
-$as_echo_n "checking for APPLET... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDSERVICE" >&5
+$as_echo_n "checking for SOUNDSERVICE... " >&6; }
-if test -n "$APPLET_CFLAGS"; then
- pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
+if test -n "$SOUNDSERVICE_CFLAGS"; then
+ pkg_cv_SOUNDSERVICE_CFLAGS="$SOUNDSERVICE_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
- indicator >= \$INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
- libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
+ pkg_cv_SOUNDSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13230,28 +13328,28 @@ fi
else
pkg_failed=untried
fi
-if test -n "$APPLET_LIBS"; then
- pkg_cv_APPLET_LIBS="$APPLET_LIBS"
+if test -n "$SOUNDSERVICE_LIBS"; then
+ pkg_cv_SOUNDSERVICE_LIBS="$SOUNDSERVICE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
- indicator >= \$INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
- libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
+ pkg_cv_SOUNDSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13272,34 +13370,34 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
+ SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>&1`
else
- APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
+ SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$APPLET_PKG_ERRORS" >&5
+ echo "$SOUNDSERVICE_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION) were not met:
+ as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ indicator3-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0) were not met:
-$APPLET_PKG_ERRORS
+$SOUNDSERVICE_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables APPLET_CFLAGS
-and APPLET_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables SOUNDSERVICE_CFLAGS
+and SOUNDSERVICE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -13310,49 +13408,48 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables APPLET_CFLAGS
-and APPLET_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables SOUNDSERVICE_CFLAGS
+and SOUNDSERVICE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
- APPLET_LIBS=$pkg_cv_APPLET_LIBS
+ SOUNDSERVICE_CFLAGS=$pkg_cv_SOUNDSERVICE_CFLAGS
+ SOUNDSERVICE_LIBS=$pkg_cv_SOUNDSERVICE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Value for --with-gtk was neither 2 nor 3
-See \`config.log' for more details" "$LINENO" 5; }
-
-fi
-
-
-
-
+elif test "x$with_gtk" = x2; then :
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5
-$as_echo_n "checking for PULSEAUDIO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
+$as_echo_n "checking for APPLET... " >&6; }
-if test -n "$PULSEAUDIO_CFLAGS"; then
- pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS"
+if test -n "$APPLET_CFLAGS"; then
+ pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+ indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+ libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0" 2>/dev/null`
+ pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13360,19 +13457,28 @@ fi
else
pkg_failed=untried
fi
-if test -n "$PULSEAUDIO_LIBS"; then
- pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS"
+if test -n "$APPLET_LIBS"; then
+ pkg_cv_APPLET_LIBS="$APPLET_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+ indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+ libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0" 2>/dev/null`
+ pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13393,25 +13499,34 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0" 2>&1`
+ APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
else
- PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0" 2>&1`
+ APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$PULSEAUDIO_PKG_ERRORS" >&5
+ echo "$APPLET_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
- gio-unix-2.0) were not met:
+ as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION) were not met:
-$PULSEAUDIO_PKG_ERRORS
+$APPLET_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
-and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables APPLET_CFLAGS
+and APPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -13422,23 +13537,21 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
-and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables APPLET_CFLAGS
+and APPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS
- PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS
+ APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
+ APPLET_LIBS=$pkg_cv_APPLET_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
-
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDSERVICE" >&5
$as_echo_n "checking for SOUNDSERVICE... " >&6; }
@@ -13448,23 +13561,23 @@ if test -n "$SOUNDSERVICE_CFLAGS"; then
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= \$INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0\""; } >&5
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0") 2>&5
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_SOUNDSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0" 2>/dev/null`
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13477,23 +13590,23 @@ if test -n "$SOUNDSERVICE_LIBS"; then
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= \$INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0\""; } >&5
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0") 2>&5
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_SOUNDSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0" 2>/dev/null`
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13515,25 +13628,25 @@ else
fi
if test $_pkg_short_errors_supported = yes; then
SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0" 2>&1`
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>&1`
else
SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0" 2>&1`
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SOUNDSERVICE_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- gee-1.0
- gio-unix-2.0
- libxml-2.0) were not met:
+ indicator-0.4
+ gee-1.0
+ gio-unix-2.0
+ libxml-2.0) were not met:
$SOUNDSERVICE_PKG_ERRORS
@@ -13566,6 +13679,17 @@ $as_echo "yes" >&6; }
fi
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Value for --with-gtk was neither 2 nor 3
+See \`config.log' for more details" "$LINENO" 5; }
+
+fi
+
+
+
+
# Extract the first word of "gconftool-2", so it can be a program name with args.
@@ -15332,7 +15456,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-sound $as_me 0.7.2, which was
+This file was extended by indicator-sound $as_me 0.7.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15398,7 +15522,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-sound config.status 0.7.2
+indicator-sound config.status 0.7.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"