aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure78
1 files changed, 42 insertions, 36 deletions
diff --git a/configure b/configure
index 65c7ea2..bcb2e3d 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-power 0.4.
+# Generated by GNU Autoconf 2.68 for indicator-power 0.5.
#
# Report bugs to <http://bugs.launchpad.net/indicator-power>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-power'
PACKAGE_TARNAME='indicator-power'
-PACKAGE_VERSION='0.4'
-PACKAGE_STRING='indicator-power 0.4'
+PACKAGE_VERSION='0.5'
+PACKAGE_STRING='indicator-power 0.5'
PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power'
PACKAGE_URL='http://launchpad.net/indicator-power'
@@ -662,8 +662,6 @@ INTLTOOL_UPDATE
USE_NLS
INDICATORICONSDIR
INDICATORDIR
-HAVE_GSD_FALSE
-HAVE_GSD_TRUE
GSD_LIBS
GSD_CFLAGS
INDICATOR_LIBS
@@ -1364,7 +1362,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-power 0.4 to adapt to many kinds of systems.
+\`configure' configures indicator-power 0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1434,7 +1432,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-power 0.4:";;
+ short | recursive ) echo "Configuration of indicator-power 0.5:";;
esac
cat <<\_ACEOF
@@ -1563,7 +1561,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-power configure 0.4
+indicator-power configure 0.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1841,7 +1839,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-power $as_me 0.4, which was
+It was created by indicator-power $as_me 0.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2665,7 +2663,7 @@ fi
# Define the identity of the package.
PACKAGE='indicator-power'
- VERSION='0.4'
+ VERSION='0.5'
cat >>confdefs.h <<_ACEOF
@@ -11745,12 +11743,12 @@ if test -n "$GSD_CFLAGS"; then
pkg_cv_GSD_CFLAGS="$GSD_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon>= \$GSD_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon>= $GSD_REQUIRED_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GSD_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon>= $GSD_REQUIRED_VERSION" 2>/dev/null`
+ pkg_cv_GSD_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -11762,12 +11760,12 @@ if test -n "$GSD_LIBS"; then
pkg_cv_GSD_LIBS="$GSD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon>= \$GSD_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon>= $GSD_REQUIRED_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GSD_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon>= $GSD_REQUIRED_VERSION" 2>/dev/null`
+ pkg_cv_GSD_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -11788,33 +11786,45 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-settings-daemon>= $GSD_REQUIRED_VERSION" 2>&1`
+ GSD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1`
else
- GSD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-settings-daemon>= $GSD_REQUIRED_VERSION" 2>&1`
+ GSD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSD_PKG_ERRORS" >&5
- have_gsd=no
+ as_fn_error $? "Package requirements (gnome-settings-daemon >= $GSD_REQUIRED_VERSION) were not met:
+
+$GSD_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 GSD_CFLAGS
+and GSD_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; }
- have_gsd=no
+ { { $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 GSD_CFLAGS
+and GSD_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
GSD_CFLAGS=$pkg_cv_GSD_CFLAGS
GSD_LIBS=$pkg_cv_GSD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- have_gsd=yes
-fi
- if test x$have_gsd = xyes; then
- HAVE_GSD_TRUE=
- HAVE_GSD_FALSE='#'
-else
- HAVE_GSD_TRUE='#'
- HAVE_GSD_FALSE=
-fi
+fi
###########################
# Check to see if we're local
@@ -14303,7 +14313,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
-GETTEXT_PACKAGE=PACKAGE_TARNAME
+GETTEXT_PACKAGE=${PACKAGE_TARNAME}
$as_echo "#define GETTEXT_PACKAGE PACKAGE_TARNAME" >>confdefs.h
@@ -14444,10 +14454,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_GSD_TRUE}" && test -z "${HAVE_GSD_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_GSD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
ac_config_commands="$ac_config_commands po/stamp-it"
@@ -14861,7 +14867,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-power $as_me 0.4, which was
+This file was extended by indicator-power $as_me 0.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14928,7 +14934,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-power config.status 0.4
+indicator-power config.status 0.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"