From 8a3e12b75f244c8e2cd63939abce8ca11403d739 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Thu, 9 Jul 2015 02:02:56 -0300 Subject: [PATCH] autotools: Added --disable-unwind option Added --disable-uniwnd option to allow user to disable automatically finding libunwind. This helps with compilation with -m32 without libunwind. --- configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 01c7850290..f05064ab81 100644 --- a/configure.ac +++ b/configure.ac @@ -842,8 +842,16 @@ case "${build_profile}" in ;; esac -PKG_CHECK_MODULES(UNWIND, [libunwind libunwind-generic], - [have_unwind=yes], [have_unwind=no]) +want_unwind="yes" +have_unwind="no" +AC_ARG_ENABLE([unwind], + [AS_HELP_STRING([--disable-unwind],[Disable unwind library. @<:@default=enabled@:>@])], + [want_unwind="no"], []) + +if test x"${want_unwind}" = "xyes"; then + PKG_CHECK_MODULES(UNWIND, [libunwind libunwind-generic], + [have_unwind=${want_unwind}], [have_unwind=no]) +fi AS_IF([test "x$have_unwind" = "xyes"], [AC_DEFINE([HAVE_UNWIND], [1], [Have libunwind])]) AM_CONDITIONAL(HAVE_UNWIND, test "x$have_unwind" = "xyes")