From e631f2d977f65d7fd8a53eca07f7995c6dd2db7e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 19 Apr 2016 07:05:36 +0000 Subject: [PATCH] Prevented option --version-script with linker runs of binaries. By Matthias Klose. --- Makefile.am | 2 +- acinclude.m4 | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index fea6ec5..b673fd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ ACLOCAL_AMFLAGS = -I ./ # Build libraries libburn_libburn_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LIBLDFLAGS) # This causes undesired .o names # configure.ac appends -D options to variable CFLAG ### libburn_libburn_la_CFLAGS = $(LIBBURN_DVD_OBS_64K) diff --git a/acinclude.m4 b/acinclude.m4 index abada8e..ba7fcad 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -56,12 +56,14 @@ AC_DEFUN([LIBBURN_ASSERT_VERS_LIBS], LDFLAGS="$LDFLAGS -Wl,--version-script=libburn/libburn.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=libburn/libburn.ver" fi + LDFLAGS="$libburnia_save_LDFLAGS" + AC_SUBST(LIBLDFLAGS) ]) - + dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file. dnl Important: Must be performed _after_ TARGET_SHIZZLE