pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30733 )
Change subject: llc: add libosmogsm dependency ......................................................................
llc: add libosmogsm dependency
libosmogsm is needed for the follow-up patch [1].
Change-Id: Iee45fb87905ea29df02a48003396bde27e6c550c Related: [1] I588eb576b2703262f4ab9566ec362920d8390cfd Related: OS#5502 --- M configure.ac M contrib/libosmo-gprs.spec.in M libosmo-gprs-llc.pc.in M src/llc/Makefile.am M tests/llc/Makefile.am 5 files changed, 7 insertions(+), 1 deletion(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved
Objections: msuraev: I would prefer this is not merged as is
diff --git a/configure.ac b/configure.ac index 1ebd185..9ceb679 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@
dnl checks for libraries PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
dnl checks for header files AC_HEADER_STDC diff --git a/contrib/libosmo-gprs.spec.in b/contrib/libosmo-gprs.spec.in index 9c27c2d..b560769 100644 --- a/contrib/libosmo-gprs.spec.in +++ b/contrib/libosmo-gprs.spec.in @@ -11,6 +11,7 @@ BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig(libosmocore) >= 1.7.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.7.0 BuildRequires: pkgconfig(talloc)
%description diff --git a/libosmo-gprs-llc.pc.in b/libosmo-gprs-llc.pc.in index 25a6509..7502d95 100644 --- a/libosmo-gprs-llc.pc.in +++ b/libosmo-gprs-llc.pc.in @@ -6,7 +6,7 @@ Name: Osmocom [E]GPRS LLC (Logical Link Control) Library Description: C Utility Library Version: @VERSION@ -Requires: libosmocore +Requires: libosmocore, libosmogsm Requires.private: talloc Libs: -L${libdir} -losmo-gprs-llc Cflags: -I${includedir}/ diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 6c0e680..c25841e 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -11,10 +11,12 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ $(NULL)
AM_LDFLAGS = \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ $(NULL)
lib_LTLIBRARIES = \ @@ -36,4 +38,5 @@
libosmo_gprs_llc_la_LIBADD = \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ $(NULL) diff --git a/tests/llc/Makefile.am b/tests/llc/Makefile.am index 0079964..2c9d578 100644 --- a/tests/llc/Makefile.am +++ b/tests/llc/Makefile.am @@ -1,6 +1,7 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ -I$(top_srcdir)/include/ \ $(NULL)
-
pespin