From eb09bcf9e5e263eb4ad48ca20cc09e5db299566e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 19 Apr 2016 09:17:34 +0200 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 18d5d9a..37a7b15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ ACLOCAL_AMFLAGS = -I ./ # Build libraries libisofs_libisofs_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LIBLDFLAGS) # Eventually enabling system adapters for ACL and EA. # ts A90409: Eventually enabling use of zlib. diff --git a/acinclude.m4 b/acinclude.m4 index fcf56bb..a6d875c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -147,10 +147,12 @@ AC_DEFUN([LIBISOFS_ASSERT_VERS_LIBS], LDFLAGS="$LDFLAGS -Wl,--version-script=libisofs/libisofs.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=libisofs/libisofs.ver" fi + LDFLAGS="$libburnia_save_LDFLAGS" + AC_SUBST(LIBLDFLAGS) ])