aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-08-04 09:50:24 +0200
committerHarald Welte <laforge@osmocom.org>2020-08-04 09:51:37 +0200
commitdbb429cfd303fb96cbef96767ed92ad53dd51425 (patch)
tree1628dd8076b54be3780bd1a3b260dedd5230088a
parent04fe6b5f0534673255b8592fde50ff2860d8a541 (diff)
Add missing build dependency to libosmocodec-dev
Since I0190872dd282bcfe0f97bb4f8ab8d09023f9f06b we are using a header file provided by libosmocodec, which means we need to add it to our dependencies (and include path). Linking against the library is not required, as we don't use any symbols at this point. Change-Id: Ie4524165d8873f6c801e07d9f03c94f43c66110d
-rw-r--r--configure.ac1
-rw-r--r--contrib/libosmo-abis.spec.in1
-rw-r--r--src/Makefile.am4
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 04ffca6..d24010e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ AM_CONFIG_HEADER(config.h)
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0)
+PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.1.0)
PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0)
AC_ARG_ENABLE([dahdi],
diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in
index da0c2d8..abde676 100644
--- a/contrib/libosmo-abis.spec.in
+++ b/contrib/libosmo-abis.spec.in
@@ -30,6 +30,7 @@ BuildRequires: xz
BuildRequires: pkgconfig(libosmocore) >= 1.1.0
BuildRequires: pkgconfig(libosmogsm) >= 1.1.0
BuildRequires: pkgconfig(libosmovty) >= 1.1.0
+BuildRequires: pkgconfig(libosmocodec) >= 1.1.0
BuildRequires: pkgconfig(ortp) >= 0.22
BuildRequires: pkgconfig(talloc)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4254428..f5dd865 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,9 @@ ABIS_LIBVERSION=8:0:2
TRAU_LIBVERSION=4:0:2
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
-COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS)
+COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS) # libosmocodec not [yet] needed here
lib_LTLIBRARIES = libosmoabis.la libosmotrau.la