From 46cd3297aef688b2a452fac694fbe174b4eb8e0f Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <jeremy@azazel.net>
Date: Fri, 7 Jun 2019 09:52:20 +0100
Subject: [PATCH] wmail: use pkg-config for X11 and dockapp.

---
 wmail/configure.in    | 32 ++++++--------------------------
 wmail/src/Makefile.in |  4 ++--
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/wmail/configure.in b/wmail/configure.in
index 870545e..0a6c2d2 100644
--- a/wmail/configure.in
+++ b/wmail/configure.in
@@ -6,37 +6,19 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
 
+dnl Checks for pkg-config modules.
+PKG_CHECK_MODULES([X11], [x11])
+PKG_CHECK_MODULES([dockapp], [dockapp])
+
 dnl Checks for header files.
-#AC_PATH_X
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(limits.h strings.h sys/time.h)
-
-dnl Checks for X installation root directory.
-AC_PATH_XTRA
-X_LIBRARY_PATH="$x_libraries"
-XLIBS="-lX11 $X_EXTRA_LIBS"
-XCFLAGS="$X_CFLAGS"
-XLFLAGS="$X_LIBS"
-
-if test -n "$includedir"; then
-	XCFLAGS="$XCFLAGS -I$includedir"
-fi
-
-if test -n "$libdir"; then
-	XLIBS="$XLIBS -L$libdir"
-fi
-
 CPPFLAGS_old="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XCFLAGS"
-AC_CHECK_HEADER(dockapp.h,,)
+CPPFLAGS="$CPPFLAGS $dockapp_CFLAGS $X11_CFLAGS"
+AC_CHECK_HEADER(dockapp.h)
 CPPFLAGS="$CPPFLAGS_old"
 
-AC_SUBST(XCFLAGS)
-AC_SUBST(XLFLAGS)
-AC_SUBST(XLIBS)
-AC_SUBST(X_LIBRARY_PATH)
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
@@ -48,8 +30,6 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(strdup strstr memcpy)
 
 dnl Checks for libraries.
-AC_CHECK_LIB(X11, XCreateGC,,,$XLFLAGS $XLIBS)
-AC_CHECK_LIB(dockapp, DAInitialize,,,$XLFLAGS $XLIBS)
 
 dnl Enable Debugging?
 AC_ARG_ENABLE(debug,
diff --git a/wmail/src/Makefile.in b/wmail/src/Makefile.in
index cb7b675..8c5e739 100644
--- a/wmail/src/Makefile.in
+++ b/wmail/src/Makefile.in
@@ -3,9 +3,9 @@
 # Makefile for wmail.
 # Makes the wmail dockapp binary and cleans the directory, respectively.
 
-LIBS     = @LIBS@ @XLFLAGS@ @XLIBS@
+LIBS     = @LIBS@ @dockapp_LIBS@ @X11_LIBS@
 CC       = @CC@
-CFLAGS   = @CFLAGS@ @XCFLAGS@
+CFLAGS   = @CFLAGS@ @dockapp_CFLAGS@ @X11_CFLAGS@
 CPPFLAGS = @DEFS@ @CPPFLAGS@
 
 default all target: wmail