Jeroen Demeyer on Mon, 09 Jan 2017 16:51:41 +0100 |
[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]
[PATCH] Minor improvents to handling of --graphic option |
>From 9a9e25cdea1851b101a88ac62a06d2c087cbf7a3 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer <jdemeyer@cage.ugent.be> Date: Mon, 9 Jan 2017 16:06:02 +0100 Subject: [PATCH 2/2] Simplify handling of --graphic option and check validity --- config/Makefile.SH | 19 +++++++++---------- config/get_config_options | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config/Makefile.SH b/config/Makefile.SH index def1a9c..ddebdac 100644 --- a/config/Makefile.SH +++ b/config/Makefile.SH @@ -69,6 +69,7 @@ esac PLOTCFLAGS= PLOTLIBS= postconfig=: +plotrunpath= case "$which_graphic_lib" in none) graph=plotnull;; @@ -90,20 +91,18 @@ fltk) win32) PLOTLIBS="-lgdi32" graph=plotWin32;; +*X11*) + PLOTCFLAGS="$PLOTCFLAGS $X11_INC" + PLOTLIBS="$PLOTLIBS $X11_LIBS" + plotrunpath=$X11 + graph=plotX;; +*) + echo >&2 "### Unrecognized graphic library '$which_graphic_lib'." + exit 1;; esac graph="plotport $graph" libgraph="plottty" -plotrunpath= -case "$which_graphic_lib" in - *X11*) - PLOTCFLAGS="$PLOTCFLAGS $X11_INC" - PLOTLIBS="$PLOTLIBS $X11_LIBS" - plotrunpath=$X11 - graph="plotX $graph" - ;; -esac - KERNOBJS= for f in $kernel; do KERNOBJS="$KERNOBJS $f\$(_O)" diff --git a/config/get_config_options b/config/get_config_options index b8c29f9..e64cb6d 100644 --- a/config/get_config_options +++ b/config/get_config_options @@ -130,7 +130,7 @@ Options: some names can be abbreviated to one character (e.g -h = -help) Build Options: --host=<arch-osname> target achitecture --kernel=<kern> kernel used - --graphic=<gr> graphic library used (none, X11, Qt, fltk, ps, win32) + --graphic=<gr> graphic library used (none, X11, Qt, Qt4, fltk, ps, win32) --time=<fun> timing function to use (getrusage, clock_gettime, times, ftime) --builddir=<dir> directory where the object files will be created -- 2.7.3