X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=ca37fe1e62bc247d100e78c8cb8fafc9a10700c0;hb=51450a36b7143fe230197dfa89b5fd072af7421c;hp=6ce3fbda823a321cc796e9b5c589c5beb84ad471;hpb=24ab97d635e83e919877fed0763b7ddb24cbc3e1;p=psensor.git diff --git a/configure.ac b/configure.ac index 6ce3fbd..ca37fe1 100644 --- a/configure.ac +++ b/configure.ac @@ -40,9 +40,11 @@ PTHREAD_LIBS=-pthread AC_SUBST(PTHREAD_LIBS) # Checks sensors, required by psensor and psensor-server -AC_CHECK_LIB(sensors, sensors_init) +AC_CHECK_LIB(sensors, sensors_init, + [SENSORS_LIBS=-lsensors + AC_DEFINE([HAVE_LIBSENSORS],[1],[Use libsensors])]) AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h]) -SENSORS_LIBS=-lsensors +AM_CONDITIONAL(SENSORS, test -n "$SENSORS_LIBS") AC_SUBST(SENSORS_LIBS) ############### psensor @@ -66,9 +68,10 @@ PKG_CHECK_MODULES(GTK, AM_CONDITIONAL(GTK, test -n "$GTK_LIBS") # 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 " AC_SUBST(GTK_CFLAGS) @@ -253,6 +256,7 @@ AC_CONFIG_FILES([ ]) AC_CHECK_PROGS([HELP2MAN], [help2man]) +AM_CONDITIONAL(HELP2MAN, test -n "$HELP2MAN") AC_CHECK_PROG([ASCIIDOC], [asciidoc], yes) AM_CONDITIONAL(ASCIIDOC, test -n "$ASCIIDOC")