Bug 591145 - Remove configure checks for encoders. r=khuey a=bsmedberg

dothq · Nov 5, 2010 · dfa15fb · dfa15fb
1 parent 6269316
commit dfa15fb
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 65 deletions.
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
@@ -101,7 +101,6 @@ MOZ_DEBUG_DISABLE_DEFS	= @MOZ_DEBUG_DISABLE_DEFS@
 MOZ_DEBUG_FLAGS	= @MOZ_DEBUG_FLAGS@
 MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
 MOZ_EXTENSIONS  = @MOZ_EXTENSIONS@
-MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@
 MOZ_JSDEBUGGER  = @MOZ_JSDEBUGGER@
 MOZ_IPC 	= @MOZ_IPC@
 MOZ_IPDL_TESTS 	= @MOZ_IPDL_TESTS@

diff --git a/configure.in b/configure.in
@@ -4942,7 +4942,6 @@ MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_FEEDS=1
-MOZ_IMG_ENCODERS_DEFAULT="png jpeg"
 MOZ_INSTALLER=1
 MOZ_IPC=1
 MOZ_JAVAXPCOM=
@@ -6418,33 +6417,6 @@ for extension in $MOZ_EXTENSIONS; do
     fi
 done
 
-dnl ========================================================
-dnl Image encoders
-dnl ========================================================
-MOZ_ARG_ENABLE_STRING(image-encoders,
-[  --enable-image-encoders[={mod1,mod2,default,all,none}]
-                          Enable specific image encoders],
-[ for option in `echo $enableval | sed 's/,/ /g'`; do
-    if test "$option" = "yes" -o "$option" = "all"; then
-        addencoder="$MOZ_IMG_ENCODERS_DEFAULT"
-    elif test "$option" = "no" -o "$option" = "none"; then
-        MOZ_IMG_ENCODERS=""
-        addencoder=""
-    elif test "$option" = "default"; then
-        addencoder="$MOZ_IMG_ENCODERS_DEFAULT"
-    elif test `echo "$option" | grep -c \^-` != 0; then
-        option=`echo $option | sed 's/^-//'`
-        addencoder=`echo "$MOZ_IMG_ENCODERS" | sed "s/ ${option}//"`
-    else
-        addencoder="$option"
-    fi
-    MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS $addencoder"
-done],
-    MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT")
-
-dnl Remove dupes
-MOZ_IMG_ENCODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_ENCODERS}`
-
 dnl ========================================================
 dnl MathML on by default
 dnl ========================================================
@@ -8848,7 +8820,6 @@ AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(MOZ_EXTENSIONS)
-AC_SUBST(MOZ_IMG_ENCODERS)
 AC_SUBST(MOZ_JSDEBUGGER)
 AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(MOZ_LOG_REFCNT)

diff --git a/jpeg/Makefile.in b/jpeg/Makefile.in
@@ -99,8 +99,6 @@ EXPORTS		= \
 		$(NULL)
 
 # These files enable support for writing JPEGs
-# (on certain platforms, or if JPEG image encoder support is required)
-ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT))$(filter jpeg,$(MOZ_IMG_ENCODERS)))
 CSRCS		+= \
 		jcapimin.c \
 		jcparam.c \
@@ -118,8 +116,6 @@ CSRCS		+= \
 		jcprepct.c \
 		$(NULL)
 
-endif
-
 # need static lib for some of the libimg componentry to link properly
 FORCE_STATIC_LIB = 1
 

diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
@@ -82,7 +82,6 @@ MOZ_DEBUG_DISABLE_DEFS	= @MOZ_DEBUG_DISABLE_DEFS@
 MOZ_DEBUG_FLAGS	= @MOZ_DEBUG_FLAGS@
 MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
 MOZ_EXTENSIONS  = @MOZ_EXTENSIONS@
-MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@
 MOZ_JSDEBUGGER  = @MOZ_JSDEBUGGER@
 MOZ_LEAKY	= @MOZ_LEAKY@
 MOZ_MEMORY      = @MOZ_MEMORY@

diff --git a/modules/libimg/png/Makefile.in b/modules/libimg/png/Makefile.in
@@ -66,28 +66,21 @@ CSRCS		= \
 		pngtrans.c \
 		$(NULL)
 
-# These files enable support for reading PNGs
+# These files enable support for reading/writting PNGs
 CSRCS		+= \
 		pngpread.c \
 		pngread.c \
 		pngrio.c \
 		pngrtran.c \
 		pngrutil.c \
-		$(NULL)
-
-DEFINES		+= -DMOZ_PNG_READ
-
-# These files enable support for writing PNGs
-ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
-CSRCS		+= \
 		pngwio.c \
 		pngwrite.c \
 		pngwtran.c \
 		pngwutil.c \
 		$(NULL)
 
-DEFINES		+= -DMOZ_PNG_WRITE
-endif
+DEFINES		+= -DMOZ_PNG_READ \
+		-DMOZ_PNG_WRITE
 
 EXPORTS		= png.h pngconf.h mozpngconf.h
 

diff --git a/modules/libpr0n/Makefile.in b/modules/libpr0n/Makefile.in
@@ -44,11 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= imglib2
 
-DIRS		= public src decoders
-
-ifdef MOZ_IMG_ENCODERS
-DIRS		+= encoders
-endif
+PARALLEL_DIRS		= public src decoders encoders
 
 ifdef ENABLE_TESTS
 DIRS  += test

diff --git a/modules/libpr0n/build/Makefile.in b/modules/libpr0n/build/Makefile.in
@@ -57,15 +57,15 @@ CPPSRCS = \
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../src \
-		$(foreach d,$(MOZ_IMG_ENCODERS), \
-			-I$(srcdir)/../encoders/${d}) \
+		-I$(srcdir)/../encoders/png \
+		-I$(srcdir)/../encoders/jpeg \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)imglib2_s.$(LIB_SUFFIX) \
 		../decoders/$(LIB_PREFIX)imgdecoders_s.$(LIB_SUFFIX) \
-		$(foreach d,$(MOZ_IMG_ENCODERS), \
-			../encoders/${d}/$(LIB_PREFIX)img${d}e_s.$(LIB_SUFFIX))\
+		../encoders/png/$(LIB_PREFIX)imgpnge_s.$(LIB_SUFFIX)\
+		../encoders/jpeg/$(LIB_PREFIX)imgjpege_s.$(LIB_SUFFIX)\
 		$(NULL)
 
 EXTRA_DSO_LIBS	= \

diff --git a/modules/libpr0n/decoders/Makefile.in b/modules/libpr0n/decoders/Makefile.in
@@ -60,10 +60,9 @@ CSRCS   = iccjpeg.c \
 LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
 
 # PNG read/write stuff
-ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
-DEFINES		+= -DMOZ_PNG_WRITE
-endif
-DEFINES		+= -DMOZ_PNG_READ
+DEFINES		+= -DMOZ_PNG_WRITE \
+	-DMOZ_PNG_READ \
+	$(NULL)
 
 
 # The Icon Channel stuff really shouldn't live in decoders/icon, but we'll

diff --git a/modules/libpr0n/encoders/Makefile.in b/modules/libpr0n/encoders/Makefile.in
@@ -40,7 +40,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS += $(MOZ_IMG_ENCODERS)
+DIRS += png \
+	jpeg \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/modules/libpr0n/encoders/png/Makefile.in b/modules/libpr0n/encoders/png/Makefile.in
@@ -48,12 +48,9 @@ LIBXUL_LIBRARY = 1
 
 EXTRA_DSO_LIBS	= gkgfx
 
-
-ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
-DEFINES		+= -DMOZ_PNG_WRITE
-endif
-
-DEFINES		+= -DMOZ_PNG_READ
+DEFINES		+= -DMOZ_PNG_WRITE \
+	-DMOZ_PNG_READ \
+	$(NULL)
 
 CPPSRCS		= nsPNGEncoder.cpp