From 3398a47ab9182de783b91a69e9f0dbb01c84cc3e Mon Sep 17 00:00:00 2001 From: Ted Lemon Date: Tue, 13 Jul 1999 18:38:55 +0000 Subject: [PATCH] Pull up 1.24 and 1.25 --- configure | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 130f92e29..190b3c500 100755 --- a/configure +++ b/configure @@ -20,11 +20,18 @@ if [ "$sysname" = "" ]; then sysname=alphaosf fi;; Linux) - case `uname -r` in - 1*) sysname=linux-1 ;; - 2.1*) sysname=linux-2.1 ;; - 2.2*) sysname=linux-2.2 ;; - 2*) sysname=linux-2.0 ;; + release=`uname -r` + minor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'` + major=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'` + + case $major in + 1) sysname=linux-1 ;; + 2) case $minor in + 0) sysname=linux-2.0 ;; + 1) sysname=linux-2.1 ;; + 2) sysname=linux-2.2 ;; + *) sysname=linux-2.2 ;; + esac;; esac;; SunOS) case `uname -r` in @@ -78,8 +85,14 @@ fi echo "System Type: $sysname" +if [ x$major != x ] && [ x$minor != x ]; then + majversubst="-e /^##--majver--/,/^##--majver--/s/MajorVersion/$major/" + minversubst="-e /^##--minver--/,/^##--minver--/s/MinorVersion/$minor/" +fi + for foo in . client server relay common; do - (sed -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \ + (sed $majversubst $minversubst \ + -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \ $foo/Makefile done -- 2.47.3