Conditionally check for -lSM & -lICE if -lXt test fails.

Use XT_LIBS variable for -lXt and its dependencies.
Link XT_LIBS in static xlib builds.
Use same modulename for xlib module in Makefile as the code uses.
Bug #126163 & Bug #144182 r=bryner

config/autoconf.mk.in

@@ -344,6 +344,7 @@ MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
 MOZ_XINERAMA_LIBS	= @MOZ_XINERAMA_LIBS@
 
 MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
+XT_LIBS			= @XT_LIBS@
 
 GLIB_CFLAGS	= @GLIB_CFLAGS@
 GLIB_LIBS	= @GLIB_LIBS@

config/static-config.mk

@@ -86,8 +86,8 @@ ifdef MOZ_SVG
 STATIC_EXTRA_LIBS	+= $(MOZ_LIBART_LIBS)
 endif
 
-ifdef MOZ_ENABLE_GTK
+ifneq  (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_XLIB))
-STATIC_EXTRA_LIBS	+= $(XLDFLAGS) -lXt
+STATIC_EXTRA_LIBS	+= $(XLDFLAGS) $(XT_LIBS)
 endif
 
 ifdef MOZ_ENABLE_XINERAMA

configure.in

@@ -1644,11 +1644,17 @@ else
 		[MISSING_X="$MISSING_X -lX11"], $XLIBS)
 	AC_CHECK_LIB(Xext, XextAddDisplay, [XEXT_LIBS="-lXext"],
 		[MISSING_X="$MISSING_X -lXext"], $XLIBS)
-	AC_CHECK_LIB(ICE, IceFlush, [XICE_LIBS="-lICE"],, $XLIBS)
+   
-	AC_CHECK_LIB(SM, SmcCloseConnection, [XSM_LIBS="-lSM"],, $XLIBS)
+     
-	AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"],
+	AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"], [
-		[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XLIBS)
+        unset ac_cv_lib_Xt_XtFree
+	    AC_CHECK_LIB(ICE, IceFlush, [XT_LIBS="-lICE $XT_LIBS"],, $XT_LIBS $XLIBS)
+	    AC_CHECK_LIB(SM, SmcCloseConnection, [XT_LIBS="-lSM $XT_LIBS"],, $XT_LIBS $XLIBS) 
+        AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt $XT_LIBS"],
+		    [MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XT_LIBS $XLIBS)
+        ])
 
+    AC_SUBST(XT_LIBS)
     dnl ========================================================
     dnl = Check for Xinerama
     dnl ========================================================

widget/src/xlib/Makefile.in

@@ -31,7 +31,7 @@ MODULE		= widget
 LIBRARY_NAME	= widget_xlib
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
-MODULE_NAME	= nsWidgetXLibModule
+MODULE_NAME	= nsWidgetXLIBModule
 REQUIRES	= xpcom \
 		  string \
 		  appshell \