diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-21 19:52:32 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-05-24 01:27:52 +0200 |
| commit | 81b32be6f391c7ff31502426a8642049e898389e (patch) | |
| tree | e731788184e815c894e25afd229783d7f25769ed | |
| parent | 484967ec3112d0bf8fec15b81be0ba68e3c87f23 (diff) | |
| download | admin-81b32be6f391c7ff31502426a8642049e898389e.tar.gz admin-81b32be6f391c7ff31502426a8642049e898389e.zip | |
Remove obsolete automake 1.5 check and fix branding
(cherry picked from commit ac762db5a07d3ab5909e058f7051d82aef384224)
| -rw-r--r-- | cvs.sh | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -35,12 +35,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 @@ -50,12 +50,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 @@ -63,18 +63,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* ) : @@ -84,7 +79,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 |