diff -Nurd '-x*~' XmHTML-1.1.7.orig/Makefile XmHTML-1.1.7/Makefile
--- XmHTML-1.1.7.orig/Makefile 1999-02-03 19:43:27.000000000 -0500
+++ XmHTML-1.1.7/Makefile 2011-09-07 07:06:56.000000000 -0400
@@ -40,7 +40,7 @@
# remove the examples directory from this line.
# If you want to build the XmHTML tutorial examples, add the book directory.
-SUBDIRS= lib http examples tools
+SUBDIRS= lib
# some common definitions
#
@@ -64,8 +64,8 @@
# Compiler Settings #
# #
#####################
-CC = gcc
-CFLAGS = -g -funroll-loops -Wall -pipe -ansi
+CC = cc -fno-common
+CFLAGS = -g -funroll-loops -Wall -pipe -ansi -MD
LDFLAGS =
# The following flags are *very* usefull if you are getting unresolved
@@ -115,7 +115,7 @@
# HAVE_LIBZ => zlib.h
ZLIBINC =
-IMAGEINCLUDES = $(ZLIBINC)
+IMAGEINCLUDES = -I@prefix@/include $(ZLIBINC)
# Image libraries
# No need to add -lXpm if you need to include it with LIBS below
@@ -166,14 +166,14 @@
# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
# info).
#
-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES)
+CPPFLAGS = -DHAVE_STRINGS_H -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES)
# Various include directories
LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
# Platform specific includes
ifeq ($(PLATFORM),Motif)
-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
+PLATFORMINC=-I../../include/XmHTML -I@prefix@/include -I/usr/X11R6/include
else
ifeq ($(PLATFORM),gtk)
PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
@@ -192,7 +192,7 @@
# Motif version (default)
ifeq ($(PLATFORM),Motif)
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L@prefix@/lib -L/usr/X11R6/lib
# This is what is required under Linux (Motif 2.0.1).
# Your mileage may vary.
LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/Motif/XmHTML.c XmHTML-1.1.7/lib/Motif/XmHTML.c
--- XmHTML-1.1.7.orig/lib/Motif/XmHTML.c 1999-01-11 19:42:36.000000000 -0500
+++ XmHTML-1.1.7/lib/Motif/XmHTML.c 2011-09-07 07:14:23.000000000 -0400
@@ -112,6 +112,7 @@
#include
#include
#include
+#include
#include
#include /* Fast macros */
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/Motif/forms.c XmHTML-1.1.7/lib/Motif/forms.c
--- XmHTML-1.1.7.orig/lib/Motif/forms.c 1998-10-13 18:14:56.000000000 -0400
+++ XmHTML-1.1.7/lib/Motif/forms.c 2011-09-07 07:21:21.000000000 -0400
@@ -73,6 +73,7 @@
#include
#include
#include
+#include
/* motif includes */
#include
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/Motif/frames.c XmHTML-1.1.7/lib/Motif/frames.c
--- XmHTML-1.1.7.orig/lib/Motif/frames.c 1998-11-16 17:04:12.000000000 -0500
+++ XmHTML-1.1.7/lib/Motif/frames.c 2011-09-07 07:15:56.000000000 -0400
@@ -77,6 +77,7 @@
#include
#include
#include
+#include
#include "toolkit.h"
#include XmHTMLPrivateHeader
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/LZWStream.c XmHTML-1.1.7/lib/common/LZWStream.c
--- XmHTML-1.1.7.orig/lib/common/LZWStream.c 1998-11-16 11:38:26.000000000 -0500
+++ XmHTML-1.1.7/lib/common/LZWStream.c 2011-09-07 07:38:24.000000000 -0400
@@ -725,10 +725,12 @@
#ifdef DEBUG
char *chPtr = getenv("LZW_DEBUG");
- if(chPtr == '1')
+ if(chPtr) {
+ if(*chPtr == '1')
lzw_debug = 1;
- else if(chPtr == '2')
+ else if(*chPtr == '2')
lzw_debug = 2;
+ }
#endif
/* no error */
lzw->err_msg = NULL;
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/StringUtil.c XmHTML-1.1.7/lib/common/StringUtil.c
--- XmHTML-1.1.7.orig/lib/common/StringUtil.c 1998-12-10 18:21:46.000000000 -0500
+++ XmHTML-1.1.7/lib/common/StringUtil.c 2011-09-07 07:18:00.000000000 -0400
@@ -84,6 +84,7 @@
#include
#include
#include
+#include
#include /* toupper, tolower, isspace */
#include
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/callbacks.c XmHTML-1.1.7/lib/common/callbacks.c
--- XmHTML-1.1.7.orig/lib/common/callbacks.c 1998-12-13 06:59:41.000000000 -0500
+++ XmHTML-1.1.7/lib/common/callbacks.c 2011-09-07 07:17:50.000000000 -0400
@@ -90,6 +90,7 @@
#include
#include
#include
+#include
#include
/* Local includes */
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/colors.c XmHTML-1.1.7/lib/common/colors.c
--- XmHTML-1.1.7.orig/lib/common/colors.c 1998-11-16 12:22:29.000000000 -0500
+++ XmHTML-1.1.7/lib/common/colors.c 2011-09-07 07:17:01.000000000 -0400
@@ -90,6 +90,7 @@
#include
#include
#include
+#include
#include
#include "toolkit.h"
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/debug.c XmHTML-1.1.7/lib/common/debug.c
--- XmHTML-1.1.7.orig/lib/common/debug.c 1998-10-06 15:58:00.000000000 -0400
+++ XmHTML-1.1.7/lib/common/debug.c 2011-09-07 06:49:40.000000000 -0400
@@ -110,7 +110,7 @@
/*** Private Function Prototype Declarations ****/
/*** Private Variable Declarations ***/
-static FILE *__rsd_debug_file = stdout;
+static FILE *__rsd_debug_file; /**= stdout;**/
/*****
* When debug output is send to a file, we register an exit func to close
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/format.c XmHTML-1.1.7/lib/common/format.c
--- XmHTML-1.1.7.orig/lib/common/format.c 1999-01-19 22:49:38.000000000 -0500
+++ XmHTML-1.1.7/lib/common/format.c 2011-09-07 07:15:34.000000000 -0400
@@ -116,6 +116,7 @@
#include
#include
#include
+#include
#include /* isspace, tolower */
/* Local includes */
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/map.c XmHTML-1.1.7/lib/common/map.c
--- XmHTML-1.1.7.orig/lib/common/map.c 1998-10-13 18:10:57.000000000 -0400
+++ XmHTML-1.1.7/lib/common/map.c 2011-09-07 07:18:12.000000000 -0400
@@ -78,6 +78,7 @@
#include
#include
#include
+#include
#include
#include "toolkit.h"
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/parse.c XmHTML-1.1.7/lib/common/parse.c
--- XmHTML-1.1.7.orig/lib/common/parse.c 1999-01-20 00:13:08.000000000 -0500
+++ XmHTML-1.1.7/lib/common/parse.c 2011-09-07 07:18:22.000000000 -0400
@@ -120,6 +120,7 @@
#include
#include
#include
+#include
#include
/*****
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/public.c XmHTML-1.1.7/lib/common/public.c
--- XmHTML-1.1.7.orig/lib/common/public.c 1999-01-19 11:53:52.000000000 -0500
+++ XmHTML-1.1.7/lib/common/public.c 2011-09-07 07:17:34.000000000 -0400
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
#include /* Fast macros */