Bustage fix #3 for bug 402742.
authorreed@reedloden.com
Fri, 07 Dec 2007 17:00:18 -0800
changeset 8825 82aa45e043c848a1fc6ff89e98799ac412dd0a19
parent 8824 9443b0a0901ebde5178d2a12986b71207e54ab03
child 8826 5b1f9fff358244afaa79f3fc02653e10a261ee42
push idunknown
push userunknown
push dateunknown
bugs402742
milestone1.9b2pre
Bustage fix #3 for bug 402742.
configure.in
toolkit/library/libxul-config.mk
--- a/configure.in
+++ b/configure.in
@@ -5495,16 +5495,26 @@ for extension in $MOZ_EXTENSIONS; do
         AC_MSG_ERROR([Unrecognized extension provided to --enable-extensions: ${extension}.])
     fi
 done
 
 
 dnl ========================================================
 dnl Image decoders
 dnl ========================================================
+case "$MOZ_WIDGET_TOOLKIT" in
+beos|windows|os2|mac|cocoa)
+    ;;
+*)
+    if test -z "$MOZ_ENABLE_GTK2"; then
+       MOZ_IMG_DECODERS_DEFAULT=`echo $MOZ_IMG_DECODERS_DEFAULT | sed -e 's|icon||'`                
+    fi
+    ;;
+esac
+
 MOZ_ARG_ENABLE_STRING(image-decoders,
 [  --enable-image-decoders[={mod1,mod2,default,all,none}]
                           Enable specific image decoders],
 [ for option in `echo $enableval | sed 's/,/ /g'`; do
     if test "$option" = "yes" || test "$option" = "all"; then
         MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $MOZ_IMG_DECODERS_DEFAULT"
     elif test "$option" = "no" || test "$option" = "none"; then
         MOZ_IMG_DECODERS=""
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -272,19 +272,21 @@ COMPONENT_LIBS += ipcdc
 endif
 
 ifdef MOZ_ENABLE_POSTSCRIPT
 DEFINES += -DMOZ_ENABLE_POSTSCRIPT
 STATIC_LIBS += gfxpsshar
 endif
 
 ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
+ifneq (gtk2,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DICON_DECODER
 COMPONENT_LIBS += imgicon
 endif
+endif
 
 ifdef MOZ_ENABLE_CAIRO_GFX
 STATIC_LIBS += thebes
 COMPONENT_LIBS += gkgfxthebes
 
 else # Platform-specific GFX layer
   ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
   COMPONENT_LIBS += gkgfxwin