From e9e73948674fa5b19ea4e07da9fe59abdb08a7b2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 19 Apr 2016 06:45:07 +0000 Subject: [PATCH] Prevented option --version-script with linker run of xorriso. By Matthias Klose. --- Makefile.am | 2 +- acinclude.m4 | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index b78120c8..4b77d3ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ ACLOCAL_AMFLAGS = -I ./ # Build libraries libisoburn_libisoburn_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LIBLDFLAGS) libisoburn_libisoburn_la_SOURCES = \ libisoburn/isoburn.h \ libisoburn/libisoburn.h \ diff --git a/acinclude.m4 b/acinclude.m4 index 8e7f6568..d38be8a7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -270,10 +270,12 @@ AC_DEFUN([LIBISOBURN_ASSERT_VERS_LIBS], LDFLAGS="$LDFLAGS -Wl,--version-script=libisoburn/libisoburn.ver" AC_TRY_LINK([#include ], [printf("Hello\n");], [vers_libs_test="yes"], [vers_libs_test="no"]) - if test x$vers_libs_test = xno + if test x$vers_libs_test = xyes then - LDFLAGS="$libburnia_save_LDFLAGS" + LIBLDFLAGS="-Wl,--version-script=libisoburn/libisoburn.ver" fi + LDFLAGS="$libburnia_save_LDFLAGS" + AC_SUBST(LIBLDFLAGS) ])