Make SampleICC switchable between system and internal one.

configure.in

@@ -951,6 +951,11 @@ AC_ARG_WITH(system-nss,
         [Use NSS/nspr libraries already on system.]),,
     [with_system_nss="$with_system_libs"])
 
+AC_ARG_WITH(system-sampleicc,
+    AS_HELP_STRING([--with-system-sampleicc],
+        [Use SampleICC libraries already on system (used only during build).]),,
+    [with_system_sampleicc="$with_system_libs"])
+
 AC_ARG_WITH(mozilla-version,
     AS_HELP_STRING([--with-mozilla-version],
         [Choose which version of Mozilla to use while building Mozilla.
@@ -6204,6 +6209,22 @@ AC_SUBST(SYSTEM_GRAPHITE)
 AC_SUBST(GRAPHITE_LIBS)
 AC_SUBST(GRAPHITE_CFLAGS)
 
+dnl ===================================================================
+dnl SampleICC
+dnl ===================================================================
+AC_MSG_CHECKING([whether to use system SampleICC])
+if test "$with_system_sampleicc" = "yes"; then
+    AC_MSG_RESULT([yes])
+    SYSTEM_SAMPLEICC=YES
+    PKG_CHECK_MODULES(SAMPLEICC, sampleicc)
+else
+    AC_MSG_RESULT([no])
+    SYSTEM_SAMPLEICC=NO
+fi
+AC_SUBST(SYSTEM_SAMPLEICC)
+AC_SUBST(SAMPLEICC_LIBS)
+AC_SUBST(SAMPLEICC_CFLAGS)
+
 dnl ===================================================================
 dnl Checks for libraries.
 dnl ===================================================================

icc/SampleICC-makefiles.patch

@@ -46,7 +46,7 @@
 +ALLTAR: Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST)
 +
 +Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST) .PHONY:
-+    cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake && cd ..$/CmdLine$/create_sRGB_profile && dmake
++    cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake
 +
 --- /dev/null	2011-10-28 11:24:51.341910850 +0100
 +++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk	2011-11-04 08:50:20.000000000 +0000

icc/makefile.mk

@@ -30,6 +30,11 @@ PRJ=.
 PRJNAME=icc
 TARGET=icc
 
+.IF "$(SYSTEM_SAMPLEICC)" == "YES"
+all:
+    @echo "Using system SampleICC, nothing to do here."
+.ELSE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
@@ -49,14 +54,10 @@ CONVERTFILES= \
     Contrib$/ICC_utils$/Stubs.h \
     Contrib$/ICC_utils$/Vetters.cpp
 
-.IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine
-BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
-.ELSE
 CONFIGURE_ACTION=
-BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf -
-.ENDIF
+BUILD_ACTION=dmake
 
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 

icc/prj/build.lst

 ip     icc :	solenv external sal NULL
 ip	icc				usr1	-	all	ip_mkout 		NULL
 ip	icc				nmake	-	all	ip_icc			NULL
+ip      icc/source/create_sRGB_profile	nmake	-	all	ip_profile ip_icc	NULL 

icc/prj/d.lst

 mkdir: %_DEST%\inc\icc
-mkdir: %_DEST%\inc\external\icc
-
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
 
+..\%__SRC%\bin\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx

icc/source/create_sRGB_profile/Makefile.am

-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = \
-	create_display_profile
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/IccProfLib \
-	-I$(top_srcdir)/Contrib/ICC_utils
-
-LDADD = -L$(top_builddir)/IccProfLib -lSampleICC \
-	-L$(top_builddir)/Contrib/ICC_utils -lICC_utils
-
-create_display_profile_SOURCES = \
-	create_display_profile.cpp

icc/source/create_sRGB_profile/makefile.mk

@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..$/..$/..$/..$/..
+PRJ=..$/..$/
 
 PRJNAME=icc
 TARGET=create_sRGB_profile
@@ -37,19 +37,18 @@ LIBTARGET=NO
 TARGETTYPE=CUI
 
 ENABLE_EXCEPTIONS=TRUE
-
 EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
 
-CFLAGS+=-I..$/..$/..$/IccProfLib -I..$/..$/ICC_utils
-
-# This tool uses unaligned memory accesses which will lead
-# to SIGBUS on platforms who care, like Solaris LP64
-.IF "$(OS)$(CPU)"=="SOLARISU"
-LINKFLAGS+=-xmemalign=8i
+.IF "$(SYSTEM_SAMPLEICC)"=="YES"
+CFLAGS+=$(SAMPLEICC_CFLAGS)
+.ELSE
+CFLAGS+= \
+    -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \
+    -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -58,21 +57,29 @@ OBJFILES= $(OBJ)$/create_sRGB_profile.obj
 
 # --- Targets ------------------------------------------------------
 
-# svdem
 APP1LIBSALCPPRT:=
 UWINAPILIB:=
 APP1NOSAL=	TRUE
 APP1TARGET= 	$(TARGET)
+.IF "$(SYSTEM_SAMPLEICC)"=="YES"
+APP1LIBS=
+APP1STDLIBS=\
+    $(SAMPLEICC_LIBS) \
+    -lICC_utils
+# this library is not in pkgconfig but in the same dir
+# so no need to cry for it and just hardcode it here
+.ELSE
 APP1LIBS=\
     $(SLB)$/proflib.lib \
     $(SLB)$/icutil.lib
-APP1OBJS= $(OBJFILES)
 APP1STDLIBS=
+.ENDIF
+APP1OBJS= $(OBJFILES)
 
 .INCLUDE :	target.mk
 
 ALLTAR: $(TARGET)$(EXECPOST)
 
-$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) makefile.mk
-    rm -f $@
-    $(GNUCOPY) $(BIN)$/$(TARGET)$(EXECPOST) $@
+$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST)
+    rm -rf $@
+    cd $(BIN)$/ && $(BIN)$/$(TARGET)$(EXECPOST)

set_soenv.in

@@ -1543,6 +1543,9 @@ ToFile( "COMMONS_LANG_JAR",  "@COMMONS_LANG_JAR@", "e" );
 ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
 ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
 ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
+ToFile( "SYSTEM_SAMPLEICC", "@SYSTEM_SAMPLEICC@", "e" );
+ToFile( "SAMPLEICC_CFLAGS", "@SAMPLEICC_CFLAGS@", "e" );
+ToFile( "SAMPLEICC_LIBS", "@SAMPLEICC_LIBS@", "e" );
 ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
 ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
 ToFile( "DBUS_CFLAGS",       "@DBUS_CFLAGS@",      "e" );