File 0001-build-fixes.patch of Package libosmo-sccp

diff --git a/configure.ac b/configure.ac
index 322a57a..39c51d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
 fi
 PKG_PROG_PKG_CONFIG([0.20])
 
+PKG_CHECK_MODULES([TALLOC], [talloc])
 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0)
diff --git a/libosmo-mtp.pc.in b/libosmo-mtp.pc.in
index 675d0d3..5e99dd3 100644
--- a/libosmo-mtp.pc.in
+++ b/libosmo-mtp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: Osmo MTP Lib
 Description: Osmo MTP Lib
 Version: @VERSION@
-Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp
 Cflags: -I${includedir}/
diff --git a/libosmo-sccp.pc.in b/libosmo-sccp.pc.in
index eda8d49..9dd18c1 100644
--- a/libosmo-sccp.pc.in
+++ b/libosmo-sccp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: OpenBSC SCCP Lib
 Description: OpenBSC SCCP Lib
 Version: @VERSION@
-Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp
 Cflags: -I${includedir}/
diff --git a/src/Makefile.am b/src/Makefile.am
index be6442d..a0bf185 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,15 +13,21 @@ noinst_HEADERS = \
 # Legacy static libs
 
 sccpdir = $(libdir)
-sccp_LIBRARIES = libsccp.a libmtp.a libxua.a
+sccp_LTLIBRARIES = libosmo-sccp.la libosmo-mtp.la libosmo-xua.la
 
-libsccp_a_SOURCES = sccp.c
-libmtp_a_SOURCES = mtp_pcap.c
-libxua_a_SOURCES = xua_msg.c
+libosmo_sccp_la_SOURCES = sccp.c
+libosmo_mtp_la_SOURCES = mtp_pcap.c
+libosmo_xua_la_SOURCES = xua_msg.c
 # ensure that the file for the static lib is built with different C
 # flags, working around automake complaining that xua_msg.o is built
 # both with libtool (below) and without (here)
-libxua_a_CPPFLAGS = $(AM_CPPFLAGS) -DDUMMY -UDUMMY
+libosmo_xua_la_CPPFLAGS = ${AM_CPPFLAGS} -DDUMMY -UDUMMY
+
+libosmo_sccp_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS)
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_xua_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS)
+libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION}
 
 
 # New shared lib
diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am
index 6f060c4..725ceee 100644
--- a/tests/m2ua/Makefile.am
+++ b/tests/m2ua/Makefile.am
@@ -6,4 +6,4 @@ EXTRA_DIST = m2ua_test.ok
 
 check_PROGRAMS = m2ua_test
 m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am
index fc4f0c8..0d34b0e 100644
--- a/tests/sccp/Makefile.am
+++ b/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
 AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
 AM_LDFLAGS = -no-install
 
@@ -10,5 +10,6 @@ sccp_test_SOURCES = sccp_test.c
 sccp_test_LDADD = \
 	$(LIBOSMOCORE_LIBS) \
 	$(top_builddir)/src/sccp.o \
+        ${TALLOC_LIBS} \
 	$(NULL)
 
diff --git a/tests/ss7/Makefile.am b/tests/ss7/Makefile.am
index ecc69e0..5b65295 100644
--- a/tests/ss7/Makefile.am
+++ b/tests/ss7/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-AM_LDFLAGS = -static -no-install
+AM_LDFLAGS = -no-install
 LDADD = $(top_builddir)/src/libosmo-sigtran.la \
 	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
 
diff --git a/tests/xua/Makefile.am b/tests/xua/Makefile.am
index 546039c..a2a44da 100644
--- a/tests/xua/Makefile.am
+++ b/tests/xua/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-AM_LDFLAGS = -static -no-install
+AM_LDFLAGS = -no-install
 LDADD = $(top_builddir)/src/libosmo-sigtran.la \
 	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)