From 6f61e587ea492c52377734dcedfe1d66914fc439 Mon Sep 17 00:00:00 2001
From: "pkw%us.ibm.com" <pkw%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 30 Sep 2002 22:18:27 +0000
Subject: [PATCH] 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
---
 mozilla/configure.in                                    | 8 ++++++++
 mozilla/modules/plugin/base/src/Makefile.in             | 6 +++---
 mozilla/modules/plugin/samples/default/unix/Makefile.in | 2 +-
 mozilla/widget/src/gtkxtbin/Makefile.in                 | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mozilla/configure.in b/mozilla/configure.in
index 67e0b2f3063..2edec1d63cc 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -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
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index 9ab194aa244..81913a1dbf3 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.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)
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index fa82b57804a..6a79c2e1c9c 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -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
diff --git a/mozilla/widget/src/gtkxtbin/Makefile.in b/mozilla/widget/src/gtkxtbin/Makefile.in
index b983e0b9c20..ab3e51be48b 100644
--- a/mozilla/widget/src/gtkxtbin/Makefile.in
+++ b/mozilla/widget/src/gtkxtbin/Makefile.in
@@ -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