From d5312c313321f51a4c52f1b7fb0a0f0079a366bf Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <jeremy@azazel.net>
Date: Fri, 7 Jun 2019 09:52:06 +0100
Subject: [PATCH] wmail: use AC_CONFIG_HEADERS to generate config.h.

---
 wmail/.gitignore      | 3 +++
 wmail/configure.in    | 1 +
 wmail/src/Makefile.in | 8 ++++----
 wmail/src/common.c    | 9 ++++++++-
 wmail/src/config.c    | 8 ++++++++
 wmail/src/wmail.c     | 8 ++++++++
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/wmail/.gitignore b/wmail/.gitignore
index 8752f9a..b1f5986 100644
--- a/wmail/.gitignore
+++ b/wmail/.gitignore
@@ -1,5 +1,8 @@
 Makefile
 autom4te.cache/
+config.h
+config.h.in
+config.h.in~
 config.log
 config.status
 configure
diff --git a/wmail/configure.in b/wmail/configure.in
index 71ecc5f..84d2ded 100644
--- a/wmail/configure.in
+++ b/wmail/configure.in
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/wmail.c)
+AC_CONFIG_HEADERS(config.h)
 
 dnl Checks for programs.
 AC_PROG_CC
diff --git a/wmail/src/Makefile.in b/wmail/src/Makefile.in
index 426afa8..cb7b675 100644
--- a/wmail/src/Makefile.in
+++ b/wmail/src/Makefile.in
@@ -6,20 +6,20 @@
 LIBS     = @LIBS@ @XLFLAGS@ @XLIBS@
 CC       = @CC@
 CFLAGS   = @CFLAGS@ @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @DEFS@ @CPPFLAGS@
 
 default all target: wmail
 
 wmail: wmail.o common.o config.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
 
-wmail.o: wmail.c common.h config.h xpm/main.xpm xpm/symbols.xpm xpm/numbers.xpm xpm/button.xpm xpm/chars.xpm
+wmail.o: wmail.c common.h config.h ../config.h xpm/main.xpm xpm/symbols.xpm xpm/numbers.xpm xpm/button.xpm xpm/chars.xpm
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
-common.o: common.c common.h
+common.o: common.c common.h ../config.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
-config.o: config.c config.h common.h
+config.o: config.c config.h common.h ../config.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 clean:
diff --git a/wmail/src/common.c b/wmail/src/common.c
index 64100d1..f479389 100644
--- a/wmail/src/common.c
+++ b/wmail/src/common.c
@@ -28,12 +28,19 @@
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+#ifdef HAVE_CONFIG_H
+#ifndef CONFIG_H_INCLUDED
+#include "../config.h"
+#define CONFIG_H_INCLUDED
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "common.h"
 
+#include "common.h"
 
 #if defined(DEBUG) || defined(DEBUG2) || defined(_DEBUG)
 void TRACE( const char *fmt, ... )
diff --git a/wmail/src/config.c b/wmail/src/config.c
index 840b895..7671f15 100644
--- a/wmail/src/config.c
+++ b/wmail/src/config.c
@@ -28,10 +28,18 @@
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+#ifdef HAVE_CONFIG_H
+#ifndef CONFIG_H_INCLUDED
+#include "../config.h"
+#define CONFIG_H_INCLUDED
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+
 #include "common.h"
 #include "config.h"
 
diff --git a/wmail/src/wmail.c b/wmail/src/wmail.c
index b6ec51e..3c3fca4 100644
--- a/wmail/src/wmail.c
+++ b/wmail/src/wmail.c
@@ -34,6 +34,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 // includes
 
+#ifdef HAVE_CONFIG_H
+#ifndef CONFIG_H_INCLUDED
+#include "../config.h"
+#define CONFIG_H_INCLUDED
+#endif
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,6 +54,7 @@
 #include <dirent.h>
 #include <X11/Xlib.h>
 #include <libdockapp/dockapp.h>
+
 #include "common.h"
 #include "config.h"