Bug 1256988 - Skip the Xt library test for MOZ_WIDGET_TOOLKIT==qt. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 16 Mar 2016 14:44:07 +0900
changeset 312858 63064e69b81e8f39a6fbc8c265568f317b79b7fc
parent 312857 0e03188f3d5879f20df6f62f8122ff09de8ed001
child 312859 730733acaf713e9aba4a11502dbafb65d990f00d
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1256988
milestone48.0a1
Bug 1256988 - Skip the Xt library test for MOZ_WIDGET_TOOLKIT==qt. r=chmanchester Now that the MOZ_WIDGET_TOOLKIT test is in moz.configure, the value for MOZ_WIDGET_TOOLKIT is now set in old-configure.in very early, which now allows to check for its value before doing to Xt test instead of resetting XT_LIBS later.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -2117,23 +2117,25 @@ if test "$no_x" != "yes"; then
     XLIBS="-lX11 $XLIBS"
     _SAVE_LDFLAGS="$LDFLAGS"
     LDFLAGS="$XLDFLAGS $LDFLAGS"
     AC_CHECK_LIB(X11, XDrawLines, [X11_LIBS="-lX11"],
         [MISSING_X="$MISSING_X -lX11"], $XLIBS)
     AC_CHECK_LIB(Xext, XextAddDisplay, [XEXT_LIBS="-lXext"],
         [MISSING_X="$MISSING_X -lXext"], $XLIBS)
 
+    if test "$MOZ_WIDGET_TOOLKIT" != qt; then
     AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"], [
         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)
         ])
+    fi
 
     dnl ========================================================
     dnl = Check for XShm
     dnl ========================================================
     AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
         $XLIBS $XEXT_LIBS)
 
     dnl ========================================================
@@ -3450,17 +3452,16 @@ gtk2)
 
 qt)
     MOZ_ENABLE_QT=1
     if test -z "$WITHOUT_X11"; then
       MOZ_ENABLE_XREMOTE=1
       MOZ_GL_DEFAULT_PROVIDER=GLX
       MOZ_X11=1
       AC_DEFINE(MOZ_X11)
-      XT_LIBS=
     fi
 
     USE_FC_FREETYPE=1
     MOZ_PDF_PRINTING=1
     AC_DEFINE(QT_NO_KEYWORDS)
     ;;
 
 cocoa)