X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=configure.sh;h=8c5dbdd63784494141a1498fbbab1021d62d571f;hp=c73fc62dc6131d06e38c5a04a599bc530a6d834d;hb=59e9bd1e353b9d01cee7da6055ebd36d8d045d3a;hpb=6da6b8b0fd8e9fe1c4453ef9a5eea89c87437b8e

diff --git a/configure.sh b/configure.sh
index c73fc62..8c5dbdd 100755
--- a/configure.sh
+++ b/configure.sh
@@ -2,16 +2,17 @@
 
 # default:
 PREFIX=/usr/local
-PROGS="java javac jar"
+PROGS="java javac jar make sed"
 
-UI=be/nikiroo/utils/ui/test/TestUI
-ANDOIRD=
+IMG=be/nikiroo/utils/ui/ImageUtilsAwt
 
 valid=true
 while [ "$*" != "" ]; do
 	key=`echo "$1" | cut -f1 -d=`
 	val=`echo "$1" | cut -f2 -d=`
 	case "$key" in
+	--)
+	;;
 	--help) #		This help message
 		echo The following arguments can be used:
 		cat "$0" | grep '^\s*--' | grep '#' | while read ln; do
@@ -23,20 +24,10 @@ while [ "$*" != "" ]; do
 	--prefix) #=PATH	Change the prefix to the given path
 		PREFIX="$val"
 	;;
-	--ui) #=no	Disable UI (Swing/AWT) support
-		[ "$val" = no -o "$val" = false ] && UI= && JUI=
-		if [ "$val" = yes -o "$val" = true ]; then
-			UI=be/nikiroo/utils/ui/test/TestUI
-		fi
-	;;
-	--android) #=yes	Enable Android UI support
-		[ "$val" = no -o "$val" = false ] && ANDROID= && JANDROID=
-		if [ "$val" = yes -o "$val" = true ]; then
-			ANDROID=be/nikiroo/utils/android/test/TestAndroid
-		fi
-	;;
 	*)
 		echo "Unsupported parameter: '$1'" >&2
+		echo >&2
+		sh "$0" --help >&2
 		valid=false
 	;;
 	esac
@@ -61,20 +52,21 @@ if [ "`whereis tput`" = "tput:" ]; then
 	ko='"[ !! ]"';
 	cols=80;
 else
-	ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"';
-	ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"';
+	#ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"';
+	#ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"';
+	ok='"`tput bold`[`tput setaf 2` OK `tput init``tput bold`]`tput init`"';
+	ko='"`tput bold`[`tput setaf 1` !! `tput init``tput bold`]`tput init`"';
 	cols='"`tput cols`"';
 fi;
 
-
-echo "MAIN = be/nikiroo/utils/test_code/Test" > Makefile
-echo "MORE = $UI $ANDROID" >> Makefile
-echo "TEST = be/nikiroo/utils/test_code/Test" >> Makefile
+echo "MAIN = be/nikiroo/fanfix/Main" > Makefile
+echo "MORE = $IMG" >> Makefile
+echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
-echo "NAME = nikiroo-utils" >> Makefile
+echo "NAME = fanfix" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ be -C bin/ org -C bin/ VERSION" >> Makefile
-echo "SJAR_FLAGS += -C src/ org -C src/ be -C libs/ licenses" >> Makefile
+echo "JAR_FLAGS += -C bin/ org -C bin/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+echo "SJAR_FLAGS += -C src/ org -C src/ be" >> Makefile
 
 cat Makefile.base >> Makefile