From 0a852e2639a9f796cc7e26ef301bc7829bc685cc Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <jeremy@azazel.net>
Date: Fri, 7 Jun 2019 09:52:21 +0100
Subject: [PATCH] wmail: check for libdockapp/dockapp.h and fall back to
 dockapp.h.

---
 wmail/configure.in | 4 ++--
 wmail/src/wmail.c  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wmail/configure.in b/wmail/configure.in
index 0a6c2d2..99b2f1f 100644
--- a/wmail/configure.in
+++ b/wmail/configure.in
@@ -13,10 +13,10 @@ PKG_CHECK_MODULES([dockapp], [dockapp])
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h strings.h sys/time.h)
+AC_CHECK_HEADERS([limits.h strings.h sys/time.h])
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $dockapp_CFLAGS $X11_CFLAGS"
-AC_CHECK_HEADER(dockapp.h)
+AC_CHECK_HEADERS([libdockapp/dockapp.h dockapp.h])
 CPPFLAGS="$CPPFLAGS_old"
 
 dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/wmail/src/wmail.c b/wmail/src/wmail.c
index e187cd8..d015b2d 100644
--- a/wmail/src/wmail.c
+++ b/wmail/src/wmail.c
@@ -56,7 +56,11 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <X11/Xlib.h>
+#ifdef HAVE_LIBDOCKAPP_DOCKAPP_H
 #include <libdockapp/dockapp.h>
+#else
+#include <dockapp.h>
+#endif
 
 #include "common.h"
 #include "config.h"