X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure;h=acfb6f892860d20f97379ec7fe4273eef340f018;hb=9dc8095432b3733157be0c01a41013e640a75f76;hp=5a981815e02e216bc1ece0079e791b4183f7e0c2;hpb=24ab97d635e83e919877fed0763b7ddb24cbc3e1;p=psensor.git

diff --git a/configure b/configure
index 5a98181..acfb6f8 100755
--- a/configure
+++ b/configure
@@ -691,6 +691,8 @@ X11_TRUE
 X11_LIBS
 X11_CFLAGS
 SENSORS_LIBS
+SENSORS_FALSE
+SENSORS_TRUE
 PTHREAD_LIBS
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
@@ -7124,11 +7126,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 +7145,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 +7411,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 "
 
@@ -8742,6 +8750,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