aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-04 16:23:06 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-04 16:23:06 -0500
commit75d3c8be473b6c2600f187f77ffb25b21700a373 (patch)
tree3a166215054f6be6c5b44732de9710c042b7124e /configure
parent5261e7f898e82ef03e5e8658253ae0c111d5870e (diff)
parent5a12bc3c3f41d17934c0773c2214ac6097a9154f (diff)
downloadayatana-indicator-datetime-75d3c8be473b6c2600f187f77ffb25b21700a373.tar.gz
ayatana-indicator-datetime-75d3c8be473b6c2600f187f77ffb25b21700a373.tar.bz2
ayatana-indicator-datetime-75d3c8be473b6c2600f187f77ffb25b21700a373.zip
Import upstream version 0.3.94
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure158
1 files changed, 97 insertions, 61 deletions
diff --git a/configure b/configure
index 366d21a..ef830fc 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-datetime 0.3.93.
+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.94.
#
# Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
#
@@ -572,8 +572,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-datetime'
PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.3.93'
-PACKAGE_STRING='indicator-datetime 0.3.93'
+PACKAGE_VERSION='0.3.94'
+PACKAGE_STRING='indicator-datetime 0.3.94'
PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
PACKAGE_URL='http://launchpad.net/indicator-datetime'
@@ -672,8 +672,13 @@ CCPANELDIR
INDICATORICONSDIR
INDICATORDIR
COVERAGE_LDFLAGS
-COVERAGE_CXXFLAGS
COVERAGE_CFLAGS
+HAVE_GCOVR_FALSE
+HAVE_GCOVR_TRUE
+HAVE_LCOV_FALSE
+HAVE_LCOV_TRUE
+HAVE_GCOV_FALSE
+HAVE_GCOV_TRUE
GCOVR
GENHTML
LCOV
@@ -1395,7 +1400,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-datetime 0.3.93 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.3.94 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1471,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-datetime 0.3.93:";;
+ short | recursive ) echo "Configuration of indicator-datetime 0.3.94:";;
esac
cat <<\_ACEOF
@@ -1600,7 +1605,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-datetime configure 0.3.93
+indicator-datetime configure 0.3.94
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1971,7 +1976,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-datetime $as_me 0.3.93, which was
+It was created by indicator-datetime $as_me 0.3.94, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2795,7 +2800,7 @@ fi
# Define the identity of the package.
PACKAGE='indicator-datetime'
- VERSION='0.3.93'
+ VERSION='0.3.94'
cat >>confdefs.h <<_ACEOF
@@ -12864,13 +12869,7 @@ endif
# AC_TDD_GCOV
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5
-$as_echo_n "checking whether code coverage tools are available... " >&6; }
-if ${ac_cv_check_gcov+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-# Check whether --enable-gcov was given.
+ # Check whether --enable-gcov was given.
if test "${enable_gcov+set}" = set; then :
enableval=$enable_gcov; use_gcov=$enableval
else
@@ -13006,43 +13005,6 @@ $as_echo "no" >&6; }
fi
- # Extract the first word of "gcovr", so it can be a program name with args.
-set dummy gcovr; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GCOVR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$GCOVR"; then
- ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_GCOVR="gcovr"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-GCOVR=$ac_cv_prog_GCOVR
-if test -n "$GCOVR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
-$as_echo "$GCOVR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
if test "$LCOV"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
@@ -13079,10 +13041,8 @@ $as_echo "$glib_cv_lcov_version" >&6; }
as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
fi
- if test -z "$GCOVR"; then
- as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5
- fi
-
+ ac_cv_check_gcov=yes
+ ac_cv_check_lcov=yes
# Remove all optimization flags from CFLAGS
@@ -13094,11 +13054,75 @@ $as_echo "$glib_cv_lcov_version" >&6; }
COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
COVERAGE_LDFLAGS="-lgcov"
+ # Check availability of gcovr
+ # Extract the first word of "gcovr", so it can be a program name with args.
+set dummy gcovr; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GCOVR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$GCOVR"; then
+ ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_GCOVR="gcovr"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+GCOVR=$ac_cv_prog_GCOVR
+if test -n "$GCOVR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
+$as_echo "$GCOVR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test -z "$GCOVR"; then
+ ac_cv_check_gcovr=no
+ else
+ ac_cv_check_gcovr=yes
+ fi
+
+fi
+
+ if test "x$ac_cv_check_gcov" = xyes; then
+ HAVE_GCOV_TRUE=
+ HAVE_GCOV_FALSE='#'
+else
+ HAVE_GCOV_TRUE='#'
+ HAVE_GCOV_FALSE=
+fi
+
+ if test "x$ac_cv_check_lcov" = xyes; then
+ HAVE_LCOV_TRUE=
+ HAVE_LCOV_FALSE='#'
+else
+ HAVE_LCOV_TRUE='#'
+ HAVE_LCOV_FALSE=
fi
+ if test "x$ac_cv_check_gcovr" = xyes; then
+ HAVE_GCOVR_TRUE=
+ HAVE_GCOVR_FALSE='#'
+else
+ HAVE_GCOVR_TRUE='#'
+ HAVE_GCOVR_FALSE=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5
-$as_echo "$ac_cv_check_gcov" >&6; }
@@ -14630,6 +14654,18 @@ if test -z "${BUILD_CCPANEL_TRUE}" && test -z "${BUILD_CCPANEL_FALSE}"; then
as_fn_error $? "conditional \"BUILD_CCPANEL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
ac_config_commands="$ac_config_commands po/stamp-it"
@@ -15043,7 +15079,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-datetime $as_me 0.3.93, which was
+This file was extended by indicator-datetime $as_me 0.3.94, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15110,7 +15146,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-datetime config.status 0.3.93
+indicator-datetime config.status 0.3.94
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"