Backed out changeset 8f347bf50a53 due to x86-64 build bustage, and the fact that the committed patch didn't match the reviewed patch in an important way (bug 469558)

config/Makefile.in

@@ -128,6 +128,7 @@ export::
 		-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
 		-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
 		-DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
+		-DMOZ_NATIVE_LCMS=$(MOZ_NATIVE_LCMS) \
 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)/include
 

config/autoconf.mk.in

@@ -441,9 +441,14 @@ PNG_LIBS	= @MOZ_PNG_LIBS@
 PNG_REQUIRES	= png
 endif
 
+MOZ_NATIVE_LCMS	= @MOZ_NATIVE_LCMS@
 LCMS_CFLAGS	= @LCMS_CFLAGS@
 LCMS_LIBS	= @LCMS_LIBS@
+ifdef MOZ_NATIVE_LCMS
+LCMS_REQUIRES	=
+else
 LCMS_REQUIRES	= lcms
+endif
 
 MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
 SQLITE_CFLAGS     = @SQLITE_CFLAGS@

config/system-headers

@@ -1014,6 +1014,18 @@ png.h
 #if MOZ_NATIVE_ZLIB==1
 zlib.h
 #endif
+#if MOZ_ENABLE_LIBXUL!=1
+#if BUILD_STATIC_LIBS!=1
+#define WRAP_LCMS_HEADERS
+#endif
+#endif
+#if MOZ_NATIVE_LCMS==1
+#define WRAP_LCMS_HEADERS
+#endif
+#ifdef WRAP_LCMS_HEADERS
+icc34.h
+lcms.h
+#endif
 #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 libsn/sn.h
 libsn/sn-common.h

configure.in

@@ -7537,16 +7537,28 @@ dnl ========================================================
 dnl Check for lcms
 dnl ========================================================
 
-LCMS_CFLAGS=
-if test "$_WIN32_MSVC"; then
-    if test -z "$BUILD_STATIC_LIBS" -a -z "$MOZ_ENABLE_LIBXUL"; then
-        LCMS_CFLAGS=-DLCMS_DLL
+MOZ_NATIVE_LCMS=
+MOZ_ARG_ENABLE_BOOL(system-lcms,
+[ --enable-system-lcms Use system lcms (located with pkgconfig)],
+MOZ_NATIVE_LCMS=1,
+MOZ_NATIVE_LCMS= )
+
+if test -z "$MOZ_NATIVE_LCMS"
+then
+    LCMS_CFLAGS=
+    if test "$_WIN32_MSVC"; then
+        if test -z "$BUILD_STATIC_LIBS" -a -z "$MOZ_ENABLE_LIBXUL"; then
+            LCMS_CFLAGS=-DLCMS_DLL
+        fi
+        LCMS_LIBS='$(LIBXUL_DIST)/lib/mozlcms.lib'
+    else
+        LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
     fi
-    LCMS_LIBS='$(LIBXUL_DIST)/lib/mozlcms.lib'
 else
-    LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
+    PKG_CHECK_MODULES(LCMS, lcms >= $LCMS_VERSION)
 fi
 
+AC_SUBST(MOZ_NATIVE_LCMS)
 AC_SUBST(LCMS_CFLAGS)
 AC_SUBST(LCMS_LIBS)
 

js/src/config/system-headers

@@ -1014,6 +1014,18 @@ png.h
 #if MOZ_NATIVE_ZLIB==1
 zlib.h
 #endif
+#if MOZ_ENABLE_LIBXUL!=1
+#if BUILD_STATIC_LIBS!=1
+#define WRAP_LCMS_HEADERS
+#endif
+#endif
+#if MOZ_NATIVE_LCMS==1
+#define WRAP_LCMS_HEADERS
+#endif
+#ifdef WRAP_LCMS_HEADERS
+icc34.h
+lcms.h
+#endif
 #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 libsn/sn.h
 libsn/sn-common.h

toolkit/toolkit-makefiles.sh

@@ -757,12 +757,6 @@ MAKEFILES_libmar="
   modules/libmar/tool/Makefile
 "
 
-MAKEFILES_lcms="
-  modules/lcms/Makefile
-  modules/lcms/include/Makefile
-  modules/lcms/src/Makefile
-"
-
 add_makefiles "
   $MAKEFILES_db
   $MAKEFILES_dom
@@ -805,7 +799,6 @@ add_makefiles "
   $MAKEFILES_accessible
   $MAKEFILES_zlib
   $MAKEFILES_libmar
-  $MAKEFILES_lcms
 "
 
 #
@@ -842,6 +835,14 @@ if [ "$MOZ_TREE_CAIRO" ] ; then
   "
 fi
 
+if [ ! "$MOZ_NATIVE_LCMS" ] ; then
+  add_makefiles "
+    modules/lcms/Makefile
+    modules/lcms/include/Makefile
+    modules/lcms/src/Makefile
+  "
+fi
+
 if [ "$MOZ_UNIVERSALCHARDET" ] ; then
   add_makefiles "
     extensions/universalchardet/Makefile

toolkit/toolkit-tiers.mk

@@ -70,7 +70,9 @@ endif
 tier_external_dirs += modules/libmar
 endif
 
+ifndef MOZ_NATIVE_LCMS
 tier_external_dirs	+= modules/lcms
+endif
 
 #
 # tier "gecko" - core components