diff --git a/libisoburn/trunk/acinclude.m4 b/libisoburn/trunk/acinclude.m4 index ac77517a..73039746 100644 --- a/libisoburn/trunk/acinclude.m4 +++ b/libisoburn/trunk/acinclude.m4 @@ -193,6 +193,21 @@ AC_DEFUN([LIBBURNIA_ASSERT_READLINE], ]) +dnl LIBISOBURN_ASSERT_VERS_LIBS is by Thomas Schmitt, libburnia project +dnl It tests whether -Wl,--version-script=... works with the compiler +AC_DEFUN([LIBISOBURN_ASSERT_VERS_LIBS], +[ + libburnia_save_LDFLAGS="$LDFLAGS" + 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 + then + LDFLAGS="$libburnia_save_LDFLAGS" + fi +]) + + dnl LIBBURNIA_SET_PKGCONFIG is by Thomas Schmitt, libburnia project dnl It determines the install directory for the *.pc file. dnl Important: Must be performed _after_ TARGET_SHIZZLE diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index 070483b9..3ecddc67 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -251,22 +251,22 @@ else fi AC_SUBST(XORRISO_DVD_OBS_64K) -dnl ts B00705 # Library versioning normally serves a complex purpose. # Since libisoburn obeys strict ABI backward compatibility, it needs only the # simple feature to declare function names "global:" or "local:". Only the # global ones are visible to applications at library load time. -dnl -dnl >>> TODO: -dnl >>> make an actual try whether -Wl,--version-script=libburn/libburn.ver -dnl >>> is accepted by the compiler -dnl AC_ARG_ENABLE(versioned-libs, [ --enable-versioned-libs Enable strict symbol encapsulation , default=yes], , enable_versioned_libs=yes) if test x$enable_versioned_libs = xyes; then - LDFLAGS="$LDFLAGS -Wl,--version-script=libisoburn/libisoburn.ver" - echo "enabled strict symbol encapsulation" + vers_libs_test=no + LIBISOBURN_ASSERT_VERS_LIBS + if test x$vers_libs_test = xno + then + echo "disabled strict symbol encapsulation (test failed)" + else + echo "enabled strict symbol encapsulation" + fi else echo "disabled strict symbol encapsulation" fi diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 8cf97e2c..9d7cb8dd 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.07.05.122901" +#define Xorriso_timestamP "2010.07.06.114102"