Link with xshmfence, reference miSyncShmScreenInit in sdksyms

This gets the server to link with xshmfence again, and also ensures
that the miSyncShm code is linked into the server with the reference
from sdksyms.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2013-11-05 18:37:12 -08:00
parent 5f1e832694
commit f348935e7d
4 changed files with 10 additions and 0 deletions

View File

@ -1144,6 +1144,7 @@ AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
case x"$HAVE_XSHMFENCE" in
xyes)
AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library])
REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
;;
esac

View File

@ -44,6 +44,9 @@ cat > sdksyms.c << EOF
/* miext/sync/Makefile.am */
#include "misync.h"
#include "misyncstr.h"
#if HAVE_XSHMFENCE
#include "misyncshm.h"
#endif
/* Xext/Makefile.am -- half is module, half is builtin */
#ifdef XV

View File

@ -449,4 +449,7 @@
#include "dix-config-apple-verbatim.h"
#endif
/* Have support for X shared memory fence library (xshmfence) */
#undef HAVE_XSHMFENCE
#endif /* _DIX_CONFIG_H_ */

View File

@ -145,4 +145,7 @@
/* Support APM/ACPI power management in the server */
#undef XF86PM
/* Have support for X shared memory fence library (xshmfence) */
#undef HAVE_XSHMFENCE
#endif /* _XORG_CONFIG_H_ */