Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Bug 98892 - Null plugin crash on AIX with Java plugin installed.

Browse Source 
Link with -lXm before -lXt on AIX, use $XT_LIBS instead of hardcoding
-lXt in Makefiles.
r=cls
This commit is contained in:
pkw%us.ibm.com 2002-09-30 22:18:27 +00:00
parent 320c8a48d7
commit 4d3c8a3a93
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -1701,6 +1701,14 @@ else
[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XT_LIBS $XLIBS)
])
# AIX needs the motif library linked before libXt to prevent
# crashes in plugins linked against Motif - Bug #98892
case "${target_os}" in
aix*)
XT_LIBS="-lXm $XT_LIBS"
;;
esac
AC_SUBST(XT_LIBS)
dnl ========================================================
dnl = Check for Xinerama

6
modules/plugin/base/src/Makefile.in
View File

@ -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)

2
modules/plugin/samples/default/unix/Makefile.in
View File

@ -46,7 +46,7 @@ FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -lXt \
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(XT_LIBS) \
$(NULL)
ifdef MOZ_ENABLE_GTK

4
widget/src/gtkxtbin/Makefile.in
View File

@ -33,14 +33,14 @@ ifdef MOZ_ENABLE_GTK2
CSRCS = \
gtk2xtbin.c \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) -lXt
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS)
endif
ifdef MOZ_ENABLE_GTK
CSRCS = \
gtkxtbin.c \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) -lXt
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) $(XT_LIBS)
endif