From a05b1160c358fd822966d9f2e057a8aeec894e40 Mon Sep 17 00:00:00 2001
From: Kevin Easton <keaston@users.sourceforge.net>
Date: Sat, 1 Nov 2014 14:37:41 +0000
Subject: [PATCH] Change build to pass through CPPFLAGS if provided, and to use
 the DEFS value set by configure.

The DEFS Makefile variable has been renamed to CPPFLAGS, and is now set based on the CPPFLAGS,
INCLUDES and DEFS values provided by configure.

Reported by cpet, this allows the FreeBSD port to drop a patch.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@519 13b04d17-f746-0410-82c6-800466cd88b0
---
 Changelog                 |  2 ++
 Makefile.in               |  2 +-
 bx-conf/Makefile.in       |  4 ++--
 dll/Makefile.in           |  6 +++---
 dll/abot/Makefile.in      |  4 ++--
 dll/acro/Makefile.in      |  4 ++--
 dll/aim/Makefile.in       |  4 ++--
 dll/aim/toc/Makefile.in   |  4 ++--
 dll/amp/Makefile.in       |  8 ++++----
 dll/arcfour/Makefile.in   |  6 +++---
 dll/autocycle/Makefile.in |  4 ++--
 dll/blowfish/Makefile.in  |  4 ++--
 dll/cavlink/Makefile.in   |  4 ++--
 dll/cdrom/Makefile.in     |  4 ++--
 dll/encrypt/Makefile.in   |  4 ++--
 dll/europa/Makefile.in    |  4 ++--
 dll/fserv/Makefile.in     |  4 ++--
 dll/hint/Makefile.in      |  4 ++--
 dll/identd/Makefile.in    |  4 ++--
 dll/nap/Makefile.in       | 16 ++++++++--------
 dll/nicklist/Makefile.in  |  4 ++--
 dll/pkga/Makefile.in      |  4 ++--
 dll/possum/Makefile.in    |  8 ++++----
 dll/qbx/Makefile.in       |  4 ++--
 dll/qmail/Makefile.in     |  4 ++--
 dll/wavplay/Makefile.in   |  4 ++--
 dll/xmms/Makefile.in      |  4 ++--
 source/Makefile.in        | 30 +++++++++++++++---------------
 28 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/Changelog b/Changelog
index f4a407d..52bac90 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2c01]
 
+* Pass through externally-provided CPPFLAGS (reported by cpet). (caf)
+
 * Don't set the mode on new channels until synched - this speeds up joining
   lots of channels at connect time if one of them is new, and reduces the
   chance of being flooded off the server. (caf)
diff --git a/Makefile.in b/Makefile.in
index c6b9e53..a9469b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
diff --git a/bx-conf/Makefile.in b/bx-conf/Makefile.in
index a139705..5cec412 100644
--- a/bx-conf/Makefile.in
+++ b/bx-conf/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -159,7 +159,7 @@ PROGRAM = $(topdir)/bxconfigure
 OBJS = ds_cell.o file_cpy.o
 
 .c.o:
-	$(CC) $(DEFS) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 all: $(PROGRAM)
 
diff --git a/dll/Makefile.in b/dll/Makefile.in
index d5e53bd..8a19881 100644
--- a/dll/Makefile.in
+++ b/dll/Makefile.in
@@ -36,7 +36,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -161,7 +161,7 @@ ALL_PLUGINS = abot acro aim amp arcfour autocycle blowfish cavlink cdrom encrypt
 PLUGINS = @PLUGINS@
 
 .c.o:
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $<
 
 $(SHLIB_SUFFIX).o:
 	$(SHLIB_LD) $(SHLIB_CFLAGS) $< -o $@$(SHLIB_SUFFIX)
@@ -186,7 +186,7 @@ dummy:
 dllinit.o:
 	@( \
 		if test x"$(PLUGINS)" != x""; then \
-			$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/dllinit.c; \
+			$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/dllinit.c; \
 		fi; \
 	)
 
diff --git a/dll/abot/Makefile.in b/dll/abot/Makefile.in
index 81730a0..2e06e4b 100644
--- a/dll/abot/Makefile.in
+++ b/dll/abot/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 autobot.o: $(srcdir)/autobot.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/autobot.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/autobot.c
 
 autobot$(SHLIB_SUFFIX): autobot.o ../dllinit.o
 	$(SHLIB_LD) autobot.o ../dllinit.o $(SHLIB_CFLAGS) -o autobot$(SHLIB_SUFFIX)
diff --git a/dll/acro/Makefile.in b/dll/acro/Makefile.in
index d37a77d..f8af270 100644
--- a/dll/acro/Makefile.in
+++ b/dll/acro/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 acro.o: $(srcdir)/acro.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/acro.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/acro.c
 
 acro$(SHLIB_SUFFIX): acro.o ../dllinit.o
 	$(SHLIB_LD) acro.o ../dllinit.o $(SHLIB_CFLAGS) -o acro$(SHLIB_SUFFIX)
diff --git a/dll/aim/Makefile.in b/dll/aim/Makefile.in
index cd5d91e..8663fd6 100644
--- a/dll/aim/Makefile.in
+++ b/dll/aim/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -151,7 +151,7 @@ MFLAGS = \
 
 ## Makefile starts here.
 
-AIMDEFS = $(DEFS) -I$(srcdir)/toc
+AIMDEFS = $(CPPFLAGS) -I$(srcdir)/toc
 
 PLUGIN_NAME = aim
 
diff --git a/dll/aim/toc/Makefile.in b/dll/aim/toc/Makefile.in
index a8c19c0..14cba95 100644
--- a/dll/aim/toc/Makefile.in
+++ b/dll/aim/toc/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -154,7 +154,7 @@ MFLAGS = \
 #DEBUG_CFLAGS = -g -DDEBUG_LIB_TOC
 
 .c.o:
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS)  -c $<
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS)  -c $<
 
 LOBJS = toc.o network.o util.o server.o interface.o buddy.o ll.o misc.o
 
diff --git a/dll/amp/Makefile.in b/dll/amp/Makefile.in
index 3f29e65..897605a 100644
--- a/dll/amp/Makefile.in
+++ b/dll/amp/Makefile.in
@@ -35,7 +35,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -172,7 +172,7 @@ distclean: clean
 	$(RM) *~ config.status config.cache config.log config.h Makefile
 
 ../dllinit.o:
-	$(CC) -DOS_$(OS) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -o ../dllinit.o -c ../dllinit.c
+	$(CC) -DOS_$(OS) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -o ../dllinit.o -c ../dllinit.c
 
 amp$(SHLIB_SUFFIX): $(OBJ) ../dllinit.o
 	$(SHLIB_LD) -o amp$(SHLIB_SUFFIX) $(OBJ) ../dllinit.o
@@ -182,10 +182,10 @@ SOURCES = $(OBJECTS:%.o=$(srcdir)/%.c)
 OS := $(shell uname -s) 
 
 .c.o:
-	$(CC) -DOS_$(OS) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $<
+	$(CC) -DOS_$(OS) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $<
 
 depend:
-	gcc -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c > .depend
+	gcc -MM $(CPPFLAGS) $(CPPFLAGS) $(CFLAGS) *.c > .depend
 
 install:
 	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
diff --git a/dll/arcfour/Makefile.in b/dll/arcfour/Makefile.in
index 0aa477f..6a4fffc 100644
--- a/dll/arcfour/Makefile.in
+++ b/dll/arcfour/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,10 +160,10 @@ Makefile: Makefile.in
 	  && ./config.status
 
 arcfour.o: $(srcdir)/arcfour.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/arcfour.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/arcfour.c
 
 md5.o: $(srcdir)/md5.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/md5.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/md5.c
 
 arcfour$(SHLIB_SUFFIX): arcfour.o md5.o ../dllinit.o
 	$(SHLIB_LD) arcfour.o md5.o ../dllinit.o $(SHLIB_CFLAGS) -o arcfour$(SHLIB_SUFFIX)
diff --git a/dll/autocycle/Makefile.in b/dll/autocycle/Makefile.in
index 68e1aa7..7fe75f6 100644
--- a/dll/autocycle/Makefile.in
+++ b/dll/autocycle/Makefile.in
@@ -35,7 +35,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -163,7 +163,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 autocycle.o: $(srcdir)/autocycle.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/autocycle.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/autocycle.c
 
 autocycle$(SHLIB_SUFFIX): autocycle.o ../dllinit.o
 	$(SHLIB_LD) autocycle.o ../dllinit.o $(SHLIB_CFLAGS) -o autocycle$(SHLIB_SUFFIX)
diff --git a/dll/blowfish/Makefile.in b/dll/blowfish/Makefile.in
index e9fcbce..e4c2a0c 100644
--- a/dll/blowfish/Makefile.in
+++ b/dll/blowfish/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 blowfish.o: $(srcdir)/blowfish.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/blowfish.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/blowfish.c
 
 blowfish$(SHLIB_SUFFIX): blowfish.o ../dllinit.o
 	$(SHLIB_LD) blowfish.o ../dllinit.o $(SHLIB_CFLAGS) -o blowfish$(SHLIB_SUFFIX) $(TCL_LIBS)
diff --git a/dll/cavlink/Makefile.in b/dll/cavlink/Makefile.in
index 85f9aee..752cc37 100644
--- a/dll/cavlink/Makefile.in
+++ b/dll/cavlink/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 cavlink.o: $(srcdir)/cavlink.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cavlink.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cavlink.c
 
 cavlink$(SHLIB_SUFFIX): cavlink.o ../dllinit.o
 	$(SHLIB_LD) cavlink.o ../dllinit.o ${SHLIB_CFLAGS} -o cavlink$(SHLIB_SUFFIX)
diff --git a/dll/cdrom/Makefile.in b/dll/cdrom/Makefile.in
index b06c95f..78ed6d5 100644
--- a/dll/cdrom/Makefile.in
+++ b/dll/cdrom/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 cdrom.o: $(srcdir)/cdrom.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cdrom.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cdrom.c
 
 cdrom$(SHLIB_SUFFIX): cdrom.o ../dllinit.o
 	$(SHLIB_LD) cdrom.o ../dllinit.o ${SHLIB_CFLAGS} -o cdrom$(SHLIB_SUFFIX)
diff --git a/dll/encrypt/Makefile.in b/dll/encrypt/Makefile.in
index f4b99fc..8b18aaf 100644
--- a/dll/encrypt/Makefile.in
+++ b/dll/encrypt/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 encrypt.o: $(srcdir)/encrypt.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/encrypt.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/encrypt.c
 
 encrypt$(SHLIB_SUFFIX): encrypt.o ../dllinit.o
 	$(SHLIB_LD) encrypt.o ../dllinit.o ${SHLIB_CFLAGS} -o encrypt$(SHLIB_SUFFIX)
diff --git a/dll/europa/Makefile.in b/dll/europa/Makefile.in
index 9104b74..4d1b82e 100644
--- a/dll/europa/Makefile.in
+++ b/dll/europa/Makefile.in
@@ -35,7 +35,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 europa.o: $(srcdir)/europa.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/europa.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/europa.c
 
 europa$(SHLIB_SUFFIX): europa.o ../dllinit.o
 	$(SHLIB_LD) europa.o ../dllinit.o $(SHLIB_CFLAGS) -o europa$(SHLIB_SUFFIX) $(MYSQL_LIBS)
diff --git a/dll/fserv/Makefile.in b/dll/fserv/Makefile.in
index 39068a5..65ede25 100644
--- a/dll/fserv/Makefile.in
+++ b/dll/fserv/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 fserv.o: $(srcdir)/fserv.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/fserv.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/fserv.c
 
 fserv$(SHLIB_SUFFIX): fserv.o ../dllinit.o
 	$(SHLIB_LD) fserv.o ../dllinit.o $(SHLIB_CFLAGS) -o fserv$(SHLIB_SUFFIX)
diff --git a/dll/hint/Makefile.in b/dll/hint/Makefile.in
index 00d7059..c6387fa 100644
--- a/dll/hint/Makefile.in
+++ b/dll/hint/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 hint.o: $(srcdir)/hint.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/hint.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/hint.c
 
 hint$(SHLIB_SUFFIX): hint.o ../dllinit.o
 	$(SHLIB_LD) hint.o ../dllinit.o $(SHLIB_CFLAGS) -o hint$(SHLIB_SUFFIX)
diff --git a/dll/identd/Makefile.in b/dll/identd/Makefile.in
index 5d5df23..c7af344 100644
--- a/dll/identd/Makefile.in
+++ b/dll/identd/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 identd.o: $(srcdir)/identd.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/identd.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/identd.c
 
 identd$(SHLIB_SUFFIX): identd.o ../dllinit.o
 	$(SHLIB_LD) identd.o ../dllinit.o $(SHLIB_CFLAGS) -o identd$(SHLIB_SUFFIX)
diff --git a/dll/nap/Makefile.in b/dll/nap/Makefile.in
index abecbf9..64506d8 100644
--- a/dll/nap/Makefile.in
+++ b/dll/nap/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -162,26 +162,26 @@ Makefile: Makefile.in
 	  && ./config.status
 
 compat.o: $(top_srcdir)/source/compat.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) \
 		-c $(top_srcdir)/source/compat.c
 
 nap.o: $(srcdir)/nap.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap.c
 
 napsend.o: $(srcdir)/napsend.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napsend.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napsend.c
 
 nap_file.o: $(srcdir)/nap_file.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap_file.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap_file.c
 
 napfunc.o: $(srcdir)/napfunc.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napfunc.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napfunc.c
 
 napother.o: $(srcdir)/napother.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napother.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napother.c
 
 md5.o: $(srcdir)/md5.c $(srcdir)/md5.h
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/md5.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/md5.c
 
 nap$(SHLIB_SUFFIX): $(OBJS) 
 	$(SHLIB_LD) $(OBJS) $(SHLIB_CFLAGS) -o nap$(SHLIB_SUFFIX)
diff --git a/dll/nicklist/Makefile.in b/dll/nicklist/Makefile.in
index ed1aa85..4c65391 100644
--- a/dll/nicklist/Makefile.in
+++ b/dll/nicklist/Makefile.in
@@ -35,7 +35,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -163,7 +163,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 nicklist.o: $(srcdir)/nicklist.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nicklist.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nicklist.c
 
 nicklist$(SHLIB_SUFFIX): nicklist.o ../dllinit.o
 	$(SHLIB_LD) nicklist.o ../dllinit.o $(SHLIB_CFLAGS) -o nicklist$(SHLIB_SUFFIX)
diff --git a/dll/pkga/Makefile.in b/dll/pkga/Makefile.in
index be7e0bf..c636c25 100644
--- a/dll/pkga/Makefile.in
+++ b/dll/pkga/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 pkga.o: $(srcdir)/pkga.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/pkga.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/pkga.c
 
 pkga$(SHLIB_SUFFIX): pkga.o ../dllinit.o
 	$(SHLIB_LD) pkga.o ../dllinit.o $(SHLIB_CFLAGS) -o pkga$(SHLIB_SUFFIX)
diff --git a/dll/possum/Makefile.in b/dll/possum/Makefile.in
index ac97b3e..79dfcaf 100644
--- a/dll/possum/Makefile.in
+++ b/dll/possum/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,13 +160,13 @@ Makefile: Makefile.in
 	  && ./config.status
 
 possum.o: $(srcdir)/possum.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/possum.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/possum.c
 
 head.o: $(srcdir)/head.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/head.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/head.c
 
 llist.o: $(srcdir)/llist.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/llist.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/llist.c
 
 possum$(SHLIB_SUFFIX): possum.o head.o llist.o ../dllinit.o
 	$(SHLIB_LD) possum.o llist.o head.o ../dllinit.o $(SHLIB_CFLAGS) -o possum$(SHLIB_SUFFIX)
diff --git a/dll/qbx/Makefile.in b/dll/qbx/Makefile.in
index b1376ea..97155d1 100644
--- a/dll/qbx/Makefile.in
+++ b/dll/qbx/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -159,7 +159,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 qbx.o: $(srcdir)/qbx.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/qbx.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/qbx.c
 
 qbx$(SHLIB_SUFFIX): qbx.o ../dllinit.o
 	$(SHLIB_LD) qbx.o ../dllinit.o $(SHLIB_CFLAGS) -o qbx$(SHLIB_SUFFIX)
diff --git a/dll/qmail/Makefile.in b/dll/qmail/Makefile.in
index 5390c20..7f97d62 100644
--- a/dll/qmail/Makefile.in
+++ b/dll/qmail/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 qmail.o: $(srcdir)/qmail.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/qmail.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/qmail.c
 
 qmail$(SHLIB_SUFFIX): qmail.o ../dllinit.o
 	$(SHLIB_LD) qmail.o ../dllinit.o $(SHLIB_CFLAGS) -o qmail$(SHLIB_SUFFIX)
diff --git a/dll/wavplay/Makefile.in b/dll/wavplay/Makefile.in
index bd303bd..d93a1aa 100644
--- a/dll/wavplay/Makefile.in
+++ b/dll/wavplay/Makefile.in
@@ -32,7 +32,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -160,7 +160,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 wavplay.o: $(srcdir)/wavplay.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/wavplay.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/wavplay.c
 
 wavplay$(SHLIB_SUFFIX): wavplay.o ../dllinit.o
 	$(SHLIB_LD) wavplay.o ../dllinit.o $(SHLIB_CFLAGS) -o wavplay$(SHLIB_SUFFIX)
diff --git a/dll/xmms/Makefile.in b/dll/xmms/Makefile.in
index 888fa28..19953cf 100644
--- a/dll/xmms/Makefile.in
+++ b/dll/xmms/Makefile.in
@@ -34,7 +34,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -162,7 +162,7 @@ Makefile: Makefile.in
 	  && ./config.status
 
 xmms.o: $(srcdir)/xmms.c
-	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) `xmms-config --cflags` -c $(srcdir)/xmms.c
+	$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) `xmms-config --cflags` -c $(srcdir)/xmms.c
 
 xmms$(SHLIB_SUFFIX): xmms.o ../dllinit.o
 	$(SHLIB_LD) xmms.o ../dllinit.o $(SHLIB_CFLAGS) -o xmms$(SHLIB_SUFFIX) `xmms-config --libs`
diff --git a/source/Makefile.in b/source/Makefile.in
index b1b6b78..d2ca96f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -37,7 +37,7 @@ INSTALL_IRC = @INSTALL_IRC@
 IRCLIB = @IRCLIB@
 
 CC = @CC@
-DEFS = @INCLUDES@
+CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
 LIBS = @LIBS@
 
 # Tcl library.
@@ -177,7 +177,7 @@ Makefile: $(srcdir)/Makefile.in
 	cd $(topdir) \
 	  && $(SHELL) ./config.status
 .c.o:
-	$(CC) $(DEFS) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(_VERSION_): $(OBJECTS) $(TCL_OBJS)
 	$(CC) $(LDFLAGS) -o $(_VERSION_)$(EXEEXT) $(OBJECTS) $(TCL_OBJS) $(LIBS)
@@ -198,48 +198,48 @@ distclean: clean
 # .o files needing special compilation flags
 
 irc.o: Makefile ../Makefile
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 	-DIRCLIB=\"$(IRCLIB)\" -DIRCPATH=\"$(IRCPATH)\" -c $(srcdir)/irc.c
 
 ircaux.o: Makefile ../Makefile
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 	-DIRCLIB=\"$(IRCLIB)\" -DSHLIB_SUFFIX=\"$(SHLIB_SUFFIX)\" -c $(srcdir)/ircaux.c
 
 modules.o: Makefile ../Makefile
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 	-DPLUGINDIR=\"$(IRCLIB)/plugins\" -DSHLIB_SUFFIX=\"$(SHLIB_SUFFIX)\" -c $(srcdir)/modules.c
 
 notice.o: Makefile ../Makefile
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 	-DSCRIPT_PATH=\"$(INSTALL_SCRIPT)\" -c $(srcdir)/notice.c
 
 screen.o: Makefile ../Makefile
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 	-DWSERV_PATH=\"$(INSTALL_WSERV)\" -c $(srcdir)/screen.c
 
 term.o: @GUI_SRCS@
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/term.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/term.c
 
 translat.o: Makefile ../Makefile
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 	-DTRANSLATION_PATH=\"$(TRANSLATION_PATH)\" -c $(srcdir)/translat.c
 
 $(topdir)/source/compat.o: $(top_srcdir)/source/compat.c
-	$(CC) $(DEFS) $(CFLAGS) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) \
 		-c $(top_srcdir)/source/compat.c
 
 # wserv
 bircsig.o: $(srcdir)/ircsig.c
-	$(CC) $(DEFS) $(CFLAGS) -DWTERM_C -c $(srcdir)/ircsig.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DWTERM_C -c $(srcdir)/ircsig.c -o $@
 
 bcompat.o: $(srcdir)/compat.c
-	$(CC) $(DEFS) $(CFLAGS) -DWTERM_C -c $(srcdir)/compat.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DWTERM_C -c $(srcdir)/compat.c -o $@
 
 wterm.o: $(srcdir)/term.c
-	$(CC) $(DEFS) $(CFLAGS) -DWTERM_C -c $(srcdir)/term.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DWTERM_C -c $(srcdir)/term.c -o $@
 
 wnetwork.o: $(srcdir)/network.c
-	$(CC) $(DEFS) $(CFLAGS) -DWTERM_C -c $(srcdir)/network.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DWTERM_C -c $(srcdir)/network.c -o $@
 
 wserv: wserv.o wterm.o wnetwork.o bircsig.o bcompat.o
 	$(CC) $(LDFLAGS) -o wserv$(EXEEXT) wserv.o wterm.o bircsig.o wnetwork.o bcompat.o $(LIBS)
@@ -249,7 +249,7 @@ clean::
 
 # scr-bx
 sterm.o: $(srcdir)/term.c
-	$(CC) $(DEFS) $(CFLAGS) -DSTERM_C -c $(srcdir)/term.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DSTERM_C -c $(srcdir)/term.c -o $@
 
 scr-bx: sterm.o bircsig.o bcompat.o scr-bx.o
 	$(CC) $(LDFLAGS) -o scr-bx$(EXEEXT) scr-bx.o sterm.o bircsig.o bcompat.o $(LIBS)