X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure;h=f1112a1f631435d50e2f80e662f43b14c7b100f4;hb=c14414799a4caf1569648fce1b61aceb95f6cafc;hp=d6be1b9d97f98469425c0fcbc18c4328e17b911e;hpb=cf9724f5f7402aadc3074219c7373e779dbd5e9a;p=psensor.git diff --git a/configure b/configure index d6be1b9..f1112a1 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.69 for psensor 0.7.0.x. +# Generated by GNU Autoconf 2.69 for psensor 0.8.0.x. # # Report bugs to . # @@ -580,12 +580,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='psensor' PACKAGE_TARNAME='psensor' -PACKAGE_VERSION='0.7.0.x' -PACKAGE_STRING='psensor 0.7.0.x' +PACKAGE_VERSION='0.8.0.x' +PACKAGE_STRING='psensor 0.8.0.x' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' -ac_unique_file="src/compat.h" +ac_unique_file="src/ui.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -670,6 +670,8 @@ ATASMART_FALSE ATASMART_TRUE ATASMART_LIBS ATASMART_CFLAGS +GCONF_FALSE +GCONF_TRUE GCONF_LIBS GCONF_CFLAGS GTK_LIBS @@ -1390,7 +1392,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 psensor 0.7.0.x to adapt to many kinds of systems. +\`configure' configures psensor 0.8.0.x to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1466,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of psensor 0.7.0.x:";; + short | recursive ) echo "Configuration of psensor 0.8.0.x:";; esac cat <<\_ACEOF @@ -1612,7 +1614,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 0.7.0.x +psensor configure 0.8.0.x generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2035,7 +2037,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 psensor $as_me 0.7.0.x, which was +It was created by psensor $as_me 0.8.0.x, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2852,7 +2854,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='0.7.0.x' + VERSION='0.8.0.x' cat >>confdefs.h <<_ACEOF @@ -7011,11 +7013,6 @@ fi -if test x"$GCONFTOOL" = xno; then - as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 -fi - - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` else @@ -7653,41 +7650,33 @@ fi # Put the nasty error message in config.log where it belongs echo "$GCONF_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gconf-2.0) were not met: - -$GCONF_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 GCONF_CFLAGS -and GCONF_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 not present\"" >&5 +$as_echo "$as_me: WARNING: \"gconf2 not present\"" >&2;} 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 GCONF_CFLAGS -and GCONF_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 not present\"" >&5 +$as_echo "$as_me: WARNING: \"gconf2 not present\"" >&2;} else GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS GCONF_LIBS=$pkg_cv_GCONF_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +$as_echo "#define HAVE_GCONF2 1" >>confdefs.h + +fi + if test -n "$GCONF_LIBS"; then + GCONF_TRUE= + GCONF_FALSE='#' +else + GCONF_TRUE='#' + GCONF_FALSE= fi + ### Optional # check libatasmart @@ -8963,6 +8952,10 @@ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_F as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GCONF_TRUE}" && test -z "${GCONF_FALSE}"; then + as_fn_error $? "conditional \"GCONF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ATASMART_TRUE}" && test -z "${ATASMART_FALSE}"; then as_fn_error $? "conditional \"ATASMART\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -9404,7 +9397,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 psensor $as_me 0.7.0.x, which was +This file was extended by psensor $as_me 0.8.0.x, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9471,7 +9464,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="\\ -psensor config.status 0.7.0.x +psensor config.status 0.8.0.x configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"