Bug 188527 - AIX: Linker errors when building GTK2 as default toolkit.

r=seawood@netscape.com

embedding/browser/gtk/tests/Makefile.in

@@ -54,7 +54,10 @@ endif
 
 ifdef MOZ_ENABLE_GTK2
 LIBS		+= \
-		-lgtkembedmoz
+		-lgtkembedmoz \
+		$(XLDFLAGS) \
+		$(XLIBS) \
+		$(NULL)
 endif
 
 include $(topsrcdir)/config/config.mk

modules/plugin/base/src/Makefile.in

@@ -141,7 +141,7 @@ endif		#MOZ_ENABLE_GTK
 ifdef MOZ_ENABLE_GTK2
 CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)
-EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS)
+EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS) $(XLIBS)
 endif           #MOZ_ENABLE_GTK2
 
 ifdef MOZ_ENABLE_XLIB

modules/plugin/samples/default/unix/Makefile.in

@@ -58,7 +58,7 @@ CFLAGS		+= $(MOZ_GTK_CFLAGS)
 endif
 
 ifdef MOZ_ENABLE_GTK2
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIB ) $(XLDFLAGS)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS)
 CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
 CFLAGS		+= $(MOZ_GTK2_CFLAGS)
 endif

widget/src/gtk2/mai/Makefile.in

@@ -1,90 +0,0 @@
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: NPL 1.1/GPL 2.0/LGPL 2.1
-#
-#
-#  The contents of this file are subject to the Mozilla Public
-#  License Version 1.1 (the "License"); you may not use this file
-#  except in compliance with the License. You may obtain a copy of
-#  the License at http://www.mozilla.org/MPL/
-#
-#  Software distributed under the License is distributed on an "AS
-#  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-#  implied. See the License for the specific language governing
-#  rights and limitations under the License.
-#
-#  The Original Code is mozilla.org code.
-#
-#  The Initial Developer of the Original Code is Sun Microsystems, Inc.
-#  Portions created by Sun Microsystems are Copyright (C) 2002 Sun
-#  Microsystems, Inc. All Rights Reserved.
-#
-#  Original Author: John Sun (john.sun@sun.com)
-#
-#  Contributor(s):  Bolian Yin (bolian.yin@sun.com) 
-#
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the NPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the NPL, the GPL or the LGPL.
-#
-#  ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mai
-LIBRARY_NAME	= mai
-EXPORT_LIBRARY	= 1
-#IS_COMPONENT	= 1
-#MODULE_NAME	= nsMaiModule
-REQUIRES	= xpcom \
-		  string \
-		  dom \
-		  necko \
-		  accessibility
-
-# Add you C source file here
-CSRCS		= \
-		$(NULL)
-
-# Add you C++ source files here
-CPPSRCS		= \
-                nsMaiUtil.cpp \
-                nsMaiObject.cpp \
-                nsMaiInterface.cpp \
-                nsMaiCache.cpp \
-                nsMaiAppRoot.cpp \
-                nsMaiTopLevel.cpp \
-                nsMaiWidget.cpp \
-                nsMaiInterfaceComponent.cpp \
-                nsMaiInterfaceAction.cpp \
-                nsMaiInterfaceValue.cpp \
-                nsMaiInterfaceSelection.cpp \
-                nsMaiInterfaceHypertext.cpp \
-                nsMaiInterfaceTable.cpp \
-                nsMaiInterfaceText.cpp \
-                nsMaiInterfaceEditableText.cpp \
-                nsMaiHyperlink.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-
-include $(topsrcdir)/config/rules.mk
-
-CFLAGS		+= $(MOZ_GTK2_CFLAGS)
-CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
-
-INCLUDES	+= \
-		-I$(srcdir)/.. \
-		$(NULL)

widget/src/gtkxtbin/Makefile.in

@@ -33,7 +33,7 @@ ifdef MOZ_ENABLE_GTK2
 CSRCS		= \
 		gtk2xtbin.c \
 		$(NULL)
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
 endif
 
 ifdef MOZ_ENABLE_GTK