summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-21 19:52:32 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-21 19:52:32 -0500
commitac762db5a07d3ab5909e058f7051d82aef384224 (patch)
treea85484f758fa3f72d37531a597ad8e0d1aafc88f
parent69a6474abe53412a0e0958021c0bb78d593b14aa (diff)
downloadadmin-ac762db5a07d3ab5909e058f7051d82aef384224.tar.gz
admin-ac762db5a07d3ab5909e058f7051d82aef384224.zip
Remove obsolete automake 1.5 check and fix branding
-rw-r--r--cvs.sh17
1 files changed, 6 insertions, 11 deletions
diff --git a/cvs.sh b/cvs.sh
index ba97c99..35fcc7e 100644
--- a/cvs.sh
+++ b/cvs.sh
@@ -28,12 +28,12 @@ case $AUTOCONF_VERSION in
Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
- echo "*** KDE requires autoconf $required_autoconf_version"
+ echo "*** TDE requires autoconf $required_autoconf_version"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOCONF_VERSION."
- echo "*** KDE requires autoconf $required_autoconf_version"
+ echo "*** TDE requires autoconf $required_autoconf_version"
exit 1
;;
esac
@@ -43,12 +43,12 @@ case $AUTOHEADER_VERSION in
Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
- echo "*** KDE requires autoheader $required_autoconf_version"
+ echo "*** TDE requires autoheader $required_autoconf_version"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOHEADER_VERSION."
- echo "*** KDE requires autoheader $required_autoconf_version"
+ echo "*** TDE requires autoheader $required_autoconf_version"
exit 1
;;
esac
@@ -56,18 +56,13 @@ esac
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
required_automake_version="1.6.1 or newer"
case $AUTOMAKE_STRING in
- automake*1.5d* | automake*1.5* | automake*1.5-* )
- echo "*** YOU'RE USING $AUTOMAKE_STRING."
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
- echo "*** KDE requires automake $required_automake_version"
+ echo "*** TDE requires automake $required_automake_version"
exit 1
;;
*unsermake* ) :
@@ -77,7 +72,7 @@ case $AUTOMAKE_STRING in
;;
* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
- echo "*** KDE requires automake $required_automake_version"
+ echo "*** TDE requires automake $required_automake_version"
exit 1
;;
esac