diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-19 07:52:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-19 07:52:09 +0100 |
| commit | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (patch) | |
| tree | 99d99330efd4e8270d3c40a58a3b1576d9780f75 /xorg-server | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.tar.gz vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.tar.bz2 vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.zip | |
libxcb xcb-proto xserver mesa git update 19 nov 2013
xserver commit da9997f89f14ab619f244d5b2e80a423b028c789
libxcb commit 5d1dbb468bb0f834eaa8adea6daf6729808ca429
libxcb/xcb-proto commit 281790373e625cc1e9f67b39fe0d687f279edbfb
mesa commit 21ae5135dd30bbd2ec7d2b44e07b6cb1d6425d9e
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/configure.ac | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 1e6f813d8..2f4edee54 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -305,13 +305,6 @@ AC_CHECK_HEADER([execinfo.h],[ ])] ) -PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no]) -if test "x$HAVE_LIBUNWIND" = xyes; then - AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) -fi -AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes]) - - dnl --------------------------------------------------------------------------- dnl Bus options and CPU capabilities. Replaces logic in dnl hw/xfree86/os-support/bus/Makefile.am, among others. @@ -654,6 +647,7 @@ dnl kdrive options AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: auto)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=auto]) AC_ARG_ENABLE(kdrive-mouse, AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) AC_ARG_ENABLE(kdrive-evdev, AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) +AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) dnl chown/chmod to be setuid root as part of build @@ -1616,6 +1610,20 @@ AC_SUBST(SHA1_CFLAGS) PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) +PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no]) +if test "x$LIBUNWIND" = "xauto"; then + LIBUNWIND="$HAVE_LIBUNWIND" +fi + +if test "x$LIBUNWIND" = "xyes"; then + if test "x$HAVE_LIBUNWIND" != "xyes"; then + AC_MSG_ERROR([libunwind requested but not installed.]) + fi + AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) +fi + +AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$LIBUNWIND" = xyes]) + # Autotools has some unfortunate issues with library handling. In order to # get a server to rebuild when a dependency in the tree is changed, it must # be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be |