X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure;h=d610490214e324ea259b1819687ad5891bdd5853;hb=932dee9a347578a191e47b466e7669b5129eeae2;hp=292acd7f448ec4abdf315b93882bac613cffe467;hpb=4051c868959c72f0aae71b0d5314e4dd86fac3ef;p=psensor.git

diff --git a/configure b/configure
index 292acd7..d610490 100755
--- a/configure
+++ b/configure
@@ -674,10 +674,16 @@ GCONF_FALSE
 GCONF_TRUE
 GCONF_LIBS
 GCONF_CFLAGS
+GTK_FALSE
+GTK_TRUE
 GTK_LIBS
 GTK_CFLAGS
+XEXT_FALSE
+XEXT_TRUE
 XEXT_LIBS
 XEXT_CFLAGS
+X11_FALSE
+X11_TRUE
 X11_LIBS
 X11_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -7359,31 +7365,13 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (x11) were not met:
-
-$X11_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 X11_CFLAGS
-and X11_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: \"x11 missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"x11 missing psensor will not be built\"" >&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 X11_CFLAGS
-and X11_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"x11 missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"x11 missing psensor will not be built\"" >&2;}
 else
 	X11_CFLAGS=$pkg_cv_X11_CFLAGS
 	X11_LIBS=$pkg_cv_X11_LIBS
@@ -7391,6 +7379,14 @@ else
 $as_echo "yes" >&6; }
 
 fi
+ if test -n "$X11_LIBS"; then
+  X11_TRUE=
+  X11_FALSE='#'
+else
+  X11_TRUE='#'
+  X11_FALSE=
+fi
+
 
 
 
@@ -7453,31 +7449,13 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XEXT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (xext) were not met:
-
-$XEXT_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 XEXT_CFLAGS
-and XEXT_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: \"xext missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"xext missing psensor will not be built\"" >&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 XEXT_CFLAGS
-and XEXT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"xext missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"xext missing psensor will not be built\"" >&2;}
 else
 	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
 	XEXT_LIBS=$pkg_cv_XEXT_LIBS
@@ -7485,6 +7463,14 @@ else
 $as_echo "yes" >&6; }
 
 fi
+ if test -n "$XEXT_LIBS"; then
+  XEXT_TRUE=
+  XEXT_FALSE='#'
+else
+  XEXT_TRUE='#'
+  XEXT_FALSE=
+fi
+
 
 
 
@@ -7548,31 +7534,13 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-3.0) were not met:
-
-$GTK_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 GTK_CFLAGS
-and GTK_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: \"gtk missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"gtk missing psensor will not be built\"" >&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 GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gtk missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"gtk missing psensor will not be built\"" >&2;}
 else
 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
 	GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -7580,6 +7548,14 @@ else
 $as_echo "yes" >&6; }
 
 fi
+ if test -n "$GTK_LIBS"; then
+  GTK_TRUE=
+  GTK_FALSE='#'
+else
+  GTK_TRUE='#'
+  GTK_FALSE=
+fi
+
 # ensure that only allowed headers are included
 GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
 # ensure that no gtk deprecated symbols are used
@@ -7650,13 +7626,13 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GCONF_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 not present\"" >&5
-$as_echo "$as_me: WARNING: \"gconf2 not present\"" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"gconf2 missing psensor will not be built\"" >&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}: WARNING: \"gconf2 not present\"" >&5
-$as_echo "$as_me: WARNING: \"gconf2 not present\"" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 missing psensor will not be built\"" >&5
+$as_echo "$as_me: WARNING: \"gconf2 missing psensor will not be built\"" >&2;}
 else
 	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
 	GCONF_LIBS=$pkg_cv_GCONF_LIBS
@@ -9034,6 +9010,18 @@ 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 "${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
+fi
+if test -z "${XEXT_TRUE}" && test -z "${XEXT_FALSE}"; then
+  as_fn_error $? "conditional \"XEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then
+  as_fn_error $? "conditional \"GTK\" 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