ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unix/configure: Add some libraries needed to detect X11 in some cases

This commit is contained in:
GOUJON Alexandre 2013-07-19 11:59:10 +02:00
parent 3b5dfdf788
commit cb1d871513
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unix/configure vendored
View File

@ -4958,7 +4958,7 @@ if ${ac_cv_lib_Xext_XShmAttach+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS" LIBS="-lXext -lX11 -lxcb -lXau -lXdmcp $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -5062,6 +5062,7 @@ fi
# Check X11 # Check X11
LIBS="-lxcb -lXau -lXdmcp"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
$as_echo_n "checking for X... " >&6; } $as_echo_n "checking for X... " >&6; }

4
unix/configure.ac
View File

@ -262,7 +262,8 @@ AC_CACHE_VAL([snes9x_cv_Xext],
AC_CHECK_HEADER([X11/extensions/XShm.h], AC_CHECK_HEADER([X11/extensions/XShm.h],
[AC_CHECK_LIB([Xext], [XShmAttach], [AC_CHECK_LIB([Xext], [XShmAttach],
[snes9x_cv_Xext="yes"], [snes9x_cv_Xext="yes"],
[snes9x_cv_Xext="no"])], [snes9x_cv_Xext="no"],
[-lX11 -lxcb -lXau -lXdmcp])],
[snes9x_cv_Xext="no"],[#include <X11/Xlib.h>]) [snes9x_cv_Xext="no"],[#include <X11/Xlib.h>])
]) ])
@ -303,6 +304,7 @@ AC_CHECK_FUNC([mkstemp],
# Check X11 # Check X11
LIBS="-lxcb -lXau -lXdmcp"
AC_PATH_XTRA AC_PATH_XTRA
if test "x$no_x" = "xyes"; then if test "x$no_x" = "xyes"; then
AC_MSG_ERROR([X11 is required.]) AC_MSG_ERROR([X11 is required.])