@@ -100,12 +100,12 @@ check_DATA =
# Flags to use when compiling test programs.
libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
%.dSYM: %
$(DSYMUTIL) $<
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
if NATIVE
check_LTLIBRARIES = libbacktrace_alloc.la
@@ -237,9 +237,9 @@ allocfail.sh: allocfail
TESTS += allocfail.sh
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += allocfail.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
if HAVE_ELF
if HAVE_OBJCOPY_DEBUGLINK
@@ -273,9 +273,9 @@ btest_LDADD = libbacktrace.la
BUILDTESTS += btest
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += btest.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
if HAVE_ELF
@@ -293,9 +293,9 @@ btest_alloc_LDADD = libbacktrace_alloc.la
BUILDTESTS += btest_alloc
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += btest_alloc.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
if HAVE_DWZ
@@ -323,9 +323,9 @@ stest_LDADD = libbacktrace.la
BUILDTESTS += stest
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += stest.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
stest_alloc_SOURCES = $(stest_SOURCES)
stest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
@@ -333,9 +333,9 @@ stest_alloc_LDADD = libbacktrace_alloc.la
BUILDTESTS += stest_alloc
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += stest_alloc.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
if HAVE_ELF
@@ -366,17 +366,17 @@ edtest_LDADD = libbacktrace.la
BUILDTESTS += edtest
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += edtest.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
edtest_alloc_SOURCES = $(edtest_SOURCES)
edtest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
edtest_alloc_LDADD = libbacktrace_alloc.la
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += edtest_alloc.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
BUILDTESTS += edtest_alloc
@@ -394,9 +394,9 @@ ttest_SOURCES = ttest.c testlib.c
ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread
ttest_LDADD = libbacktrace.la
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += ttest.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
BUILDTESTS += ttest_alloc
@@ -404,9 +404,9 @@ ttest_alloc_SOURCES = $(ttest_SOURCES)
ttest_alloc_CFLAGS = $(ttest_CFLAGS)
ttest_alloc_LDADD = libbacktrace_alloc.la
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += ttest_alloc.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
endif HAVE_PTHREAD
@@ -462,9 +462,9 @@ dwarf5_LDADD = libbacktrace.la
BUILDTESTS += dwarf5
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += dwarf5.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
dwarf5_alloc_SOURCES = $(dwarf5_SOURCES)
dwarf5_alloc_CFLAGS = $(dwarf5_CFLAGS)
@@ -472,9 +472,9 @@ dwarf5_alloc_LDADD = libbacktrace_alloc.la
BUILDTESTS += dwarf5_alloc
-if HAVE_DSYMUTIL
+if USE_DSYMUTIL
check_DATA += dwarf5_alloc.dSYM
-endif HAVE_DSYMUTIL
+endif USE_DSYMUTIL
endif
@@ -510,7 +510,7 @@ AM_CONDITIONAL(HAVE_OBJCOPY_DEBUGLINK, test "$libbacktrace_cv_objcopy_debuglink"
AC_ARG_VAR(DSYMUTIL, [location of dsymutil])
AC_CHECK_PROG(DSYMUTIL, dsymutil, dsymutil)
-AM_CONDITIONAL(HAVE_DSYMUTIL, test -n "${DSYMUTIL}")
+AM_CONDITIONAL(USE_DSYMUTIL, test -n "${DSYMUTIL}" -a "$FORMAT_FILE" = "macho.lo")
AC_ARG_VAR(NM, [location of nm])
AC_CHECK_PROG(NM, nm, nm)