Attachment #225091 for bug #311071

View | Details | Raw Unified | Return to bug 311071
Collapse All | Expand All




                 [ X_LIBS="-lXext $X_LIBS";
                   LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)

    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                 HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
    		 HAVE_XEXTPROTO_71="no")

    if test x"$HAVE_XEXTPROTO_71" = "xyes"; then
      AM_CONDITIONAL(HAVE_XEXTPROTO_71, true)
    else
      AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
    fi

    AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
    AC_TRY_LINK([#include <X11/Xlib.h>
                 #include <X11/extensions/Xvlib.h>],

Lines 56-61 Link Here

(-)vice-2.2.orig/src/arch/unix/x11/xaw/x11video.c (+5 lines)
56	#include "vice.h"	56	#include "vice.h"
57		57
58	#include <X11/Xlib.h>	58	#include <X11/Xlib.h>
		59	#include <X11/Xlibint.h>
59	#include <X11/Xutil.h>	60	#include <X11/Xutil.h>
60	#include <X11/Intrinsic.h>	61	#include <X11/Intrinsic.h>
61	#include <X11/cursorfont.h>	62	#include <X11/cursorfont.h>
Lines 95-100 Link Here
95	#endif	96	#endif
96		97
97	#ifdef USE_MITSHM	98	#ifdef USE_MITSHM
		99	#ifdef HAVE_XEXTPROTO_71
		100	#include <X11/extensions/shmproto.h>
		101	#include <X11/extensions/XShm.h>
		102	#endif
98	extern int shmhandler(Display* display, XErrorEvent* err);	103	extern int shmhandler(Display* display, XErrorEvent* err);
99	extern int mitshm_failed; /* will be set to true if XShmAttach() failed */	104	extern int mitshm_failed; /* will be set to true if XShmAttach() failed */
100	extern int shmmajor; /* major number of MITSHM error codes */	105	extern int shmmajor; /* major number of MITSHM error codes */

Return to bug 311071

Lines 2192-2197 Link Here

(-)vice-2.2.orig/configure.in (+10 lines)
2192	[ X_LIBS="-lXext $X_LIBS";	2192	[ X_LIBS="-lXext $X_LIBS";
2193	LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)	2193	LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
2194		2194
		2195	PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
		2196	HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
		2197	HAVE_XEXTPROTO_71="no")
		2198
		2199	if test x"$HAVE_XEXTPROTO_71" = "xyes"; then
		2200	AM_CONDITIONAL(HAVE_XEXTPROTO_71, true)
		2201	else
		2202	AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
		2203	fi
		2204
2195	AC_MSG_CHECKING(for X11/extensions/Xvlib.h)	2205	AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
2196	AC_TRY_LINK([#include <X11/Xlib.h>	2206	AC_TRY_LINK([#include <X11/Xlib.h>
2197	#include <X11/extensions/Xvlib.h>],	2207	#include <X11/extensions/Xvlib.h>],