#87582

r=jdunn, sr=cls
Checkin for Roland.Mainz@informatik.med.uni-giessen.de - crash with xlib and xprint

gfx/src/Makefile.in

@@ -39,7 +39,7 @@ DIRS		= ps
 endif
 
 # Build xlibrgb only for X toolkits
-ifneq (,$(filter motif xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT))
+ifneq (,$(filter motif xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB))
 DIRS		+= xlibrgb
 endif
 

gfx/src/xprint/Makefile.in

@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@ @srcdir@/../xlib
+VPATH		= @srcdir@:@srcdir@/../xlib
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -37,8 +37,9 @@ EXTRA_DSO_LIBS	= gkgfx
 REQUIRES	= xpcom string widget view img util dom pref locale uconv unicharutil gfx2 necko imglib2 intl
 
 CSRCS		= \
-                xprintutil.c \
-                xprintutil_printtofile.c \
+		../xlibrgb/xlibrgb.c \
+		xprintutil.c \
+		xprintutil_printtofile.c \
 		$(NULL)
 
 CPPSRCS		= \
@@ -48,7 +49,7 @@ CPPSRCS		= \
 		nsGfxFactoryXP.cpp \
 		nsXPrintContext.cpp \
 		nsRegionXlib.cpp \
-                nsGCCache.cpp \
+		nsGCCache.cpp \
 		$(NULL)
 
 EXPORTS		= \
@@ -72,10 +73,15 @@ endif
 CFLAGS		+= $(TK_CFLAGS)
 CXXFLAGS	+= $(TK_CFLAGS)
 
+# gisburn: linking against xlibrgb.so does not work due global variables
+# in that library which must not be shared between main toolkit and
+# Xprint module classes. 
+# This will be fixed by bug 85527 ("Turn xlibrgb into a shared library" - 
+# this RFE will introduce a new API for xlibrgb where these variables are 
+# stored in a "handle" instead of using global variables...).
 EXTRA_DSO_LDOPTS += \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
-		-lxlibrgb  \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)