From 7553341badc73d7e9cdf6a0dd1f03ae04f766b92 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 14 Oct 2003 11:27:30 +0000 Subject: improved the libtool check to disqualify "1.4c" when 1.4.2 is required --- buildconf | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'buildconf') diff --git a/buildconf b/buildconf index 76c400b14..33597abcf 100755 --- a/buildconf +++ b/buildconf @@ -90,17 +90,26 @@ if test -z "$lt_pversion"; then echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer installed" exit 1 fi -lt_version=`echo $lt_pversion` #|sed -e 's/\([a-z]*\)$/.\1/'` +lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$//'` IFS=.; set $lt_version; IFS=' ' lt_status="good" -if test "$1" = "$LIBTOOL_WANTED_MAJOR"; then - if test "$2" -lt "$LIBTOOL_WANTED_MINOR"; then + +major=$1 +minor=$2 +patch=$3 + +if test "$major" = "$LIBTOOL_WANTED_MAJOR"; then + if test "$minor" -lt "$LIBTOOL_WANTED_MINOR"; then lt_status="bad" - elif test ! -z "$LIBTOOL_WANTED_PATCH"; then - if test -n "$3"; then - if test "$3" -lt "$LIBTOOL_WANTED_PATCH"; then + elif test -n "$LIBTOOL_WANTED_PATCH"; then + if test "$minor" -gt "$LIBTOOL_WANTED_MINOR"; then + lt_status="good" + elif test -n "$patch"; then + if test "$patch" -lt "$LIBTOOL_WANTED_PATCH"; then lt_status="bad" fi + else + lt_status="bad" fi fi fi -- cgit v1.2.3