diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-03-07 20:24:53 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-03-07 20:24:53 +0100 |
| commit | ef956d2ac47fcac7c219728cfba8c9bcec543f7c (patch) | |
| tree | b0daeb665f48e6e79945ec6f1aa4331d018d1bd8 /src/shared | |
| parent | 80f20962d3df5209008a5ec9df009635d528ff26 (diff) | |
| parent | cbb29f7c94ad2a7cb0ebe7d43cbef5fb9d11d62e (diff) | |
Merge commit 'cbb29f7c94ad2a7cb0ebe7d43cbef5fb9d11d62e'
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/libosmocore/configure.in | 6 | ||||
| -rw-r--r-- | src/shared/libosmocore/include/osmocore/Makefile.am | 6 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/Makefile.am | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/shared/libosmocore/configure.in b/src/shared/libosmocore/configure.in index a5c5f6b3..11541967 100644 --- a/src/shared/libosmocore/configure.in +++ b/src/shared/libosmocore/configure.in @@ -30,6 +30,12 @@ AC_SUBST(SYMBOL_VISIBILITY) dnl Generate the output AM_CONFIG_HEADER(config.h) +AC_ARG_ENABLE(talloc, + [ --disable-talloc Support message buffer ], + [enable_talloc=0], [enable_talloc=1]) + +AM_CONDITIONAL(ENABLE_TALLOC, test "x$enable_talloc" = "x1") + AC_OUTPUT( libosmocore.pc include/osmocore/Makefile diff --git a/src/shared/libosmocore/include/osmocore/Makefile.am b/src/shared/libosmocore/include/osmocore/Makefile.am index 9c4fc757..adcae538 100644 --- a/src/shared/libosmocore/include/osmocore/Makefile.am +++ b/src/shared/libosmocore/include/osmocore/Makefile.am @@ -1,7 +1,11 @@ -osmocore_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h \ +osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h \ tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \ gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h +if ENABLE_TALLOC +osmocore_HEADERS += talloc.h +endif + osmocoredir = $(includedir)/osmocore SUBDIRS = protocol diff --git a/src/shared/libosmocore/src/Makefile.am b/src/shared/libosmocore/src/Makefile.am index 99424522..5122e73b 100644 --- a/src/shared/libosmocore/src/Makefile.am +++ b/src/shared/libosmocore/src/Makefile.am @@ -7,6 +7,10 @@ AM_CFLAGS = -fPIC -Wall lib_LTLIBRARIES = libosmocore.la -libosmocore_la_SOURCES = msgb.c timer.c talloc.c select.c signal.c \ +libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c \ tlv_parser.c bitvec.c comp128.c gsm_utils.c statistics.c \ write_queue.c utils.c rsl.c gsm48.c rxlev_stat.c + +if ENABLE_TALLOC +libosmocore_la_SOURCES += talloc.c +endif |