Prevented option --version-script with linker runs of binaries. By Matthias Klose.

This commit is contained in:
Thomas Schmitt 2016-04-19 07:05:36 +00:00
parent c811a436f5
commit 07007f99d6
2 changed files with 6 additions and 4 deletions

View File

@ -12,7 +12,7 @@ ACLOCAL_AMFLAGS = -I ./
# Build libraries # Build libraries
libburn_libburn_la_LDFLAGS = \ 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 # This causes undesired .o names
# configure.ac appends -D options to variable CFLAG # configure.ac appends -D options to variable CFLAG
### libburn_libburn_la_CFLAGS = $(LIBBURN_DVD_OBS_64K) ### libburn_libburn_la_CFLAGS = $(LIBBURN_DVD_OBS_64K)

View File

@ -56,12 +56,14 @@ AC_DEFUN([LIBBURN_ASSERT_VERS_LIBS],
LDFLAGS="$LDFLAGS -Wl,--version-script=libburn/libburn.ver" LDFLAGS="$LDFLAGS -Wl,--version-script=libburn/libburn.ver"
AC_TRY_LINK([#include <stdio.h>], [printf("Hello\n");], AC_TRY_LINK([#include <stdio.h>], [printf("Hello\n");],
[vers_libs_test="yes"], [vers_libs_test="no"]) [vers_libs_test="yes"], [vers_libs_test="no"])
if test x$vers_libs_test = xno if test x$vers_libs_test = xyes
then then
LDFLAGS="$libburnia_save_LDFLAGS" LIBLDFLAGS="-Wl,--version-script=libburn/libburn.ver"
fi fi
LDFLAGS="$libburnia_save_LDFLAGS"
AC_SUBST(LIBLDFLAGS)
]) ])
dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file. dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file.
dnl Important: Must be performed _after_ TARGET_SHIZZLE dnl Important: Must be performed _after_ TARGET_SHIZZLE