From 0dfa71daaeb7722e8d88b8da1be3111f6443b93d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 21 Nov 2011 18:51:37 +0000 Subject: [PATCH] at least gtk+ 2.22 --- README | 2 +- configure | 18 +++++++++--------- configure.ac | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README b/README index e5de761..42b5c78 100644 --- a/README +++ b/README @@ -78,7 +78,7 @@ Psensor compilation requires: * make/gcc * lm-sensors * library sensors4 - * library gtk2 + * library gtk2 (>= 2.22) * library gconf2 * help2man * library libnotify (optional) diff --git a/configure b/configure index 967306f..df5a970 100755 --- a/configure +++ b/configure @@ -7397,12 +7397,12 @@ if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 \""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.22\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.22") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 " 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.22" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7414,12 +7414,12 @@ if test -n "$GTK_LIBS"; then pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 \""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.22\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.22") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 " 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.22" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7440,14 +7440,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 " 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.22" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 " 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.22" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 ) were not met: + as_fn_error $? "Package requirements (gtk+-2.0 >= 2.22) were not met: $GTK_PKG_ERRORS diff --git a/configure.ac b/configure.ac index ab3d26e..a09f48c 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,7 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) if test "$GTK_LIBS" == ""; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 ) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.22) AM_CONDITIONAL(GTK, test -n "$GTK_LIBS") AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -- 2.7.4