From c0e51f774c8c3c0ee763e166fd4534624966edcf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 30 Mar 2020 06:27:13 +0300 Subject: Enable libbacktrace by default only on Linux --- configure | 25 +++++++++++++++++-------- configure.ac | 19 ++++++++++++++----- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 9d65cdeb8..e3a8cc99a 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac 4cda256c4. +# From configure.ac 7c9af5bf8. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -3517,8 +3517,13 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host OS" >&5 +$as_echo_n "checking host OS... " >&6; } +host_os="`uname`" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $host_os" >&5 +$as_echo "$host_os" >&6; } + # Root-check -host_is="`uname`" case $host_os in CYGWIN*) ;; @@ -3812,7 +3817,16 @@ if test "${enable_libbacktrace+set}" = set; then : esac else - enable_libbacktrace="no" + + case $host_os in + Linux* ) + enable_libbacktrace="yes" + ;; + *) + enable_libbacktrace="no" + ;; + esac + fi @@ -9109,11 +9123,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # # Host specific stuff # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host OS" >&5 -$as_echo_n "checking host OS... " >&6; } -host_os="`uname`" -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $host_os" >&5 -$as_echo "$host_os" >&6; } fd_setsize="" DLLEXT=".so" case $host_os in diff --git a/configure.ac b/configure.ac index e13fc4b6c..df3da8266 100644 --- a/configure.ac +++ b/configure.ac @@ -38,8 +38,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE] ) +AC_MSG_CHECKING([host OS]) +host_os="`uname`" +AC_MSG_RESULT([$host_os]) + # Root-check -host_is="`uname`" case $host_os in CYGWIN*) ;; @@ -330,7 +333,16 @@ AC_ARG_ENABLE( *) AC_MSG_ERROR([[invalid argument --enable-libbacktrace=$enableval... stopping]]);; esac ], - [enable_libbacktrace="no"] + [ + case $host_os in + Linux* ) + enable_libbacktrace="yes" + ;; + *) + enable_libbacktrace="no" + ;; + esac + ] ) # @@ -1698,9 +1710,6 @@ AC_CHECK_FLAG(-fno-var-tracking) # # Host specific stuff # -AC_MSG_CHECKING([host OS]) -host_os="`uname`" -AC_MSG_RESULT([$host_os]) fd_setsize="" DLLEXT=".so" case $host_os in -- cgit v1.2.3-70-g09d2