diff options
| author | Keith Packard <keithp@keithp.com> | 2013-03-18 11:18:58 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-03-18 11:18:58 -0700 |
| commit | 116f020102fd6c2a603069a639b113dfa31b48b7 (patch) | |
| tree | 6255896d3cfc86be4cb4bc12443374eb38e6e3d7 /configure.ac | |
| parent | cf89aa53748b964f9d9eceaa12a7d6f1a076d1ee (diff) | |
| parent | 0f537da72d414ed84e3cd14e3bb7e08565136bd7 (diff) | |
Merge remote-tracking branch 'whot/next'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d221de766..43b1638f6 100644 --- a/configure.ac +++ b/configure.ac @@ -308,6 +308,13 @@ 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. @@ -1336,7 +1343,7 @@ AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then DIX_LIB='$(top_builddir)/dix/dix.O' - OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)' + OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS) $(LIBUNWIND_LIBS)' else DIX_LIB='$(top_builddir)/dix/libdix.la' OS_LIB='$(top_builddir)/os/libos.la' |