[Emacs-diffs] emacs-24 r117454: Backport: * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the Cygwin-w32 build. (Bug#18302)

[Ken Brown]

------------------------------------------------------------
revno: 117454
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-08-22 09:03:05 -0400
message:
  Backport: * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the 
Cygwin-w32 build.  (Bug#18302)
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-08-10 20:40:57 +0000
+++ b/ChangeLog 2014-08-22 13:03:05 +0000
@@ -1,3 +1,8 @@
+2014-08-22  Ken Brown  <address@hidden>
+
+       * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the
+       Cygwin-w32 build.  (Bug#18302)
+
 2014-08-10  Paul Eggert  <address@hidden>
 
        Don't prevent random file systems from being unmounted (Bug#18232).

=== modified file 'configure.ac'
--- a/configure.ac      2014-08-14 19:56:31 +0000
+++ b/configure.ac      2014-08-22 13:03:05 +0000
@@ -2969,6 +2969,9 @@
 
 ### 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