[ptxdist] [PATCH 1/2] gnuplot: update configure options and gd support

[Alexander Dahl <post@lespocky.de>]

Since 2009 a number of gnuplot versions from three different upstream
branches were used in ptxdist, namely 4.2.x, 4.4.x and 4.6.x with the
last update in 2013. Configure options were not checked with care,
leaving behind options not supported for a long time or calling some
options twice (maybe even with conflicting parameters). Configure
options were reviewed and tested now with
OSELAS.Toolchain-2012.12.1/arm-v5te-linux-gnueabi.

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/gnuplot.in   | 18 +-----------------
 rules/gnuplot.make | 33 ++++++++++++++-------------------
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/rules/gnuplot.in b/rules/gnuplot.in
index f25f2c1..5256f69 100644
--- a/rules/gnuplot.in
+++ b/rules/gnuplot.in
@@ -49,26 +49,10 @@ config GNUPLOT_X
 	help
 	  Enable the graphical X11 user interface of GNUplot
 
-config GNUPLOT_PLOT
-	bool
-	prompt "use Unix plot library"
-	depends on BROKEN
-	help
-	  If you link this program with the Unix plot library
-	  (rather outdated) it will be able to generate Unix
-	  plot output.
-
-config GNUPLOT_PNG
-	bool
-	prompt "PNG support"
-	help
-	  Include support for PNG (Portable Network Graphics)
-	  graphics format
-
 config GNUPLOT_GD
 	bool
 	prompt "GD support"
-	depends on BROKEN
+	select LIBGD
 	help
 	  Use the GD library.
 	  GD is an open source code library for the dynamic
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 39203fc..984eb2a 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -39,43 +39,38 @@ GNUPLOT_ENV	:= $(CROSS_ENV)
 GNUPLOT_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-history-file \
+	--$(call ptx/endis, PTXCONF_GNUPLOT_X)-mouse \
 	--disable-x11-mbfonts \
-	--enable-binary-data-file \
-	--disable-with-image \
-	--disable-binary-x11-polygon \
+	--disable-x11-external \
 	--disable-thin-splines \
-	--enable-datastrings \
-	--disable-histograms \
+	--disable-volatile-data \
+	--disable-raise-console \
 	--disable-objects \
-	--disable-stringvariables \
 	--disable-macros \
-	--disable-iris \
-	--disable-mgr \
-	--disable-rgip \
 	--disable-h3d-quadtree \
 	--disable-h3d-gridbox \
 	--disable-wxwidgets \
-	--without-kpsexpand \
+	--enable-backwards-compatibility \
+	--disable-stats \
+	--disable-qt \
+	--without-lispdir \
 	--without-latex \
+	--without-kpsexpand \
+	--$(call ptx/wwo, PTXCONF_GNUPLOT_X)-x \
 	--without-lasergnu \
 	--without-linux-vga \
 	--without-ggi \
 	--without-xmi \
 	--with-readline=builtin \
+	--$(call ptx/wwo, PTXCONF_GNUPLOT_GD)-gd \
+	--$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf \
+	--without-lua \
 	--without-cwdrc \
 	--without-lisp-files \
 	--without-row-help \
 	--without-tutorial \
 	--without-wx-config \
-	--without-lua \
-	--$(call ptx/endis, PTXCONF_GNUPLOT_X)-mouse \
-	--$(call ptx/wwo, PTXCONF_GNUPLOT_X)-x \
-	--$(call ptx/wwo, PTXCONF_GNUPLOT_PLOT)-plot \
-	--$(call ptx/wwo, PTXCONF_GNUPLOT_PNG)-png \
-	--$(call ptx/wwo, PTXCONF_GNUPLOT_GD)-gd \
-	--without-plot \
-	--$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf \
-	--without-tutorial \
+	--without-bitmap-terminals \
 	--without-cairo
 
 GNUPLOT_MAKE_OPT := -C src
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de