From 09f3715543c655375e4b0b9cfab00b42b6a4ff0d Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Fri, 22 Aug 2014 09:03:05 -0400
Subject: [PATCH] Backport: * configure.ac (HAVE_XPM): Explain the use of
 CPPFLAGS in the Cygwin-w32 build.  (Bug#18302)

---
 ChangeLog    | 5 +++++
 configure.ac | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6864b7043e1..e0090a45ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-22  Ken Brown  <kbrown@cornell.edu>
+
+	* configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the
+	Cygwin-w32 build.  (Bug#18302)
+
 2014-08-10  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Don't prevent random file systems from being unmounted (Bug#18232).
diff --git a/configure.ac b/configure.ac
index 048728a0c61..d4e1d65ff56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2969,6 +2969,9 @@ AC_SUBST(M17N_FLT_LIBS)
 
 ### Use -lXpm if available, unless `--with-xpm=no'.
 ### mingw32 doesn't use -lXpm, since it loads the library dynamically.
+### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h
+### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and
+### LDFLAGS) accordingly.
 HAVE_XPM=no
 LIBXPM=
 if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then
-- 
2.39.5