[Pkg-bitcoin-commits] [libunivalue] 35/76: Add LT_INIT marco to autoconf script, required for -fPIC builds

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libunivalue.

commit 5b312dc577fa0ba3d742b3aa2f094013a9451f6f
Author: Jonas Schnelli <jonas.schnelli at include7.ch>
Date:   Mon Sep 7 16:46:52 2015 +0200

    Add LT_INIT marco to autoconf script, required for -fPIC builds
---
 configure.ac     | 32 ++++++++++++++++++++++++++++++++
 lib/Makefile.am  |  8 ++++++--
 test/Makefile.am |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index f33b057..c7f72ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,19 @@
+m4_define([libunivalue_major_version], [1])
+m4_define([libunivalue_minor_version], [1])
+m4_define([libunivalue_micro_version], [1])
+m4_define([libunivalue_interface_age], [1])
+# If you need a modifier for the version number. 
+# Normally empty, but can be used to make "fixup" releases.
+m4_define([libunivalue_extraversion], [])
+
+dnl libtool versioning from libunivalue
+m4_define([libunivalue_current], [m4_eval(100 * libunivalue_minor_version + libunivalue_micro_version - libunivalue_interface_age)])
+m4_define([libunivalue_binary_age], [m4_eval(100 * libunivalue_minor_version + libunivalue_micro_version)])
+m4_define([libunivalue_revision], [libunivalue_interface_age])
+m4_define([libunivalue_age], [m4_eval(libunivalue_binary_age - libunivalue_interface_age)])
+m4_define([libunivalue_version], [libunivalue_major_version().libunivalue_minor_version().libunivalue_micro_version()libunivalue_extraversion()])
+
+
 AC_INIT([univalue], [0.0.2],
         [http://github.com/jgarzik/univalue/])
 
@@ -6,6 +22,22 @@ AC_CONFIG_SRCDIR([lib/univalue.cpp])
 AM_INIT_AUTOMAKE([gnu])
 AC_CONFIG_HEADERS([univalue-config.h])
 
+LIBUNIVALUE_MAJOR_VERSION=libunivalue_major_version
+LIBUNIVALUE_MINOR_VERSION=libunivalue_minor_version
+LIBUNIVALUE_MICRO_VERSION=libunivalue_micro_version
+LIBUNIVALUE_INTERFACE_AGE=libunivalue_interface_age
+
+# ABI version
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+LIBUNIVALUE_CURRENT=libunivalue_current
+LIBUNIVALUE_REVISION=libunivalue_revision
+LIBUNIVALUE_AGE=libunivalue_age
+
+AC_SUBST(LIBUNIVALUE_CURRENT)
+AC_SUBST(LIBUNIVALUE_REVISION)
+AC_SUBST(LIBUNIVALUE_AGE)
+
+LT_INIT
 
 AC_PROG_CXX
 AC_PROG_CC
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a287dc6..aa4a134 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,13 +1,17 @@
 
 include_HEADERS = univalue.h univalue_escapes.h
 
-lib_LIBRARIES = libunivalue.a
+lib_LTLIBRARIES = libunivalue.la
 
-libunivalue_a_SOURCES = \
+libunivalue_la_SOURCES = \
 	univalue.cpp \
 	univalue_read.cpp \
 	univalue_write.cpp
 
+libunivalue_la_LDFLAGS = \
+	-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
+	-no-undefined
+
 noinst_PROGRAMS = gen
 
 gen_SOURCES = gen.cpp
diff --git a/test/Makefile.am b/test/Makefile.am
index b28ec57..8896975 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,7 @@ TESTS = unitester
 noinst_PROGRAMS = unitester
 
 unitester_SOURCES = unitester.cpp
-unitester_LDADD = ../lib/libunivalue.a
+unitester_LDADD = ../lib/libunivalue.la
 unitester_CXXFLAGS = -I$(top_srcdir)/lib -DJSON_TEST_SRC=\"$(top_srcdir)/test\"
 
 EXTRA_DIST = \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git