diff --git a/auxdir/x_ac_gtk.m4 b/auxdir/x_ac_gtk.m4 index 90f3fa0a53f7e59640bf497afd2d5f56b24f5487..010ed0401855cf11b389ef62bc98ebe38abb501c 100644 --- a/auxdir/x_ac_gtk.m4 +++ b/auxdir/x_ac_gtk.m4 @@ -51,24 +51,20 @@ AC_DEFUN([X_AC_GTK], # fi -### Check for gtk2.7.1 package +### Check for min gtk package if test "$ac_have_gtk" == "yes" ; then $HAVEPKGCONFIG --exists gtk+-2.0 if ! test $? -eq 0 ; then AC_MSG_WARN([*** gtk+-2.0 is not available.]) ac_have_gtk="no" else - gtk_config_major_version=`$HAVEPKGCONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$HAVEPKGCONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$HAVEPKGCONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - if test $gtk_config_major_version -lt 2 && test $gtk_config_minor_version -lt 7 && test $gtk_config_micro_version -lt 1; then - AC_MSG_WARN([*** gtk+-$gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version available, we need >= gtk+-2.7.1 installed for sview.]) - ac_have_gtk="no" - fi + min_gtk_version="2.7.1" + $HAVEPKGCONFIG --atleast-version=$min_gtk_version gtk+-2.0 + if ! test $? -eq 0 ; then + gtk_config_version=`$HAVEPKGCONFIG --modversion gtk+-2.0` + AC_MSG_WARN([*** gtk+-$gtk_config_version available, we need >= gtk+-$min_gtk_version installed for sview.]) + ac_have_gtk="no" + fi fi fi diff --git a/configure b/configure index f27c2a0a6cae2fae0dd42a03f0462472a43ce937..b7c3962d43e8a69bc8ba06716699881c8fc2199a 100755 --- a/configure +++ b/configure @@ -25709,7 +25709,7 @@ echo "$as_me: WARNING: *** pkg-config not found. Cannot probe for libglade-2.0 o # fi -### Check for gtk2.7.1 package +### Check for min gtk package if test "$ac_have_gtk" == "yes" ; then $HAVEPKGCONFIG --exists gtk+-2.0 if ! test $? -eq 0 ; then @@ -25717,18 +25717,14 @@ echo "$as_me: WARNING: *** pkg-config not found. Cannot probe for libglade-2.0 o echo "$as_me: WARNING: *** gtk+-2.0 is not available." >&2;} ac_have_gtk="no" else - gtk_config_major_version=`$HAVEPKGCONFIG --modversion gtk+-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$HAVEPKGCONFIG --modversion gtk+-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$HAVEPKGCONFIG --modversion gtk+-2.0 | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - - if test $gtk_config_major_version -lt 2 && test $gtk_config_minor_version -lt 7 && test $gtk_config_micro_version -lt 1; then - { echo "$as_me:$LINENO: WARNING: *** gtk+-$gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version available, we need >= gtk+-2.7.1 installed for sview." >&5 -echo "$as_me: WARNING: *** gtk+-$gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version available, we need >= gtk+-2.7.1 installed for sview." >&2;} - ac_have_gtk="no" - fi + min_gtk_version="2.7.1" + $HAVEPKGCONFIG --atleast-version=$min_gtk_version gtk+-2.0 + if ! test $? -eq 0 ; then + gtk_config_version=`$HAVEPKGCONFIG --modversion gtk+-2.0` + { echo "$as_me:$LINENO: WARNING: *** gtk+-$gtk_config_version available, we need >= gtk+-$min_gtk_version installed for sview." >&5 +echo "$as_me: WARNING: *** gtk+-$gtk_config_version available, we need >= gtk+-$min_gtk_version installed for sview." >&2;} + ac_have_gtk="no" + fi fi fi