From a2bbacb04f703611aba84729b111e4afc02c5ad1 Mon Sep 17 00:00:00 2001
From: Kevin Koltzau <kevin@plop.org>
Date: Tue, 23 Nov 2004 17:33:55 +0000
Subject: [PATCH] Look for lcms.h in lcms/lcms.h.

---
 configure               | 2 ++
 configure.ac            | 1 +
 dlls/mscms/mscms_priv.h | 8 ++++++++
 include/config.h.in     | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/configure b/configure
index 3b6277cefe9..cca55cb61b2 100755
--- a/configure
+++ b/configure
@@ -7270,6 +7270,7 @@ done
 
 
 
+
 
 
 for ac_header in \
@@ -7286,6 +7287,7 @@ for ac_header in \
 	io.h \
 	jack/jack.h \
 	jpeglib.h \
+	lcms/lcms.h \
 	lcms.h \
 	libio.h \
 	libutil.h \
diff --git a/configure.ac b/configure.ac
index e700545d085..fadb81f8aa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_CHECK_HEADERS(\
 	io.h \
 	jack/jack.h \
 	jpeglib.h \
+	lcms/lcms.h \
 	lcms.h \
 	libio.h \
 	libutil.h \
diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h
index 9e9e8a00e44..d5bc570c212 100644
--- a/dlls/mscms/mscms_priv.h
+++ b/dlls/mscms/mscms_priv.h
@@ -18,6 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_LCMS_LCMS_H
+#define HAVE_LCMS_H 1
+#endif
+
 #ifdef HAVE_LCMS_H
 
 /*  These basic Windows types are defined in lcms.h when compiling on
@@ -46,7 +50,11 @@
 #undef LOWORD
 #undef MAX_PATH
 
+#ifdef HAVE_LCMS_LCMS_H
+#include <lcms/lcms.h>
+#else
 #include <lcms.h>
+#endif
 
 /*  Funny thing is lcms.h defines DWORD as an 'unsigned int' whereas Wine
  *  defines it as an 'unsigned long'. To avoid compiler warnings we use a
diff --git a/include/config.h.in b/include/config.h.in
index cd6034528be..002b590b5fe 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -254,6 +254,9 @@
 /* Define to 1 if you have the <lcms.h> header file. */
 #undef HAVE_LCMS_H
 
+/* Define to 1 if you have the <lcms/lcms.h> header file. */
+#undef HAVE_LCMS_LCMS_H
+
 /* Define if you have libaudioIO */
 #undef HAVE_LIBAUDIOIO