|
@@ -3,14 +3,16 @@ Add options to enable/disable docs and demos
|
|
|
Originally written by Anthony Viallard
|
|
|
<viallard@syscom-instruments.com>.
|
|
|
|
|
|
-[Vincent: adapt patch to 5.0.5 version]
|
|
|
-
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
+[Vincent: adapt patch to 5.0.5 version]
|
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
|
+[Michael: adapt patch to 5.4.0 version]
|
|
|
+Signed-off-by: Michael Fischer <mf@go-sys.de>
|
|
|
|
|
|
---- a/configure.ac 2019-11-27 23:52:29.000000000 +0100
|
|
|
-+++ b/configure.ac 2020-02-13 10:24:50.801842269 +0100
|
|
|
-@@ -755,6 +755,16 @@ if test "$with_cwdrc" = yes; then
|
|
|
+diff -Naur a/configure.ac b/configure.ac
|
|
|
+--- a/configure.ac 2020-07-12 02:29:47.000000000 +0200
|
|
|
++++ b/configure.ac 2020-08-06 14:21:17.918756893 +0200
|
|
|
+@@ -713,6 +713,17 @@
|
|
|
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
|
|
|
fi
|
|
|
|
|
@@ -24,10 +26,11 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
|
+AC_ARG_ENABLE(demo,dnl
|
|
|
+[ --disable-demo do not build demo files])
|
|
|
+
|
|
|
- dnl Disable experimental support for nonlinear axes
|
|
|
- AC_ARG_WITH(nonlinear-axes,dnl
|
|
|
- [ --without-nonlinear-axes disable support for nonlinear axes])
|
|
|
-@@ -1236,6 +1246,24 @@ if test -n "${DIST_CONTACT}"; then
|
|
|
++
|
|
|
+ dnl Sort help/subtopic tables by row or column
|
|
|
+ AC_ARG_WITH(row-help,dnl
|
|
|
+ [ --with-row-help format help and subtopic tables by row (default)
|
|
|
+@@ -1095,6 +1106,24 @@
|
|
|
AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
|
|
|
fi
|
|
|
|
|
@@ -52,14 +55,15 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
|
dnl Substitute variables
|
|
|
AC_SUBST(PACKAGE)
|
|
|
AC_SUBST(VERSION_MAJOR)
|
|
|
---- a/Makefile.am 2019-11-19 22:57:18.000000000 +0100
|
|
|
-+++ b/Makefile.am 2020-02-13 10:17:55.753012739 +0100
|
|
|
+diff -Naur a/Makefile.am b/Makefile.am
|
|
|
+--- a/Makefile.am 2020-03-31 19:28:16.000000000 +0200
|
|
|
++++ b/Makefile.am 2020-08-06 14:34:12.995097799 +0200
|
|
|
@@ -1,7 +1,7 @@
|
|
|
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
|
|
--SUBDIRS = config m4 term src docs man demo tutorial share
|
|
|
-+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) tutorial share
|
|
|
+-SUBDIRS = config m4 term src docs man demo share
|
|
|
++SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share
|
|
|
|
|
|
- EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
|
|
- Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|
|
|
+ EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
|
|
|
+ PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|