diff options
author | Sebastien Bacher <seb128@ubuntu.com> | 2012-04-05 12:44:30 +0200 |
---|---|---|
committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-04-05 12:44:30 +0200 |
commit | d538aa44668e089474d8660ee98635e4146e8d0f (patch) | |
tree | d6e45e2d66fe4940aff47c46ad743d3f79f67597 /configure | |
parent | 4a445398a20768db826fbc245f9b2293176b8d88 (diff) | |
parent | 696375c27b39b8f352bf967800e260b4ce73702e (diff) | |
download | libayatana-indicator-d538aa44668e089474d8660ee98635e4146e8d0f.tar.gz libayatana-indicator-d538aa44668e089474d8660ee98635e4146e8d0f.tar.bz2 libayatana-indicator-d538aa44668e089474d8660ee98635e4146e8d0f.zip |
releasing version 0.4.95-0ubuntu1
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 157 |
1 files changed, 98 insertions, 59 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libindicator 0.4.94. +# Generated by GNU Autoconf 2.68 for libindicator 0.4.95. # # Report bugs to <http://bugs.launchpad.net/libindicator>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libindicator' PACKAGE_TARNAME='libindicator' -PACKAGE_VERSION='0.4.94' -PACKAGE_STRING='libindicator 0.4.94' +PACKAGE_VERSION='0.4.95' +PACKAGE_STRING='libindicator 0.4.95' PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator' PACKAGE_URL='http://launchpad.net/libindicator' @@ -618,6 +618,12 @@ LIBOBJS 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 @@ -1331,7 +1337,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 libindicator 0.4.94 to adapt to many kinds of systems. +\`configure' configures libindicator 0.4.95 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1407,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libindicator 0.4.94:";; + short | recursive ) echo "Configuration of libindicator 0.4.95:";; esac cat <<\_ACEOF @@ -1521,7 +1527,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libindicator configure 0.4.94 +libindicator configure 0.4.95 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1799,7 +1805,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 libindicator $as_me 0.4.94, which was +It was created by libindicator $as_me 0.4.95, 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='libindicator' - VERSION='0.4.94' + VERSION='0.4.95' cat >>confdefs.h <<_ACEOF @@ -12247,13 +12253,8 @@ fi # and reports the executables to the variables LCOV, GCOVR and GENHTML. # 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 @@ -12389,43 +12390,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 @@ -12462,10 +12426,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 @@ -12477,11 +12439,76 @@ $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; } + @@ -12633,6 +12660,18 @@ if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then as_fn_error $? "conditional \"ENABLE_DEBUG\" 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 @@ -13042,7 +13081,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 libindicator $as_me 0.4.94, which was +This file was extended by libindicator $as_me 0.4.95, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13109,7 +13148,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="\\ -libindicator config.status 0.4.94 +libindicator config.status 0.4.95 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |