From: Niki Roo <niki@nikiroo.be>
Date: Sun, 2 Jul 2017 12:23:41 +0000 (+0200)
Subject: Fix configure.sh again (--tui=no + jar was not ok)
X-Git-Tag: fanfix-1.6.0~22
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=062ee296d56e273fa30fd3a078e5b18a02f2e00d;p=fanfix.git

Fix configure.sh again (--tui=no + jar was not ok)
---

diff --git a/configure.sh b/configure.sh
index 3e3be81..cee2078 100755
--- a/configure.sh
+++ b/configure.sh
@@ -7,6 +7,9 @@ PROGS="java javac jar make sed"
 CLI=be/nikiroo/fanfix/reader/CliReader
 TUI=be/nikiroo/fanfix/reader/TuiReader
 GUI=be/nikiroo/fanfix/reader/GuiReader
+JCLI=
+JTUI="-C bin/ jexer"
+JGUI=
 
 valid=true
 while [ "$*" != "" ]; do
@@ -27,13 +30,13 @@ while [ "$*" != "" ]; do
 		PREFIX="$val"
 	;;
 	--cli) #=no	Disable CLI support (System.out)
-		[ "$val" = no -o "$val" = false ] && CLI=
+		[ "$val" = no -o "$val" = false ] && CLI= && JCLI=
 	;;
 	--tui) #=no	Disable TUI support (Jexer)
-		[ "$val" = no -o "$val" = false ] && TUI=
+		[ "$val" = no -o "$val" = false ] && TUI= && JTUI=
 	;;
 	--gui) #=no	Disable GUI support (Swing)
-		[ "$val" = no -o "$val" = false ] && GUI=
+		[ "$val" = no -o "$val" = false ] && GUI= && JGUI=
 	;;
 	*)
 		echo "Unsupported parameter: '$1'" >&2
@@ -74,7 +77,7 @@ echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
 echo "NAME = fanfix" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ org -C bin/ jexer -C bin/ be -C bin/ VERSION" >> Makefile
+echo "JAR_FLAGS += -C bin/ org $JCLI $JTUI $JGUI -C bin/ be -C bin/ VERSION" >> Makefile
 #echo "SJAR_FLAGS += -C src/ org -C src/ jexer -C src/ be -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile
 
 cat Makefile.base >> Makefile