Bug 469558: --enable-system-lcms build option should be removed.r=bsmedberg,sr=ted.

Relanding after 8f347bf50a53 was backed out in e1da61348dda. Issues should be fixed.

config/Makefile.in

@@ -128,7 +128,6 @@ 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,14 +441,9 @@ 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

@@ -1019,9 +1019,6 @@ zlib.h
 #define WRAP_LCMS_HEADERS
 #endif
 #endif
-#if MOZ_NATIVE_LCMS==1
-#define WRAP_LCMS_HEADERS
-#endif
 #ifdef WRAP_LCMS_HEADERS
 icc34.h
 lcms.h

configure.in

@@ -7539,28 +7539,16 @@ dnl ========================================================
 dnl Check for lcms
 dnl ========================================================
 
-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'
+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
-    PKG_CHECK_MODULES(LCMS, lcms >= $LCMS_VERSION)
+    LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
 fi
 
-AC_SUBST(MOZ_NATIVE_LCMS)
 AC_SUBST(LCMS_CFLAGS)
 AC_SUBST(LCMS_LIBS)
 

js/src/config/system-headers

@@ -1019,9 +1019,6 @@ zlib.h
 #define WRAP_LCMS_HEADERS
 #endif
 #endif
-#if MOZ_NATIVE_LCMS==1
-#define WRAP_LCMS_HEADERS
-#endif
 #ifdef WRAP_LCMS_HEADERS
 icc34.h
 lcms.h

toolkit/toolkit-makefiles.sh

@@ -757,6 +757,12 @@ 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
@@ -799,6 +805,7 @@ add_makefiles "
   $MAKEFILES_accessible
   $MAKEFILES_zlib
   $MAKEFILES_libmar
+  $MAKEFILES_lcms
 "
 
 #
@@ -835,14 +842,6 @@ 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,9 +70,7 @@ endif
 tier_external_dirs += modules/libmar
 endif
 
-ifndef MOZ_NATIVE_LCMS
 tier_external_dirs	+= modules/lcms
-endif
 
 #
 # tier "gecko" - core components