--- trunk/est-latest.sh	2006/05/07 22:09:11	23
+++ trunk/est-latest.sh	2007/05/26 23:16:58	29
@@ -13,6 +13,8 @@
 	else
 		wget -nc -c http://${what}.sourceforge.net/$upstream
 	fi
+	
+	upstream_ver=`echo $upstream | cut -d- -f2 | sed 's/\.tar.gz//'`
 }
 
 d=`pwd`
@@ -24,7 +26,7 @@
 	name=`echo $arc | cut -d- -f1`
 	ver=`echo $arc | cut -d- -f2 | sed 's/\.tar.gz//'`
 
-	if dpkg -l "$name" | grep "$ver" 2>&1 >/dev/null ; then
+	if dpkg -l "$name" | grep "^ii" | grep "$ver" 2>&1 >/dev/null ; then
 		echo "Skipping $name [$ver], allready installed."
 		return
 	fi
@@ -32,19 +34,48 @@
 	mkdir $tmp
 	cd $tmp
 
+	opt=""
+	if [ "$name" == "qdbm" ] ; then
+		opt="--enable-gzip"
+		echo "remove current hyperestraier because we will rebuild qdbm..."
+		sudo apt-get remove -y hyperestraier
+	fi
+
 	echo "Extracting $name [$ver] to $tmp"
 	tar xvfz "$d/$arc"
 	cd *
 	./configure
 	make
 	sudo checkinstall -y
+
+	# build perl bindings?
+	test -d perlnative && (
+		echo "*** installing native perl bindings"
+		cd perlnative
+		./configure
+		make
+		sudo make install
+	)
+
 	cd $d
 	sudo rm -Rf $tmp
 }
 
-check_upstream 'qdbm'
-extract `ls -d qdbm-*.tar.gz | tail -1`
+dpkg -l | awk '{ print $2 }' | egrep '^lib(estraier|qdbm)' | xargs sudo apt-get remove  -y
 
-check_upstream 'hyperestraier'
-extract `ls -d hyperestraier-*.tar.gz | tail -1`
+qdbm_ver="$1"
+est_ver="$2"
 
+if [ -z "$qdbm_ver" ] ; then
+	check_upstream 'qdbm'
+	extract "qdbm-${upstream_ver}.tar.gz"
+else
+	extract `ls -m qdbm-${qdbm_ver}.tar.gz | head -1`
+fi
+
+if [ -z "$est_ver" ] ; then
+	check_upstream 'hyperestraier'
+	extract "hyperestraier-${upstream_ver}.tar.gz"
+else
+	extract `ls -m hyperestraier-${est_ver}.tar.gz | head -1`
+fi