From c67d16e0fbef7f8aaf3d238ee2ae3c9d810eb734 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Wed, 20 Feb 2013 06:47:35 +0100
Subject: Win32. Fix for Bug #1125620 (Crashes on trying to open document
 properties or preferences).

(bzr r12136)
---
 build.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 8b5163877..d287348d0 100644
--- a/build.xml
+++ b/build.xml
@@ -153,7 +153,7 @@
         #define HAVE_OPENMP                   1
         #define HAVE_TR1_UNORDERED_SET        1
 
-        #define HAVE_LIBLCMS1                 1
+        #define HAVE_LIBLCMS2                 1
 
         #define WITH_GTKMM_2_24               1
 
@@ -487,7 +487,7 @@
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
-           ${pcl.lcms}
+           ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
            -lgc
@@ -559,7 +559,7 @@
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
-           ${pcl.lcms}
+           ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
            -lgc
@@ -609,7 +609,7 @@
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
-           ${pcl.lcms}
+           ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
            -lgc
@@ -690,7 +690,6 @@
     <copy todir="${dist}" file="${devlibs}/bin/bzip2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/iconv.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/liblcms2-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagick++-3.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickCore-3.dll"/>
-- 
cgit v1.2.3