From d7543b20a19cf36433500ccfc7b74e4354362a06 Mon Sep 17 00:00:00 2001
From: Bill Spitzak <spitzak@gmail.com>
Date: Mon, 24 Nov 2014 16:28:55 -0800
Subject: [PATCH] Remove some warnings from configure+make on modern systems

---
 Makefile       | 9 ++++++---
 configure.in   | 1 -
 makeinclude.in | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 13989dc..253b2fd 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,19 @@ all:	makeinclude $(PROGRAM)
 $(PROGRAM) : $(OBJECTS)
 	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS)
 
-makeinclude: configure
+configure: configure.in
+	autoconf
+
+makeinclude: configure makeinclude.in
 	./configure
 include makeinclude
 
 .SUFFIXES : .fl .do .C .c .H
 
 .C.o :
-	$(CXX) $(CXXFLAGS) -c $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
 .C :
-	$(CXX) $(CXXFLAGS) -c $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
 .fl.C :
 	-fluid -c $<
 .fl.H :
diff --git a/configure.in b/configure.in
index 8546fef..72c2135 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,6 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 
 AC_PATH_XTRA
-echo "Ignoring libraries \"$X_PRE_LIBS\" requested by configure."
 dnl# LIBS="$LIBS$X_LIBS$X_PRE_LIBS"
 LIBS="$LIBS$X_LIBS"
 
diff --git a/makeinclude.in b/makeinclude.in
index a0101a2..76d7d3e 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -8,6 +8,7 @@ includedir	=@includedir@
 libdir		=@libdir@
 srcdir		=@srcdir@
 VPATH		=@srcdir@
+datarootdir     =@datarootdir@
 
 # compiler names:
 CXX	=@CXX@