Bug 1287325 - Prevent AC_CHECK_LIB from polluting LIBS after
bug 1286649. r?glandium
MozReview-Commit-ID: 2lvje6y30Ge
--- a/old-configure.in
+++ b/old-configure.in
@@ -1752,16 +1752,17 @@ 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"],
[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
@@ -1782,16 +1783,17 @@ if test -n "$MOZ_X11"; then
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))
LDFLAGS="$_SAVE_LDFLAGS"
+ LIBS="$_SAVE_LIBS"
fi # $MOZ_X11
AC_SUBST_LIST(XCFLAGS)
AC_SUBST_LIST(XLDFLAGS)
AC_SUBST_LIST(XLIBS)
AC_SUBST_LIST(XEXT_LIBS)
AC_SUBST_LIST(XT_LIBS)
AC_SUBST_LIST(XSS_LIBS)