From cb1d8715138e39ec7f845c892f3d37bf5c46db1f Mon Sep 17 00:00:00 2001 From: GOUJON Alexandre Date: Fri, 19 Jul 2013 11:59:10 +0200 Subject: [PATCH] unix/configure: Add some libraries needed to detect X11 in some cases --- unix/configure | 3 ++- unix/configure.ac | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/unix/configure b/unix/configure index 8cb710a8..e968d780 100755 --- a/unix/configure +++ b/unix/configure @@ -4958,7 +4958,7 @@ if ${ac_cv_lib_Xext_XShmAttach+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $LIBS" +LIBS="-lXext -lX11 -lxcb -lXau -lXdmcp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5062,6 +5062,7 @@ fi # Check X11 +LIBS="-lxcb -lXau -lXdmcp" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } diff --git a/unix/configure.ac b/unix/configure.ac index ae870f2d..7ddd0175 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -262,7 +262,8 @@ AC_CACHE_VAL([snes9x_cv_Xext], AC_CHECK_HEADER([X11/extensions/XShm.h], [AC_CHECK_LIB([Xext], [XShmAttach], [snes9x_cv_Xext="yes"], - [snes9x_cv_Xext="no"])], + [snes9x_cv_Xext="no"], + [-lX11 -lxcb -lXau -lXdmcp])], [snes9x_cv_Xext="no"],[#include ]) ]) @@ -303,6 +304,7 @@ AC_CHECK_FUNC([mkstemp], # Check X11 +LIBS="-lxcb -lXau -lXdmcp" AC_PATH_XTRA if test "x$no_x" = "xyes"; then AC_MSG_ERROR([X11 is required.])