Add fsharpbinding to the build

1 files changed, 14 insertions, 3 deletions

diff --git a/configure b/configure
index e358d4b55a..ffec17e6b2 100755
--- a/configure
+++ b/configure
@@ -154,6 +154,15 @@ configure_packages ()
 		else
 			enable_tests=" "
 		fi
+
+		builddir=`pwd`/$path/build
+		for p in $ops ; do
+			arg=`echo $p | cut -d '=' -f 1`
+			if [ $arg == "--addins-dir" ] ; then
+				builddir=`pwd`/$path/`echo $p | cut -d '=' -f 2`
+			fi
+		done
+
 		title="Configuring package: $path"
 		nc=`echo $title | wc -m`
 		echo $title
@@ -164,6 +173,8 @@ configure_packages ()
 			sct="./autogen.sh $enable_tests"
 		elif test -a $path/configure; then
 			sct=./configure
+		elif test -a $path/configure.sh; then
+			sct=./configure.sh
 		else
 			echo Configuration script not found in directory: $p
 			exit 1
@@ -171,7 +182,7 @@ configure_packages ()
 		pushd $path > /dev/null
 		PKG_CONFIG_PATH=$localconf:$PKG_CONFIG_PATH $sct --prefix=$prefix $ops || handle_config_error
 		popd > /dev/null
-		create_local_config $path
+		create_local_config $path $builddir
 		packages="$packages $path"
 	done
 	rm -f local-config/main.addins
@@ -191,14 +202,14 @@ create_local_config ()
 
 	# Copy the .pc file to local-config, and set the base lib directory
 	mkdir -p local-config
-	builddir=`pwd`/$path/build
+	builddir=$2
 	for f in `ls $1/*.pc.in 2>/dev/null`; do
 		pcfile=`echo $f | sed s,.*/,, | sed s/\.in$//`
 		sed -e s,libdir=.*,libdir=$builddir, -e s/@VERSION@/$ver/g $f> local-config/$pcfile
 	done
 	
 	# Generate the .addins file for the package
-	addins=local-config/`echo $path | sed s,/,_,`.addins
+	addins=local-config/`echo $path | sed s,/,_,g`.addins
 	echo "<Addins>" > $addins
 	echo "  <Directory include-subdirs=\"true\">$builddir</Directory>" >> $addins
 	echo "</Addins>" >> $addins