--- a/old-configure.in
+++ b/old-configure.in
@@ -1481,39 +1481,41 @@ XLIBS="$X_EXTRA_LIBS"
dnl ========================================================
dnl Checks for X libraries.
dnl Ordering is important.
dnl Xt is dependent upon SM as of X11R6
dnl ========================================================
if test -n "$MOZ_X11"; then
AC_DEFINE_UNQUOTED(FUNCPROTO,15)
- XLIBS="-lX11-xcb -lX11 -lxcb-shm -lxcb $XLIBS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
- AC_CHECK_LIB(X11, XDrawLines, [X11_LIBS="-lX11"],
+ AC_CHECK_LIB(X11, XDrawLines, [XLIBS="-lX11 $XLIBS"],
[MISSING_X="$MISSING_X -lX11"], $XLIBS)
AC_CHECK_LIB(Xext, XextAddDisplay, [XEXT_LIBS="-lXext"],
[MISSING_X="$MISSING_X -lXext"], $XLIBS)
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)
])
dnl ========================================================
dnl = Check for xcb
dnl ========================================================
- 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)
+ AC_CHECK_LIB(xcb, xcb_connect, [XLIBS="-lxcb $XLIBS"],
+ [MISSING_X="$MISSING_X -lxcb"], $XLIBS)
+ AC_CHECK_LIB(xcb-shm, xcb_shm_query_version, [XLIBS="-lxcb-shm $XLIBS"],
+ [MISSING_X="$MISSING_X -lxcb-shm"], $XLIBS)
+ AC_CHECK_LIB(X11-xcb, XGetXCBConnection, [XLIBS="-lX11-xcb $XLIBS"],
+ [MISSING_X="$MISSING_X -lX11-xcb"], $XLIBS)
dnl ========================================================
dnl = Check for Xss
dnl ========================================================
MOZ_CHECK_HEADER(X11/extensions/scrnsaver.h,
AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,
[XSS_LIBS="-lXss $XEXT_LIBS $XLIBS"
AC_DEFINE(HAVE_LIBXSS)],, $XEXT_LIBS $XLIBS))