Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1286649 - Replace X11 SHM dependencies with XCB. r=glandium

Browse Source 
MozReview-Commit-ID: Ii74rWquYhb

--HG--
extra : rebase_source : 3d5ba8333e6598d4940958920ea3271ad78c6785
This commit is contained in:
Andrew Comminos 2016-07-13 16:28:07 -04:00
parent 65b0fd2d1d
commit 7d69ebf641
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/system-headers
View File

@ -1210,6 +1210,8 @@ wx/log.h
wx/toolbar.h
wx/wx.h
wx/xrc/xmlres.h
xcb/xcb.h
xcb/shm.h
X11/cursorfont.h
X11/extensions/Print.h
X11/extensions/shape.h
@ -1231,6 +1233,7 @@ X11/X.h
X11/XKBlib.h
X11/Xlib.h
X11/Xlibint.h
X11/Xlib-xcb.h
X11/Xlocale.h
X11/Xos.h
X11/Xutil.h

9
old-configure.in
View File

@ -1755,7 +1755,7 @@ dnl Xt is dependent upon SM as of X11R6
dnl ========================================================
if test -n "$MOZ_X11"; then
AC_DEFINE_UNQUOTED(FUNCPROTO,15)
XLIBS="-lX11 $XLIBS"
XLIBS="-lX11-xcb -lX11 -lxcb-shm -lxcb $XLIBS"
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
AC_CHECK_LIB(X11, XDrawLines, [X11_LIBS="-lX11"],
@ -1772,10 +1772,11 @@ if test -n "$MOZ_X11"; then
])
dnl ========================================================
dnl = Check for XShm
dnl = Check for xcb
dnl ========================================================
AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
$XLIBS $XEXT_LIBS)
AC_CHECK_LIB(X11-xcb, XGetXCBConnection,, [MISSING_X="$MISSING_X -lX11-xcb"], $XLIBS)
AC_CHECK_LIB(xcb-shm, xcb_shm_query_version,, [MISSING_X="$MISSING_X -lxcb-shm"], $XLIBS)
AC_CHECK_LIB(xcb, xcb_connect,, [MISSING_X="$MISSING_X -lxcb"], $XLIBS)
dnl ========================================================
dnl = Check for Xss