From c1d9639dba2a7c33bb4a161c0ae993b15c5651fc Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 24 Nov 2019 13:19:07 +0100 Subject: [PATCH] Switched to usage of libjte-2.0.0 --- configure.ac | 14 +++++++------- libisofs/libisofs.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 15df483..09a08a8 100644 --- a/configure.ac +++ b/configure.ac @@ -50,11 +50,11 @@ AC_SUBST(LIBISOFS_MICRO_VERSION) AC_SUBST(LIBISOFS_VERSION) dnl Libtool versioning -LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION -# 2019.10.24 development jump has not yet happened -# SONAME = 94 - 88 = 6 . Library name = libisofs.6.88.0 -LT_CURRENT=94 -LT_AGE=88 +dnl LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION +dnl 2019.11.23 development jump has happened +dnl SONAME = 95 - 89 = 6 . Library name = libisofs.6.89.0 +LT_CURRENT=95 +LT_AGE=89 LT_REVISION=0 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` @@ -307,11 +307,11 @@ AC_SUBST(ZLIB_DEF) dnl ts B00927 AC_ARG_ENABLE(libjte, -[ --enable-libjte Enable use of libjte by libisofs, default=yes], +[ --enable-libjte Enable use of libjte >= 2.0 by libisofs, default=yes], , enable_libjte=yes) if test "x$enable_libjte" = xyes; then LIBJTE_DEF="-DLibisofs_with_libjtE" - AC_CHECK_HEADER(libjte/libjte.h, AC_CHECK_LIB(jte, libjte_new, , LIBJTE_DEF= ), LIBJTE_DEF= ) + AC_CHECK_HEADER(libjte/libjte.h, AC_CHECK_LIB(jte, libjte_set_checksum_algorithm, , LIBJTE_DEF= ), LIBJTE_DEF= ) else LIBJTE_DEF= fi diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index 825db9e..291555b 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -2393,7 +2393,7 @@ int iso_write_opts_set_part_offset(IsoWriteOpts *opts, tests. It can be prevented by ./configure option --disable-libjte . @since 0.6.38 */ -#define iso_libjte_req_major 1 +#define iso_libjte_req_major 2 #define iso_libjte_req_minor 0 #define iso_libjte_req_micro 0