Fix Bug 98892 - Null plugin crash on AIX with Java plugin installed.
Link with -lXm before -lXt on AIX, use $XT_LIBS instead of hardcoding -lXt in Makefiles. r=cls git-svn-id: svn://10.0.0.236/trunk@130827 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -122,17 +122,17 @@ endif
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
CFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin $(XLDFLAGS) -lXt $(MOZ_GTK_LDFLAGS)
|
||||
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK_LDFLAGS)
|
||||
endif #MOZ_ENABLE_GTK
|
||||
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||
CFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||
EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) -lXt $(MOZ_GTK2_LIBS)
|
||||
EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS)
|
||||
endif #MOZ_ENABLE_GTK2
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
EXTRA_DSO_LDOPTS += -lxlibxtbin -lxlibrgb -L/usr/X11R6/lib -lXt
|
||||
EXTRA_DSO_LDOPTS += -lxlibxtbin -lxlibrgb -L/usr/X11R6/lib $(XT_LIBS)
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
CFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
|
||||
Reference in New Issue
Block a user