X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure;h=7ed87d9514b29c051a7fe6b3560512ef1e1187cb;hb=0a87bf7bfb6860415609a859b04dd6d8867bc78b;hp=5a981815e02e216bc1ece0079e791b4183f7e0c2;hpb=24ab97d635e83e919877fed0763b7ddb24cbc3e1;p=psensor.git diff --git a/configure b/configure index 5a98181..7ed87d9 100755 --- a/configure +++ b/configure @@ -633,6 +633,8 @@ HAVE_CPPCHECK ASCIIDOC_FALSE ASCIIDOC_TRUE ASCIIDOC +HELP2MAN_FALSE +HELP2MAN_TRUE HELP2MAN GTOP_FALSE GTOP_TRUE @@ -691,6 +693,8 @@ X11_TRUE X11_LIBS X11_CFLAGS SENSORS_LIBS +SENSORS_FALSE +SENSORS_TRUE PTHREAD_LIBS GSETTINGS_RULES GLIB_COMPILE_SCHEMAS @@ -792,6 +796,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -902,6 +907,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1154,6 +1160,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1291,7 +1306,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1444,6 +1459,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2280,7 +2296,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2481,8 +2497,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2501,7 +2517,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2829,8 +2845,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2889,6 +2905,7 @@ END fi + ac_config_headers="$ac_config_headers config.h" @@ -7124,11 +7141,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sensors_sensors_init" >&5 $as_echo "$ac_cv_lib_sensors_sensors_init" >&6; } if test "x$ac_cv_lib_sensors_sensors_init" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSENSORS 1 -_ACEOF + SENSORS_LIBS=-lsensors - LIBS="-lsensors $LIBS" +$as_echo "#define HAVE_LIBSENSORS 1" >>confdefs.h fi @@ -7145,7 +7160,14 @@ fi done -SENSORS_LIBS=-lsensors + if test -n "$SENSORS_LIBS"; then + SENSORS_TRUE= + SENSORS_FALSE='#' +else + SENSORS_TRUE='#' + SENSORS_FALSE= +fi + ############### psensor @@ -7404,9 +7426,10 @@ fi # ensure that only allowed headers are included GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES " -# ensure that no gtk deprecated symbols are used +# ensure that no gtk/dk deprecated symbols are used GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED " -GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " +# do not enable flag because GtkStatusIcon is deprecated +#GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED " # ensure use of accessors GTK_CFLAGS+=" -DGSEAL_ENABLE " @@ -8516,6 +8539,14 @@ fi test -n "$HELP2MAN" && break done + if test -n "$HELP2MAN"; then + HELP2MAN_TRUE= + HELP2MAN_FALSE='#' +else + HELP2MAN_TRUE='#' + HELP2MAN_FALSE= +fi + # Extract the first word of "asciidoc", so it can be a program name with args. set dummy asciidoc; ac_word=$2 @@ -8742,6 +8773,10 @@ 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 "${SENSORS_TRUE}" && test -z "${SENSORS_FALSE}"; then + as_fn_error $? "conditional \"SENSORS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${X11_TRUE}" && test -z "${X11_FALSE}"; then as_fn_error $? "conditional \"X11\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -8798,6 +8833,10 @@ if test -z "${GTOP_TRUE}" && test -z "${GTOP_FALSE}"; then as_fn_error $? "conditional \"GTOP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HELP2MAN_TRUE}" && test -z "${HELP2MAN_FALSE}"; then + as_fn_error $? "conditional \"HELP2MAN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ASCIIDOC_TRUE}" && test -z "${ASCIIDOC_FALSE}"; then as_fn_error $? "conditional \"ASCIIDOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5