if lcms.h cannot be found, try lcms/lcms.h.

2003-11-21  Sven Neumann  <sven@gimp.org>

	* configure.in: if lcms.h cannot be found, try lcms/lcms.h.

	* modules/cdisplay_proof.c: changed accordingly.
This commit is contained in:
Sven Neumann 2003-11-21 17:08:23 +00:00 committed by Sven Neumann
parent 00efb6111a
commit de2617d197
3 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2003-11-21 Sven Neumann <sven@gimp.org>
* configure.in: if lcms.h cannot be found, try lcms/lcms.h.
* modules/cdisplay_proof.c: changed accordingly.
2003-11-21 Jakub Steiner <jimmac@ximian.com>
* themes/Default/images/preferences/window-manager.png: use

View File

@ -1044,7 +1044,13 @@ have_lcms=no
AC_CHECK_LIB(lcms, cmsCreateProofingTransform, [
AC_CHECK_HEADER(lcms.h,
have_lcms=yes
LCMS_LIBS="-llcms")])
LCMS_LIBS="-llcms", [
AC_CHECK_HEADER(lcms/lcms.h,
have_lcms=yes
AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
[Define to 1 if the lcms header must be included as lcms/lcms.h])
LCMS_LIBS="-llcms")])
])
AC_SUBST(LCMS_LIBS)
AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)

View File

@ -18,9 +18,13 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#ifdef HAVE_LCMS_LCMS_H
#include <lcms/lcms.h>
#else
#include <lcms.h>
#endif
#include <gtk/gtk.h>