callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
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> 2003-11-21 Jakub Steiner <jimmac@ximian.com>
* themes/Default/images/preferences/window-manager.png: use * themes/Default/images/preferences/window-manager.png: use

6
configure.in
View File

@ -1044,7 +1044,13 @@ have_lcms=no
AC_CHECK_LIB(lcms, cmsCreateProofingTransform, [ AC_CHECK_LIB(lcms, cmsCreateProofingTransform, [
AC_CHECK_HEADER(lcms.h, AC_CHECK_HEADER(lcms.h,
have_lcms=yes have_lcms=yes
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")]) LCMS_LIBS="-llcms")])
])
AC_SUBST(LCMS_LIBS) AC_SUBST(LCMS_LIBS)
AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes) AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)

6
modules/cdisplay_proof.c
View File

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