From 475a3a67201c9ae0de2688303c2f6e5cd30f6553 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@stanford.edu>
Date: Mon, 12 Jan 2009 16:20:45 -0800
Subject: [PATCH] Bug 469558: --enable-system-lcms build option should be
 removed.r=vlad,sr=ted

---
 config/Makefile.in           |  1 -
 config/autoconf.mk.in        |  5 -----
 config/system-headers        | 12 ------------
 configure.in                 | 24 ++++++------------------
 js/src/config/system-headers | 12 ------------
 toolkit/toolkit-makefiles.sh | 15 +++++++--------
 toolkit/toolkit-tiers.mk     |  2 --
 7 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/config/Makefile.in b/config/Makefile.in
index 71cf40f7fab..b8dd659f3cd 100644
--- a/config/Makefile.in
+++ b/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
 
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 0aa1304bc6e..3ea6b3611d1 100644
--- a/config/autoconf.mk.in
+++ b/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@
diff --git a/config/system-headers b/config/system-headers
index a85937564b7..83c114e7463 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1014,18 +1014,6 @@ 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
diff --git a/configure.in b/configure.in
index 70c1137113d..4ca1e1ec170 100644
--- a/configure.in
+++ b/configure.in
@@ -7537,28 +7537,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)
 
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index a85937564b7..83c114e7463 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -1014,18 +1014,6 @@ 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
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 50ed5c1e648..35c091939cf 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/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
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 68e80172124..b827acfe87d 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/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