From f78af0adbcd300cf94fb63503db3c8174b8a1d4b Mon Sep 17 00:00:00 2001 From: "ashuk%eng.sun.com" Date: Sat, 9 Jun 2001 00:34:09 +0000 Subject: [PATCH] author=ashuk Bug=73085 Small fix to Makefile.in. Adding the links to the libjawt.so for the Java Native AWT Interface. This had mistakenly been backed out in the previous fix. git-svn-id: svn://10.0.0.236/trunk@96762 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/webclient/src_moz/Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in index c5fc91ef83c..549d3a221a1 100644 --- a/mozilla/java/webclient/src_moz/Makefile.in +++ b/mozilla/java/webclient/src_moz/Makefile.in @@ -99,11 +99,14 @@ ifdef MOZ_ENABLE_GTK ifndef MOZ_MONOLITHIC_TOOLKIT CXXFLAGS += $(MOZ_GTK_CFLAGS) CFLAGS += $(MOZ_GTK_CFLAGS) -EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt +# Adding $(JDKHOME)/jre/lib/sparc because we need to link against +# the libjawt.so shared library for the JAWT Native Interface +# functionality to work correctly. +EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(JDKHOME)/jre/lib/sparc -ljawt -L/usr/X11R6/lib -lXt else CXXFLAGS += $(TK_CFLAGS) CFLAGS += $(TK_CFLAGS) -EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt +EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(JDKHOME)/jre/lib/sparc -ljawt -L/usr/X11R6/lib -lXt endif endif