Change libX11 variables to not conflict with AC_PATH_XTRA