@@ -11,16 +11,21 @@
 
 echo You may need to do the following first:
 echo sudo apt-get install libreadline-dev
 echo sudo apt-get install libwebkitgtk-dev
 echo sudo apt-get install libmotif3 -OR- set KTYPE=26g4
-echo KTYPE can be 26, 26g4, 32, or 32_64
+echo KTYPE can be 26, 26g4, or 32
 echo KTYPE=$KTYPE
 echo You are using PREFIX=$PREFIX
 echo You are using proxy="$proxy"
+echo 
 echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :"
 echo ADDITIONAL_LIBPATH=$ADDITIONAL_LIBPATH
+echo
+echo To use previous IUP libraries set USEOLDIUP to yes
+echo USEOLDIUP=$USEOLDIUP
+
 echo Hit ^C now to do that
 
 # A nice way to run this script:
 #
 # script -c 'PREFIX=/tmp/delme ./installall.sh ' installall.log
@@ -68,20 +73,28 @@
     make PLATFORM=linux PREFIX=$PREFIX
     make PLATFORM=linux PREFIX=$PREFIX install
     cd $BUILDHOME
 fi
 
-for f in readline apropos base64 regex-literals format regex-case test coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml ; do
-  chicken-install $PROX $f
+# Some eggs are quoted since they are reserved to Bash
+for f in readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt ; do
+  if ! [[ -e $PREFIX/lib/chicken/6/$f.so ]];then
+    chicken-install $PROX $f
+  else
+    echo Skipping install of egg $f as it is already installed
+  fi
 done
 
 cd $BUILDHOME
 
 for a in `ls */*.meta|cut -f1 -d/` ; do 
     echo $a
     (cd $a;chicken-install)
 done
+
+export LIBPATH=$PREFIX/lib$ADDITIONAL_LIBPATH
+export LD_LIBRARY_PATH=$LIBPATH
 
 export SQLITE3_VERSION=3071401
 echo Install sqlite3
 if ! [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then
     wget http://www.sqlite.org/sqlite-autoconf-$SQLITE3_VERSION.tar.gz
@@ -101,15 +114,16 @@
     export ARCHSIZE=''
 else
     export ARCHSIZE=64_
 fi
     # export files="cd-5.4.1_Linux${KTYPE}_lib.tar.gz im-3.6.3_Linux${KTYPE}_lib.tar.gz iup-3.5_Linux${KTYPE}_lib.tar.gz"
-export files="cd-5.5.1_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz"
-# else
-#     # export files="cd-5.4.1_Linux${KTYPE}_64_lib.tar.gz im-3.6.3_Linux${KTYPE}_64_lib.tar.gz iup-3.5_Linux${KTYPE}_64_lib.tar.gz"
-#     export files="cd-5.5.1_Linux${KTYPE}_lib.tar.gz im-3.6.3_Linux${KTYPE}_lib.tar.gz iup-3.5_Linux${KTYPE}_lib.tar.gz"
-# fi
+if [[ x$USEOLDIUP == "x" ]];then
+   export files="cd-5.5.1_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz"
+else
+   echo WARNING: Using old IUP libraries
+   export files="cd-5.4.1_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz im-3.6.3_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz iup-3.5_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz"
+fi
 
 mkdir $PREFIX/iuplib
 for a in `echo $files` ; do
     if ! [[ -e $a ]] ; then
 	wget http://www.kiatoa.com/matt/iup/$a