X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fconfigure;h=618619c6840428c47181888c60128b2466a26ad5;hb=d7c75a4aa4ca82ef1806182ea73062088fea219a;hp=6879efc4008aeaa87bbdc3c644eedd31e4c994e6;hpb=757e8d55530954c3002b71f78d5027a222e810f7;p=mlt

diff --git a/src/modules/configure b/src/modules/configure
index 6879efc4..618619c6 100755
--- a/src/modules/configure
+++ b/src/modules/configure
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 # Clean up disables if not in help mode
 [ "$help" != "1" ] && rm -f disable-* producers.dat filters.dat transitions.dat consumers.dat
 
 # Create the make.inc file
-echo SUBDIRS = `find -type d -maxdepth 1 | grep -v CVS | grep -v "^.$" | sed 's/\.\///'` > make.inc
+echo SUBDIRS = `find . -maxdepth 1 -type d | grep -v .svn | grep -v "^.$" | sed 's/\.\///'` > make.inc
 
 # Iterate through arguments
 for i in "$@"
@@ -17,15 +17,22 @@ done
 # Iterate through each of the components
 for i in *
 do
-	if [ -x $i/configure -a \( "$help" = "1" -o ! -f disable-$i \) ]
+	if [ -d $i -a \( "$help" = "1" -o ! -f disable-$i \) ]
 	then
-		if [ "$gpl" = "true" -o ! -f $i/gpl ]
+		if [ "$gpl" = "true" -o ! -f $i/gpl -o "$help" = "1" ]
 		then
-			[ "$help" = "0" ] && echo "Configuring modules/$i:"
-			pushd $i > /dev/null
-			./configure "$@"
-			[ $? != 0 ] && exit 1
-			popd > /dev/null
+			[ -f $i/Makefile -a "$help" = "0" ] && echo "Configuring modules/$i:"
+			if [ -x $i/configure ]
+			then
+				olddir2=`pwd`
+				cd $i
+				./configure "$@"
+				[ $? != 0 ] && exit 1
+				cd $olddir2
+			elif [ -f $i/configure ]
+			then
+				echo "  configure script is not set executable!"
+			fi
 		elif [ "$help" = "0" ]
 		then
 			touch disable-$i