Backport: * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the Cygwin-w32...

diff --git a/ChangeLog b/ChangeLog
index 6864b7043e1dae2ee08c086c8c1473fdc6fb10ea..e0090a45cedf44c838b3250e51c81f0187409761 100644 (file)
--- 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 048728a0c614fe7c56dd0102b0e431c7dafd7217..d4e1d65ff56dfce2b360f9e7cc50c0782f28845e 100644 (file)
--- 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