From 9f41e03278adfbf36e3b7056a75ebe2f1770d05d Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Sat, 5 Sep 2020 10:50:24 -0400 Subject: [PATCH] Fix up libtool version-info logic --- configure.ac | 10 +++++++++- src/libmdb/Makefile.am | 2 +- src/sql/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6e48060..2840d6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,18 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([mdbtools],[0.8.2],[mdbtools-dev@lists.sourceforge.net]) +AC_INIT([mdbtools],[0.9.0-beta],[https://github.com/mdbtools/mdbtools/issues],[],[https://github.com/mdbtools/mdbtools]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR(src/extras/mdb-dump.c) AM_INIT_AUTOMAKE +MDBTOOLS_VERSION_MAJOR=0 +MDBTOOLS_VERSION_MINOR=9 +MDBTOOLS_VERSION_MICRO=0 + +# Update this logic when the major version changes +VERSION_INFO=`expr $MDBTOOLS_VERSION_MINOR - 6`:$MDBTOOLS_VERSION_MICRO +AC_SUBST(VERSION_INFO) + AM_MAINTAINER_MODE([enable]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/src/libmdb/Makefile.am b/src/libmdb/Makefile.am index 26f54a5..6fd0ac6 100644 --- a/src/libmdb/Makefile.am +++ b/src/libmdb/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libmdb.la libmdb_la_SOURCES= catalog.c mem.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c version.c -libmdb_la_LDFLAGS = -version-info 2:1:0 +libmdb_la_LDFLAGS = -version-info $(VERSION_INFO) if FAKE_GLIB libmdb_la_SOURCES += fakeglib.c libmdb_la_LDFLAGS += -export-symbols-regex '^(g_|mdb_|_mdb_put_int16$$|_mdb_put_int32$$)' diff --git a/src/sql/Makefile.am b/src/sql/Makefile.am index 71a8b4f..cee0dd0 100644 --- a/src/sql/Makefile.am +++ b/src/sql/Makefile.am @@ -3,7 +3,7 @@ BUILT_SOURCES = parser.h AM_YFLAGS = -d -o parser.c lib_LTLIBRARIES = libmdbsql.la libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l -libmdbsql_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^mdb_sql_' +libmdbsql_la_LDFLAGS = -version-info $(VERSION_INFO) -export-symbols-regex '^mdb_sql_' CLEANFILES = parser.c parser.h lexer.c AM_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) LIBS = $(GLIB_LIBS)