diff options
| -rw-r--r-- | rules/gnuplot.in | 15 | ||||
| -rw-r--r-- | rules/gnuplot.make | 11 |
2 files changed, 11 insertions, 15 deletions
diff --git a/rules/gnuplot.in b/rules/gnuplot.in index f1e31ba6b..c49057555 100644 --- a/rules/gnuplot.in +++ b/rules/gnuplot.in @@ -3,6 +3,7 @@ menuconfig GNUPLOT prompt "gnuplot" select ZLIB select LIBPNG if GNUPLOT_PNG + select XORG_LIB_XT if GNUPLOT_X help A command-line driven interactive plotting program for making 2D and 3D graphs from data and functions. @@ -16,12 +17,12 @@ menuconfig GNUPLOT config GNUPLOT_FITERRVARS bool - prompt "Support for itting error variables" + prompt "Support for fitting error variables" depends on GNUPLOT help FIXME: This item needs to be documented -config GNUPLOT_WITH_X +config GNUPLOT_X bool prompt "X support" depends on GNUPLOT @@ -32,6 +33,7 @@ config GNUPLOT_PLOT bool prompt "use Unix plot library" depends on GNUPLOT + depends on BROKEN help FIXME: This item needs to be documented @@ -46,13 +48,7 @@ config GNUPLOT_GD bool prompt "GD support" depends on GNUPLOT - help - FIXME: This item needs to be documented - -config GNUPLOT_GIF - bool - prompt "GIF support" - depends on GNUPLOT + depends on BROKEN help FIXME: This item needs to be documented @@ -60,6 +56,7 @@ config GNUPLOT_PDF bool prompt "PDF support" depends on GNUPLOT + depends on BROKEN help FIXME: This item needs to be documented diff --git a/rules/gnuplot.make b/rules/gnuplot.make index d915b7f0b..727434f36 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -123,12 +123,6 @@ else GNUPLOT_AUTOCONF += --without-gd endif -ifdef PTXCONF_GNUPLOT_GIF -GNUPLOT_AUTOCONF += --with-gif -else -GNUPLOT_AUTOCONF += --without-gif -endif - ifdef PTXCONF_GNUPLOT_PDF GNUPLOT_AUTOCONF += --with-pdf else @@ -164,6 +158,7 @@ gnuplot_install: $(STATEDIR)/gnuplot.install $(STATEDIR)/gnuplot.install: $(gnuplot_install_deps_default) @$(call targetinfo, $@) + @$(call install, GNUPLOT) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -186,6 +181,10 @@ $(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps_default) @$(call install_copy, gnuplot, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot, /usr/bin/gnuplot) +ifdef PTXCONF_GNUPLOT_X + @$(call install_copy, gnuplot, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot_x11, /usr/libexec/gnuplot/4.0/gnuplot_x11) +endif + @$(call install_finish, gnuplot) @$(call touch, $@) |