update README, add build-essentials and ubuntu version detection

2 files changed, 32 insertions, 14 deletions

diff --git a/README.md b/README.md
index 47b0788..954b7f7 100644
--- a/README.md
+++ b/README.md
@@ -119,23 +119,19 @@ After that, follow the Compilation instructions below.
 
 ### Building for newer Linux distributions
 
-First, make sure that you have development tools installed. Then use a 
-package manager to download the appropriate packages. Scripts are 
-available for popular systems to attempt semi-automatic installation:
+Use a package manager to download development tools for your machine as 
+well as the appropriate packages based on the list above. Convenience 
+scripts are provided for some popular systems:
 
-Aptitude based systems (ubuntu, debian): 
-
-    ./scripts/ubuntu-build-dependencies.sh
-
-Zypper based systems (opensuse)
-
-    ./scripts/opensuse-build-dependencies.sh
+Ubuntu, Debian:    ./scripts/ubuntu-build-dependencies.sh
+OpenSUSE:          ./scripts/opensuse-build-dependencies.sh
+Fedora, Redhat:    ./scripts/fedora-build-dependencies.sh
 
 Check your binary packaged library versions to make sure they meet the 
 minimum requirements listed above. After that follow the Compilation 
 instructions below.
 
-### Building for older Linux or without root access
+### Building for older Linux or building without root access
 
 First, make sure that you have compiler tools (build-essential on ubuntu).
 Then after you've cloned this git repository, run the script that sets up the
@@ -147,6 +143,8 @@ Then run the script to download & compile all the prerequisite libraries above:
 
     ./scripts/linux-build-dependencies.sh
 
+If you logoff your shell, you will have to re-run setenv-linbuild.sh to run
+your new openscad. You can add it's contents to your .bashrc if you wish. 
 After that, follow the Compilation instructions below.
 
 ### Building for Windows
diff --git a/scripts/ubuntu-build-dependencies.sh b/scripts/ubuntu-build-dependencies.sh
index 8662043..912ba80 100755
--- a/scripts/ubuntu-build-dependencies.sh
+++ b/scripts/ubuntu-build-dependencies.sh
@@ -1,5 +1,25 @@
+
+too_old()
+{
+	echo "System version too low. Please try 'old linux' build (see README.md)"
+}
+
+if [ "`cat /etc/issue | grep 'Ubunutu 10'`" ]; then
+	too_old
+fi
+if [ "`cat /etc/issue | grep 'Ubunutu 9'`" ]; then
+	too_old
+fi
+if [ "`cat /etc/issue | grep 'Ubunutu 8'`" ]; then
+	too_old
+fi
+if [ "`cat /etc/issue | grep 'Ubunutu 7'`" ]; then
+	too_old
+fi
+
 echo "tested on Ubuntu 12. If this fails try 'old linux' build (see README.md)"
 
+
 if [ "`dpkg --list | grep -i cgal`" ]; then
 	echo "Please make sure you have run apt-get purge on all cgal packages"
   exit
@@ -10,9 +30,9 @@ if [ "`dpkg --list | grep -i opencsg`" ]; then
   exit
 fi
 
-sudo apt-get install libqt4-dev libqt4-opengl-dev libxmu-dev cmake \
- bison flex libeigen2-dev git-core libboost-all-dev libXi-dev libmpfr-dev \
- libgmp-dev libboost-dev libglew1.6-dev
+sudo apt-get install build-essential libqt4-dev libqt4-opengl-dev \
+ libxmu-dev cmake bison flex libeigen2-dev git-core libboost-all-dev \
+ libXi-dev libmpfr-dev libgmp-dev libboost-dev libglew1.6-dev
 
 echo "now copy/paste the following to install CGAL and OpenCSG from source:"
 echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh cgal-use-sys-libs"