From 7a551095144a1710ac6ec1137f6156e158ce0efa Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 12 Aug 2001 00:38:38 +0000
Subject: [PATCH] Remove --disable-libpr0n option & USE_IMG2 makefile variable.
 Bug #88685

git-svn-id: svn://10.0.0.236/trunk@100875 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/Makefile.in           |  9 ++-------
 mozilla/config/autoconf.mk.in |  1 -
 mozilla/config/config.mak     |  3 ---
 mozilla/configure.in          | 10 +---------
 mozilla/makefile.win          |  2 --
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 5a03b272e67..a8a0310e40f 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -99,13 +99,8 @@ DIRS		+= \
 		expat \
 		htmlparser \
 		gfx \
-		$(NULL)
-
-ifdef USE_IMG2
-DIRS		+= gfx2 modules/libpr0n
-endif
-
-DIRS		+= \
+		gfx2 \
+		modules/libpr0n \
 		modules/plugin \
 		dom \
 		view \
diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 73963c21140..26e4e12c190 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -337,7 +337,6 @@ MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_EMX_OBJECTFORMAT = @MOZ_OS2_EMX_OBJECTFORMAT@
 
 HAVE_MOVEMAIL=@HAVE_MOVEMAIL@
-USE_IMG2=@USE_IMG2@
 HAVE_XIE=@HAVE_XIE@
 
 MOZ_PSM=@MOZ_PSM@
diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak
index f515c5ac92c..34d9d2e5003 100644
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -311,10 +311,7 @@ CFLAGS=$(CFLAGS) -DMOZ_SVG
 CFLAGS=$(CFLAGS) -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP
 !endif
 
-#!ifdef USE_IMG2
-USE_IMG2=1
 CFLAGS=$(CFLAGS) -DUSE_IMG2
-#!endif
 
 !ifdef MOZ_STATIC_COMPONENT_LIBS
 CFLAGS=$(CFLAGS) -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT -DMOZ_STATIC_COMPONENT_LIBS
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 827a89b89ad..365a7d74046 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3851,15 +3851,7 @@ AC_ARG_ENABLE(verbose-config-defs,
     fi])
 
 dnl libpr0n on by default
-USE_IMG2=1
-dnl Turn off the new image library.  Soon to go away.
-MOZ_ARG_DISABLE_BOOL(libpr0n,
-[  --disable-libpr0n       Disable new imagelib],
-   USE_IMG2=)
-if test "$USE_IMG2" = "1"; then
-  AC_DEFINE(USE_IMG2)
-fi
-AC_SUBST(USE_IMG2)
+AC_DEFINE(USE_IMG2)
 
 dnl ========================================================
 dnl =
diff --git a/mozilla/makefile.win b/mozilla/makefile.win
index e2e678d0bd7..b23ba310c5b 100644
--- a/mozilla/makefile.win
+++ b/mozilla/makefile.win
@@ -74,10 +74,8 @@ DIRS =                         \
 # the following are associated with the layout engine
   expat                        \
   gfx                          \
-!if defined(USE_IMG2)
   gfx2                         \
   modules\libpr0n              \
-!endif
   modules\plugin               \
   uriloader                    \
   htmlparser                   \