Skip to content

Instantly share code, notes, and snippets.

@blippy
Last active March 26, 2017 12:09
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save blippy/f611d5e7903a2b587e6f88549fcb0567 to your computer and use it in GitHub Desktop.
Save blippy/f611d5e7903a2b587e6f88549fcb0567 to your computer and use it in GitHub Desktop.
Oleo compilation patch for CVS 26-Mar-2017
Index: configure.in
===================================================================
RCS file: /sources/oleo/oleo/configure.in,v
retrieving revision 1.96
diff -u -r1.96 configure.in
--- configure.in 5 Jul 2011 06:08:43 -0000 1.96
+++ configure.in 26 Mar 2017 08:51:35 -0000
@@ -84,10 +84,6 @@
LIBS="-L/usr/local/lib $LIBS "
fi
-dnl
-dnl How good is the C compiler ?
-dnl
-AM_C_PROTOTYPES
dnl
dnl Checks for libraries.
Index: doc/Makefile.am
===================================================================
RCS file: /sources/oleo/oleo/doc/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- doc/Makefile.am 5 Jul 2011 05:43:12 -0000 1.16
+++ doc/Makefile.am 26 Mar 2017 08:51:35 -0000
@@ -21,8 +21,10 @@
#htmldir= $(prefix)/share/oleo
html_DATA= oleo.html
-oleo.html: $(srcdir)/oleo.texi ${TEXIS} $(top_builddir)/doc/texi2html
- @HAVE_PERL@ $(top_builddir)/doc/texi2html $(srcdir)/oleo.texi
+oleo.html: $(srcdir)/oleo.texi ${TEXIS}
+ texi2html $(srcdir)/oleo.texi
+
+
endif
DISTCLEANFILES = $(html_DATA)
Index: doc/basics.texi
===================================================================
RCS file: /sources/oleo/oleo/doc/basics.texi,v
retrieving revision 1.8
diff -u -r1.8 basics.texi
--- doc/basics.texi 5 Jul 2011 00:16:13 -0000 1.8
+++ doc/basics.texi 26 Mar 2017 08:51:35 -0000
@@ -669,7 +669,7 @@
@item -F x
@itemx --format x
set the default file type to x (oleo, list, sc, ...)
-@itemx --filter
+@item --filter
stdin/stdout are used for reading and writing the spreadsheet
Note this only works well for X Window System user interfaces,
or in very specific circumstances.
Index: doc/expressions.texi
===================================================================
RCS file: /sources/oleo/oleo/doc/expressions.texi,v
retrieving revision 1.6
diff -u -r1.6 expressions.texi
--- doc/expressions.texi 5 Jul 2011 00:16:13 -0000 1.6
+++ doc/expressions.texi 26 Mar 2017 08:51:35 -0000
@@ -33,11 +33,11 @@
Exponentiation. Note that a^b^c is defined to be a^(b^c).
@item @var{N1} * @var{N2}
Multiplication
-@itemx @var{N1} / @var{N2}
+@item @var{N1} / @var{N2}
Division
-@itemx @var{N1} + @var{N2}
+@item @var{N1} + @var{N2}
Addition
-@itemx @var{N1} - @var{N2}
+@item @var{N1} - @var{N2}
Subtraction
@item @var{N1} % @var{N2}
Modulus; the remainder of @var{N1} / @var{N2}.
Index: doc/functions.texi
===================================================================
RCS file: /sources/oleo/oleo/doc/functions.texi,v
retrieving revision 1.7
diff -u -r1.7 functions.texi
--- doc/functions.texi 28 Jan 2001 23:46:53 -0000 1.7
+++ doc/functions.texi 26 Mar 2017 08:51:36 -0000
@@ -201,7 +201,7 @@
@findex asin
The arc sine (in radians) of @var{val}.
-@itemx acos(@var{val})
+@item acos(@var{val})
@findex acos
The arc cosine (in radians) of @var{val}.
Index: doc/oleo.texi
===================================================================
RCS file: /sources/oleo/oleo/doc/oleo.texi,v
retrieving revision 1.11
diff -u -r1.11 oleo.texi
--- doc/oleo.texi 5 Jul 2011 06:03:26 -0000 1.11
+++ doc/oleo.texi 26 Mar 2017 08:51:36 -0000
@@ -73,8 +73,7 @@
@subtitle Documentation: @value{update-month}
@c is this the Oleo or documentation author(s)? Let's include everyone
-@author
-Tom Lord, Kai Getrost, Steve Fisk, Danny Backx
+@author Tom Lord, Kai Getrost, Steve Fisk, Danny Backx
@c The following two commands start the copyright page.
@c Put it inside the titlepage to turn off headings:
@page
Index: doc/style.texi
===================================================================
RCS file: /sources/oleo/oleo/doc/style.texi,v
retrieving revision 1.6
diff -u -r1.6 style.texi
--- doc/style.texi 3 Mar 2000 07:52:40 -0000 1.6
+++ doc/style.texi 26 Mar 2017 08:51:36 -0000
@@ -186,7 +186,7 @@
What to print before positive numbers.
@item (
What to print before negative numbers.
-@item
+@item empty
What to print after positive numbers.
@item )
What to print after negative numbers.
Index: m4/motif.m4
===================================================================
RCS file: /sources/oleo/oleo/m4/motif.m4,v
retrieving revision 1.12
diff -u -r1.12 motif.m4
--- m4/motif.m4 5 May 2001 02:11:15 -0000 1.12
+++ m4/motif.m4 26 Mar 2017 08:51:36 -0000
@@ -16,7 +16,7 @@
dnl
dnl Oleo CVS $Id: motif.m4,v 1.12 2001/05/05 02:11:15 pw Exp $
dnl
-AC_DEFUN(AC_FIND_MOTIF,
+AC_DEFUN([AC_FIND_MOTIF],
[
AC_REQUIRE([AC_PATH_XTRA])
Index: m4/sciplot.m4
===================================================================
RCS file: /sources/oleo/oleo/m4/sciplot.m4,v
retrieving revision 1.3
diff -u -r1.3 sciplot.m4
--- m4/sciplot.m4 7 Feb 2001 03:14:20 -0000 1.3
+++ m4/sciplot.m4 26 Mar 2017 08:51:36 -0000
@@ -4,7 +4,7 @@
dnl
dnl Adapted from a macro by Andreas Zeller.
dnl
-AC_DEFUN(ICE_FIND_SciPlot,
+AC_DEFUN([ICE_FIND_SciPlot],
[
AC_REQUIRE([AC_PATH_XTRA])
sciplot_includes=
Index: m4/x11.m4
===================================================================
RCS file: /sources/oleo/oleo/m4/x11.m4,v
retrieving revision 1.2
diff -u -r1.2 x11.m4
--- m4/x11.m4 23 Feb 1999 21:24:40 -0000 1.2
+++ m4/x11.m4 26 Mar 2017 08:51:36 -0000
@@ -13,7 +13,7 @@
dnl
dnl Oleo CVS $Id: x11.m4,v 1.2 1999/02/23 21:24:40 danny Exp $
dnl
-AC_DEFUN(AC_LINK_X,
+AC_DEFUN([AC_LINK_X],
[if test "$with_x" = "yes"; then
X_LIBS="${X_LIBS} -lXt -lX11"
fi])
Index: m4/xbae.m4
===================================================================
RCS file: /sources/oleo/oleo/m4/xbae.m4,v
retrieving revision 1.8
diff -u -r1.8 xbae.m4
--- m4/xbae.m4 19 Apr 2001 23:57:04 -0000 1.8
+++ m4/xbae.m4 26 Mar 2017 08:51:36 -0000
@@ -4,7 +4,7 @@
dnl
dnl Adapted from a macro by Andreas Zeller.
dnl
-AC_DEFUN(AC_FIND_XBAE,
+AC_DEFUN([AC_FIND_XBAE],
[
AC_REQUIRE([AC_PATH_XTRA])
xbae_includes=
Index: m4/xmhtml.m4
===================================================================
RCS file: /sources/oleo/oleo/m4/xmhtml.m4,v
retrieving revision 1.5
diff -u -r1.5 xmhtml.m4
--- m4/xmhtml.m4 7 Feb 2001 03:14:20 -0000 1.5
+++ m4/xmhtml.m4 26 Mar 2017 08:51:36 -0000
@@ -4,7 +4,7 @@
dnl
dnl Adapted from a macro by Andreas Zeller.
dnl
-AC_DEFUN(ICE_FIND_XmHTML,
+AC_DEFUN([ICE_FIND_XmHTML],
[
AC_REQUIRE([AC_PATH_XTRA])
xmhtml_includes=
Index: m4/xp.m4
===================================================================
RCS file: /sources/oleo/oleo/m4/xp.m4,v
retrieving revision 1.2
diff -u -r1.2 xp.m4
--- m4/xp.m4 23 Nov 2001 20:47:49 -0000 1.2
+++ m4/xp.m4 26 Mar 2017 08:51:36 -0000
@@ -10,7 +10,7 @@
dnl Makefiles. Perhaps one should immediately add those libs
dnl to link commands which include libXm version2.1?!
dnl
-AC_DEFUN(LT_HAVE_LIBXP,
+AC_DEFUN([LT_HAVE_LIBXP],
[AC_REQUIRE([AC_PATH_X])
AC_CACHE_CHECK(whether libXp is available, lt_cv_libxp,
[lt_save_CFLAGS="$CFLAGS"
Index: src/Makefile.am
===================================================================
RCS file: /sources/oleo/oleo/src/Makefile.am,v
retrieving revision 1.60
diff -u -r1.60 Makefile.am
--- src/Makefile.am 5 Jul 2011 05:46:39 -0000 1.60
+++ src/Makefile.am 26 Mar 2017 08:51:36 -0000
@@ -5,7 +5,7 @@
localedir = $(prefix)/share/locale
-AUTOMAKE_OPTIONS = ../lib/ansi2knr dejagnu
+AUTOMAKE_OPTIONS = dejagnu
EXTRA_DIST= xbase.cpp oleo_xb.h mysql.c parse.h gpl.sed
CLEANFILES = parse.c parse.h posixtm.c posixtm.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment