Prevented option --version-script with linker run of xorriso. By Matthias Klose.

This commit is contained in:
Thomas Schmitt 2016-04-19 09:17:34 +02:00
parent 5880636a50
commit eb09bcf9e5
2 changed files with 5 additions and 3 deletions

View File

@ -13,7 +13,7 @@ ACLOCAL_AMFLAGS = -I ./
# Build libraries # Build libraries
libisofs_libisofs_la_LDFLAGS = \ 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. # Eventually enabling system adapters for ACL and EA.
# ts A90409: Eventually enabling use of zlib. # ts A90409: Eventually enabling use of zlib.

View File

@ -147,10 +147,12 @@ AC_DEFUN([LIBISOFS_ASSERT_VERS_LIBS],
LDFLAGS="$LDFLAGS -Wl,--version-script=libisofs/libisofs.ver" LDFLAGS="$LDFLAGS -Wl,--version-script=libisofs/libisofs.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=libisofs/libisofs.ver"
fi fi
LDFLAGS="$libburnia_save_LDFLAGS"
AC_SUBST(LIBLDFLAGS)
]) ])