Look for lcms.h in lcms/lcms.h.

This commit is contained in:
Kevin Koltzau 2004-11-23 17:33:55 +00:00 committed by Alexandre Julliard
parent b98c2e3847
commit a2bbacb04f
4 changed files with 14 additions and 0 deletions

2
configure vendored
View File

@ -7270,6 +7270,7 @@ done
for ac_header in \ for ac_header in \
@ -7286,6 +7287,7 @@ for ac_header in \
io.h \ io.h \
jack/jack.h \ jack/jack.h \
jpeglib.h \ jpeglib.h \
lcms/lcms.h \
lcms.h \ lcms.h \
libio.h \ libio.h \
libutil.h \ libutil.h \

View File

@ -177,6 +177,7 @@ AC_CHECK_HEADERS(\
io.h \ io.h \
jack/jack.h \ jack/jack.h \
jpeglib.h \ jpeglib.h \
lcms/lcms.h \
lcms.h \ lcms.h \
libio.h \ libio.h \
libutil.h \ libutil.h \

View File

@ -18,6 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 #ifdef HAVE_LCMS_H
/* These basic Windows types are defined in lcms.h when compiling on /* These basic Windows types are defined in lcms.h when compiling on
@ -46,7 +50,11 @@
#undef LOWORD #undef LOWORD
#undef MAX_PATH #undef MAX_PATH
#ifdef HAVE_LCMS_LCMS_H
#include <lcms/lcms.h>
#else
#include <lcms.h> #include <lcms.h>
#endif
/* Funny thing is lcms.h defines DWORD as an 'unsigned int' whereas Wine /* 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 * defines it as an 'unsigned long'. To avoid compiler warnings we use a

View File

@ -254,6 +254,9 @@
/* Define to 1 if you have the <lcms.h> header file. */ /* Define to 1 if you have the <lcms.h> header file. */
#undef HAVE_LCMS_H #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 */ /* Define if you have libaudioIO */
#undef HAVE_LIBAUDIOIO #undef HAVE_LIBAUDIOIO