|
@@ -8,10 +8,9 @@ Originally written by Anthony Viallard
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
|
|
|
|
-diff -rup a/configure.in b/configure.in
|
|
|
|
---- a/configure.in 2016-09-07 05:14:29.000000000 +0100
|
|
|
|
-+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000
|
|
|
|
-@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then
|
|
|
|
|
|
+--- 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
|
|
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
|
|
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
|
|
fi
|
|
fi
|
|
|
|
|
|
@@ -25,12 +24,12 @@ diff -rup a/configure.in b/configure.in
|
|
+AC_ARG_ENABLE(demo,dnl
|
|
+AC_ARG_ENABLE(demo,dnl
|
|
+[ --disable-demo do not build demo files])
|
|
+[ --disable-demo do not build demo files])
|
|
+
|
|
+
|
|
- 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)
|
|
|
|
-@@ -1303,6 +1313,24 @@ fi
|
|
|
|
- dnl No configuration option for this one yet
|
|
|
|
- AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported])
|
|
|
|
|
|
+ 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
|
|
|
|
+ AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
|
|
|
|
+ fi
|
|
|
|
|
|
+dnl build doc files
|
|
+dnl build doc files
|
|
+if test "$enable_doc" != no; then
|
|
+if test "$enable_doc" != no; then
|
|
@@ -53,15 +52,14 @@ diff -rup a/configure.in b/configure.in
|
|
dnl Substitute variables
|
|
dnl Substitute variables
|
|
AC_SUBST(PACKAGE)
|
|
AC_SUBST(PACKAGE)
|
|
AC_SUBST(VERSION_MAJOR)
|
|
AC_SUBST(VERSION_MAJOR)
|
|
-diff -rup a/Makefile.am b/Makefile.am
|
|
|
|
---- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100
|
|
|
|
-+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000
|
|
|
|
|
|
+--- a/Makefile.am 2019-11-19 22:57:18.000000000 +0100
|
|
|
|
++++ b/Makefile.am 2020-02-13 10:17:55.753012739 +0100
|
|
@@ -1,7 +1,7 @@
|
|
@@ -1,7 +1,7 @@
|
|
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
|
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
|
AUTOMAKE_OPTIONS = foreign
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
|
|
--SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
|
|
|
|
-+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
|
|
|
|
|
|
+-SUBDIRS = config m4 term src docs man demo tutorial share
|
|
|
|
++SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) tutorial share
|
|
|
|
|
|
- EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
|
|
|
- Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \
|
|
|
|
|
|
+ EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
|
|
|
+ Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|