From: Martin Baulig Date: Sun, 9 Jan 2000 09:59:30 +0000 (+0000) Subject: Applied patch from R. Bernstein - print a better error X-Git-Tag: GNOME_COMMON_1_2_1~96 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=850d976288034078fe5ea807055784092ac9f988;p=platform%2Fupstream%2Fgnome-common.git Applied patch from R. Bernstein - print a better error 2000-01-09 Martin Baulig * gnome-libgtop-check.m4: Applied patch from R. Bernstein - print a better error message when LibGTop's major version number mismatches. svn path=/trunk/; revision=1054 --- diff --git a/macros/ChangeLog b/macros/ChangeLog index 0273f17..a36bdd0 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,9 @@ +2000-01-09 Martin Baulig + + * gnome-libgtop-check.m4: Applied patch from R. Bernstein + - print a better error message when + LibGTop's major version number mismatches. + 1999-12-25 Martin Baulig * gnome-pilot.m4: Applied patch from Colin Walters to make diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4 index 95bb8e4..ee67c3b 100644 --- a/macros/gnome-libgtop-check.m4 +++ b/macros/gnome-libgtop-check.m4 @@ -116,10 +116,13 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` libgtop_micro_version=`$LIBGTOP_CONFIG --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - test $libgtop_major_version != $min_libgtop_major && no_libgtop=yes - test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes - if test $libgtop_minor_version = $min_libgtop_minor ; then - test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes + if test $libgtop_major_version != $min_libgtop_major ; then + no_libgtop=mismatch + else + test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes + if test $libgtop_minor_version = $min_libgtop_minor ; then + test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes + fi fi . $configfile fi @@ -136,6 +139,9 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], ifelse([$2], [], :, [$2]) else AC_MSG_RESULT(no) + if test "$no_libgtop"x = mismatchx; then + AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major) + fi if test "x$3" = "xfail"; then AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found) else