diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-04-05 16:25:43 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-04-05 16:48:47 +0200 |
commit | 60bd9cc09734b2d73861f22909905af39f3f8569 (patch) | |
tree | 96b910968cc6062f52b02b734cf5bfa44359c599 | |
parent | f6b9173b02bfac093177cf6fd0f48ad56c5786c7 (diff) |
misc: Replace libosmocore with tallocrelease/0.9.28-stable
The libosmocore depedency is used for talloc and OSMO_ASSERT.
Reduce the depedencies by using libtalloc directly and replace
the ASSERT with a local one (without backtrace support).
Conflicts:
src/Makefile.am
src/asn1helpers.c
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/asn1c/asn_internal.h | 2 | ||||
-rw-r--r-- | libasn1c.pc.in | 4 | ||||
-rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ce5140a..6d60b42 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AC_PROG_LIBTOOL AC_CONFIG_MACRO_DIR([m4]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.13) +PKG_CHECK_MODULES(LIBTALLOC, talloc) # The following test is taken from WebKit's webkit.m4 saved_CFLAGS="$CFLAGS" diff --git a/include/asn1c/asn_internal.h b/include/asn1c/asn_internal.h index e6da3fe..764e605 100644 --- a/include/asn1c/asn_internal.h +++ b/include/asn1c/asn_internal.h @@ -15,7 +15,7 @@ #include <assert.h> /* for assert() macro */ #endif -#include <osmocom/core/talloc.h> +#include <talloc.h> #ifdef __cplusplus extern "C" { diff --git a/libasn1c.pc.in b/libasn1c.pc.in index 149fe2d..89ad53a 100644 --- a/libasn1c.pc.in +++ b/libasn1c.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: asn1c runtime library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -lasn1c -lm -Cflags: -I${includedir}/ -I${includedir}/asn1c +Libs: -L${libdir} @LIBTALLOC_LIBS@ -lasn1c -lm +Cflags: -I${includedir}/ -I${includedir}/asn1c @LIBTALLOC_CFLAGS@ diff --git a/src/Makefile.am b/src/Makefile.am index 1bbcfc5..6415b0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,10 +4,10 @@ LIBVERSION=0:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include/asn1c -AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -fPIC -Wall $(LIBTALLOC_CFLAGS) lib_LTLIBRARIES = libasn1c.la -libasn1c_la_LDFLAGS = $(LIBOSMOCORE_LIBS) +libasn1c_la_LDFLAGS = $(LIBTALLOC_LIBS) libasn1c_la_SOURCES = ANY.c constraints.c GeneralizedTime.c NumericString.c T61String.c asn_codecs_prim.c constr_CHOICE.c GeneralString.c ObjectDescriptor.c TeletexString.c asn_SEQUENCE_OF.c constr_SEQUENCE.c GraphicString.c OBJECT_IDENTIFIER.c UniversalString.c asn_SET_OF.c constr_SEQUENCE_OF.c IA5String.c OCTET_STRING.c UTCTime.c ber_decoder.c constr_SET.c INTEGER.c per_decoder.c UTF8String.c ber_tlv_length.c constr_SET_OF.c ISO646String.c per_encoder.c VideotexString.c ber_tlv_tag.c constr_TYPE.c NativeEnumerated.c per_support.c VisibleString.c BIT_STRING.c NativeInteger.c PrintableString.c xer_decoder.c BMPString.c der_encoder.c NativeReal.c REAL.c xer_encoder.c BOOLEAN.c ENUMERATED.c NULL.c RELATIVE-OID.c xer_support.c per_opentype.c |