diff -Nurd -x'*~' oleo-1.99.16.orig/Makefile.in oleo-1.99.16/Makefile.in
--- oleo-1.99.16.orig/Makefile.in	2001-03-10 09:32:45.000000000 -0500
+++ oleo-1.99.16/Makefile.in	2006-03-28 22:39:29.000000000 -0500
@@ -124,14 +124,14 @@
 
 D = `date +%G%m%d.%H%M%S`
 
-SUBDIRS = doc lib intl src m4 po Xresources examples afm
+SUBDIRS = doc lib src m4 po Xresources examples afm
 
 # Remove this file here (it is created via configure), not from within intl.
 DISTCLEANFILES = intl/libintl.h
 
 EXTRA_DIST = oleobug.in FAQ oleo.spec.in oleo.spec
 
-docdir = $(prefix)/Oleo
+docdir = $(prefix)/share/doc/oleo
 doc_DATA = AUTHORS FAQ
 
 # remove all the symlinks that come from automake
diff -Nurd -x'*~' oleo-1.99.16.orig/configure oleo-1.99.16/configure
--- oleo-1.99.16.orig/configure	2001-03-10 09:32:48.000000000 -0500
+++ oleo-1.99.16/configure	2007-06-26 04:11:59.000000000 -0400
@@ -1703,7 +1703,7 @@
 fi
 
 
-if test -d /usr/local ; then
+if false ; then
 	INCLUDES="-I/usr/local/include $INCLUDES "
 	LIBS="-L/usr/local/lib $LIBS "
 fi
@@ -5233,7 +5233,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgsl -lgslblas $LIBS"
+LIBS="-lgsl -lgslcblas $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5239 "configure"
 #include "confdefs.h"
@@ -5261,7 +5261,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lgsl -lgslblas"
+  LIBS="$LIBS -lgsl -lgslcblas"
 	cat >> confdefs.h <<\EOF
 #define HAVE_GSL 1
 EOF
diff -Nurd -x'*~' oleo-1.99.16.orig/lib/Makefile.in oleo-1.99.16/lib/Makefile.in
--- oleo-1.99.16.orig/lib/Makefile.in	2001-03-10 09:32:46.000000000 -0500
+++ oleo-1.99.16/lib/Makefile.in	2006-03-28 22:40:32.000000000 -0500
@@ -124,12 +124,12 @@
 #	configure.in can add mktime.c and obstack.c through the LIBOBJS
 #	mechanism
 #
-liboleo_a_SOURCES = getdate.y getopt.c getopt1.c random.c
+liboleo_a_SOURCES = getdate.y random.c
 liboleo_a_LIBADD = @LIBOBJS@
 
 noinst_HEADERS = getopt.h get_date.h obstack.h
 
-INCLUDES = -I.. -I$(srcdir) -I../intl
+INCLUDES = -I.. -I$(srcdir)
 
 CLEANFILES = getdate.c
 MAINTAINERCLEANFILES = Makefile.in
@@ -148,7 +148,7 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 liboleo_a_DEPENDENCIES =  @LIBOBJS@
-liboleo_a_OBJECTS =  getdate.o getopt.o getopt1.o random.o
+liboleo_a_OBJECTS =  getdate.o random.o
 AR = ar
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff -Nurd -x'*~' oleo-1.99.16.orig/po/Makefile.in.in oleo-1.99.16/po/Makefile.in.in
--- oleo-1.99.16.orig/po/Makefile.in.in	1998-08-27 17:15:29.000000000 -0400
+++ oleo-1.99.16/po/Makefile.in.in	2006-03-28 23:57:23.000000000 -0500
@@ -39,7 +39,7 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 
-INCLUDES = -I.. -I$(top_srcdir)/intl
+INCLUDES = -I..
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
@@ -73,7 +73,7 @@
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	sed -f po2msg.sed < $< > $*.msg \
 	  && rm -f $@ && $(GENCAT) $@ $*.msg
 
 
@@ -85,7 +85,7 @@
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=$(srcdir)/POTFILES.in \
+	  --files-from=$(srcdir)/POTFILES.in --from-code=UTF-8 \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
@@ -93,7 +93,7 @@
 $(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @:
 $(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
 	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
+	sed -f po2tbl.sed $(srcdir)/$(PACKAGE).pot \
 		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
 	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
 	  rm cat-id-tbl.tmp; \
diff -Nurd -x'*~' oleo-1.99.16.orig/src/Makefile.in oleo-1.99.16/src/Makefile.in
--- oleo-1.99.16.orig/src/Makefile.in	2001-03-10 09:32:46.000000000 -0500
+++ oleo-1.99.16/src/Makefile.in	2006-03-28 22:41:16.000000000 -0500
@@ -161,8 +161,8 @@
 @UseMotif_TRUE@MYCFL = ${X_CFLAGS}
 @UseMotif_FALSE@MYCFL = ${X_CFLAGS}
 
-oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ../intl/libintl.a ${X_LIBS}
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl ${MYINC}
+oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a -lintl ${X_LIBS}
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib ${MYINC}
 CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" ${MYCFL} 	-DBUILD_PREFIX='"'${BUILD_PREFIX}'"'
 
 
@@ -254,8 +254,6 @@
 @UseMotif_FALSE@@HaveXbase_FALSE@postscript$U.o pcl$U.o epson$U.o \
 @UseMotif_FALSE@@HaveXbase_FALSE@prtext$U.o afm$U.o mdi$U.o gsl$U.o \
 @UseMotif_FALSE@@HaveXbase_FALSE@plotter$U.o legend$U.o
-@UseMotif_TRUE@oleo_DEPENDENCIES =  ../lib/liboleo.a ../intl/libintl.a
-@UseMotif_FALSE@oleo_DEPENDENCIES =  ../lib/liboleo.a ../intl/libintl.a
 oleo_LDFLAGS = 
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
diff -Nurd -x'*~' oleo-1.99.16.orig/src/basic.h oleo-1.99.16/src/basic.h
--- oleo-1.99.16.orig/src/basic.h	2000-08-10 17:02:49.000000000 -0400
+++ oleo-1.99.16/src/basic.h	2006-03-28 21:24:55.000000000 -0500
@@ -36,9 +36,6 @@
 
 extern const int colmagic[9];
 extern  const int rowmagic[9];
-extern char * motion_name[9];
-extern enum motion_magic complementary_motion[9];
-extern enum motion_magic opposite_motion[9];
 
 extern int run_load_hooks;
 
diff -Nurd -x'*~' oleo-1.99.16.orig/src/cmd.c oleo-1.99.16/src/cmd.c
--- oleo-1.99.16.orig/src/cmd.c	2001-02-14 15:54:50.000000000 -0500
+++ oleo-1.99.16/src/cmd.c	2006-03-28 21:22:10.000000000 -0500
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 #include "sysdef.h"
 #include <termios.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #ifdef	HAVE_MOTIF
 #include "io-motif.h"
diff -Nurd -x'*~' oleo-1.99.16.orig/src/eval.c oleo-1.99.16/src/eval.c
--- oleo-1.99.16.orig/src/eval.c	2001-02-13 18:38:05.000000000 -0500
+++ oleo-1.99.16/src/eval.c	2006-03-28 21:22:10.000000000 -0500
@@ -565,7 +565,7 @@
 	case CONST_NINF:
 	case CONST_NAN:
 	  p->type = TYP_FLT;
-	  p->Float = (byte == CONST_INF) ? __plinf : ((byte == CONST_NINF) ? __neinf : __nan);
+	  p->Float = (byte == CONST_INF) ? __plinf : ((byte == CONST_NINF) ? __neinf : int__nan);
 	  break;
 
 	case VAR:
diff -Nurd -x'*~' oleo-1.99.16.orig/src/global.h oleo-1.99.16/src/global.h
--- oleo-1.99.16.orig/src/global.h	2001-02-14 15:54:50.000000000 -0500
+++ oleo-1.99.16/src/global.h	2006-03-28 21:22:10.000000000 -0500
@@ -208,7 +208,7 @@
 extern char nname[];
 
 extern VOIDSTAR parse_hash;
-extern double __plinf, __neinf, __nan;
+extern double __plinf, __neinf, int__nan;
 
 /* These have two uses.  During parsing, these contain the 
  * base address of all relative references.  During evaluation,
diff -Nurd -x'*~' oleo-1.99.16.orig/src/io-motif.c oleo-1.99.16/src/io-motif.c
--- oleo-1.99.16.orig/src/io-motif.c	2001-03-09 06:33:29.000000000 -0500
+++ oleo-1.99.16/src/io-motif.c	2006-03-28 21:42:23.000000000 -0500
@@ -1499,6 +1499,7 @@
 #if 0
 		fprintf(stderr, "Huh ? TickTypeCB(axis %d type %d) -> sensitive \n", axis, val);
 #endif
+		;
 	}
 #if 0
 	fprintf(stderr, "SP_TICK_DEFAULT %d\n", SP_TICK_DEFAULT);
@@ -3296,7 +3297,7 @@
 #define	HELP_FILE_LENGTH	200000
 
 #ifndef	HTMLDIR
-#define	HTMLDIR			"/usr/local/share/oleo"
+#define	HTMLDIR			"@prefix@/share/oleo"
 #endif
 
 static void
diff -Nurd -x'*~' oleo-1.99.16.orig/src/io-term.h oleo-1.99.16/src/io-term.h
--- oleo-1.99.16.orig/src/io-term.h	2001-02-10 03:27:04.000000000 -0500
+++ oleo-1.99.16/src/io-term.h	2006-03-28 21:22:57.000000000 -0500
@@ -22,6 +22,7 @@
 
 #include <setjmp.h>
 #include "global.h"
+#include "funcs.h"
 
 extern int using_x;
 extern int using_curses;
diff -Nurd -x'*~' oleo-1.99.16.orig/src/io-utils.c oleo-1.99.16/src/io-utils.c
--- oleo-1.99.16.orig/src/io-utils.c	2001-02-13 18:38:06.000000000 -0500
+++ oleo-1.99.16/src/io-utils.c	2006-03-28 21:22:10.000000000 -0500
@@ -71,7 +71,7 @@
 
 double __plinf;
 double __neinf;
-double __nan;
+double int__nan;
 
 char nname[] = "#NOT_A_NUMBER";
 char iname[] = "#INFINITY";
@@ -125,7 +125,7 @@
   __neinf = divide (-1., 0.);
   (void) signal (SIGFPE, ignore_sig);
 #endif
-  __nan = __plinf + __neinf;
+  int__nan = __plinf + __neinf;
 }
 
 
diff -Nurd -x'*~' oleo-1.99.16.orig/src/mysql.c oleo-1.99.16/src/mysql.c
--- oleo-1.99.16.orig/src/mysql.c	2000-07-22 02:13:16.000000000 -0400
+++ oleo-1.99.16/src/mysql.c	2007-06-26 01:48:28.000000000 -0400
@@ -44,6 +44,15 @@
 #include <mysql/mysql.h>
 
 /*
+  The mysql_connect() function was removed from mysqlclient API many
+  versions ago. Here's an emulation using the modern-API functions.
+*/
+MYSQL *mysql_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd) {
+  mysql_init(mysql);
+  return(mysql_real_connect(mysql, host, user, passwd, NULL, 0, NULL, 0));
+}
+
+/*
  * Define some MySQL access functions for Oleo
  */
 
diff -Nurd -x'*~' oleo-1.99.16.orig/src/plotter.c oleo-1.99.16/src/plotter.c
--- oleo-1.99.16.orig/src/plotter.c	2000-11-22 14:33:01.000000000 -0500
+++ oleo-1.99.16/src/plotter.c	2006-03-28 22:14:13.000000000 -0500
@@ -2640,7 +2640,7 @@
 		sp_pie_plot_point(mg, point);
 		break;
 	default:
-		/* ?? */
+	  ;
 	}
 }
 
@@ -2771,7 +2771,7 @@
 		sp_pie_begin_graph(mg, scale, trans_x, trans_y);
 		break;
 	default:
-		/* ??? */
+	  ;
 	}
 
 	sp_first_dataset(mg);
@@ -2791,7 +2791,7 @@
 		sp_pie_end_graph(mg);
 		break;
 	default:
-		/* ??? */
+	  ;
 	}
 }
 
diff -Nurd -x'*~' oleo-1.99.16.orig/src/ref.c oleo-1.99.16/src/ref.c
--- oleo-1.99.16.orig/src/ref.c	2001-02-13 18:38:06.000000000 -0500
+++ oleo-1.99.16/src/ref.c	2006-03-28 21:22:10.000000000 -0500
@@ -263,7 +263,7 @@
 read_new_value (CELLREF row, CELLREF col, char *form, char *val)
 {
   unsigned char *new_bytes;
-  extern double __plinf, __neinf, __nan;
+  extern double __plinf, __neinf, int__nan;
 
   cur_row = row;
   cur_col = col;
@@ -348,7 +348,7 @@
 	  else if (!stricmp (nname, val))
 	    {
 	      SET_TYP (my_cell, TYP_FLT);
-	      my_cell->cell_flt = __nan;
+	      my_cell->cell_flt = int__nan;
 	    }
 	  else
 	    {
diff -Nurd -x'*~' oleo-1.99.16.orig/src/sysdef.h oleo-1.99.16/src/sysdef.h
--- oleo-1.99.16.orig/src/sysdef.h	2001-02-04 10:54:21.000000000 -0500
+++ oleo-1.99.16/src/sysdef.h	2007-06-26 02:03:28.000000000 -0400
@@ -49,6 +49,7 @@
 #ifndef rindex
 #define rindex strrchr
 #endif
+#if 0
 #ifndef bcopy
 #define bcopy(s, d, n) memcpy ((d), (s), (n))
 #endif
@@ -58,6 +59,7 @@
 #ifndef bzero
 #define bzero(s, n) memset ((s), 0, (n))
 #endif
+#endif
 #else /* not STDC_HEADERS and not HAVE_STRING_H */
 #include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */
diff -Nurd -x'*~' oleo-1.99.16.orig/src/utils.c oleo-1.99.16/src/utils.c
--- oleo-1.99.16.orig/src/utils.c	2001-02-13 18:38:06.000000000 -0500
+++ oleo-1.99.16/src/utils.c	2006-03-28 21:22:10.000000000 -0500
@@ -66,7 +66,7 @@
 #define _IOSTRG 0
 #endif
 
-extern int sys_nerr;
+/*extern int sys_nerr; */
 
 struct id
   {
diff -Nurd -x'*~' oleo-1.99.16.orig/src/xrdb.c oleo-1.99.16/src/xrdb.c
--- oleo-1.99.16.orig/src/xrdb.c	2000-08-10 17:02:51.000000000 -0400
+++ oleo-1.99.16/src/xrdb.c	2006-03-28 21:40:47.000000000 -0500
@@ -57,7 +57,7 @@
 /* This should be included before the X include files; otherwise, we get
    warnings about redefining NULL under BSD 4.3.  */
 #include <sys/param.h>
-#define NeedFunctionPrototypes 0
+//#define NeedFunctionPrototypes 0  // need it defined to get _Xconst for Xlib.h
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>