diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 159 |
1 files changed, 99 insertions, 60 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.4.94. +# Generated by GNU Autoconf 2.68 for indicator-application 0.5.0. # # 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.4.94' -PACKAGE_STRING='indicator-application 0.4.94' +PACKAGE_VERSION='0.5.0' +PACKAGE_STRING='indicator-application 0.5.0' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -623,6 +623,12 @@ 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 @@ -1328,7 +1334,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.4.94 to adapt to many kinds of systems. +\`configure' configures indicator-application 0.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,7 +1405,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-application 0.4.94:";; + short | recursive ) echo "Configuration of indicator-application 0.5.0:";; esac cat <<\_ACEOF @@ -1521,7 +1527,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-application configure 0.4.94 +indicator-application configure 0.5.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1801,7 +1807,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.4.94, which was +It was created by indicator-application $as_me 0.5.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2622,7 +2628,7 @@ fi # Define the identity of the package. PACKAGE=indicator-application - VERSION=0.4.94 + VERSION=0.5.0 cat >>confdefs.h <<_ACEOF @@ -8557,6 +8563,10 @@ _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= @@ -12874,13 +12884,7 @@ fi # 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 @@ -13016,43 +13020,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 @@ -13089,10 +13056,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 @@ -13104,13 +13069,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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5 -$as_echo "$ac_cv_check_gcov" >&6; } + 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 @@ -13304,6 +13331,18 @@ if test -z "${USE_GTK3_TRUE}" && test -z "${USE_GTK3_FALSE}"; then as_fn_error $? "conditional \"USE_GTK3\" 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 : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -13713,7 +13752,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.4.94, which was +This file was extended by indicator-application $as_me 0.5.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13779,7 +13818,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.4.94 +indicator-application config.status 0.5.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |