From 89f6fa8b1a51108f9617f926e3d0f66bb1d274c5 Mon Sep 17 00:00:00 2001 From: Danny Auble <da@llnl.gov> Date: Mon, 16 Oct 2006 17:10:01 +0000 Subject: [PATCH] new configure --- configure | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0c22d9be03e..8f6208d331e 100755 --- a/configure +++ b/configure @@ -24509,11 +24509,24 @@ echo "$as_me: WARNING: *** libbglade-2.0 is not available." >&2;} ### Check for gtk2.6 package if test "$ac_have_gtk" == "yes" ; then - $HAVEPKGCONFIG --exists gtk+-2.6.0 + $HAVEPKGCONFIG --exists gtk+-2.0 if ! test $? -eq 0 ; then - { echo "$as_me:$LINENO: WARNING: *** gtk+-2.6.0 is not available." >&5 -echo "$as_me: WARNING: *** gtk+-2.6.0 is not available." >&2;} + { echo "$as_me:$LINENO: WARNING: *** gtk+-2.0 is not available." >&5 +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=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([0-9]**\).\([0-9]**\).\([0-9]**\)/\2/'` + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + sed 's/\([0-9]**\).\([0-9]**\).\([0-9]**\)/\3/'` + + if test $gtk_config_major_version -lt 2 || $gtk_config_minor_version -lt 6 ; then + { echo "$as_me:$LINENO: WARNING: *** gtk+-$gtk_config_major_version.$gtk_config_minor_version.gtk_config_micro_version we need >= $gtk+-2.6.0 installed for sview." >&5 +echo "$as_me: WARNING: *** gtk+-$gtk_config_major_version.$gtk_config_minor_version.gtk_config_micro_version we need >= $gtk+-2.6.0 installed for sview." >&2;} + ac_have_gtk="no" + fi fi fi -- GitLab