diff options
| author | Harald Welte <laforge@gnumonks.org> | 2012-09-08 22:20:00 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2012-09-08 22:20:00 +0200 |
| commit | ca476b1154ebb29d24a5c4aed7166c47b4d9fd52 (patch) | |
| tree | 405592319d017d3cbe76e79947885654cc3df7bf | |
| parent | d08b949c2b0e41a46bfbe984766601f73e53697d (diff) | |
| parent | e3a10b66a4eaea7c7d06707be1ca18bb28dc2cbe (diff) | |
Merge commit 'e3a10b66a4eaea7c7d06707be1ca18bb28dc2cbe' into master
| -rw-r--r-- | src/shared/libosmocore/configure.ac | 9 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/backtrace.c | 2 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gb/Makefile.am | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/shared/libosmocore/configure.ac b/src/shared/libosmocore/configure.ac index ca98fc2c..f119c90d 100644 --- a/src/shared/libosmocore/configure.ac +++ b/src/shared/libosmocore/configure.ac @@ -137,6 +137,14 @@ AC_ARG_ENABLE(utilities, [enable_utilities=$enableval], [enable_utilities="yes"]) AM_CONDITIONAL(ENABLE_UTILITIES, test x"$enable_utilities" = x"yes") +AC_ARG_ENABLE(gb, + [AS_HELP_STRING( + [--disable-gb], + [Disable building Gb library], + )], + [enable_gb=$enableval], [enable_gb="yes"]) +AM_CONDITIONAL(ENABLE_GB, test x"$enable_gb" = x"yes") + AC_ARG_ENABLE(embedded, [AS_HELP_STRING( [--enable-embedded], @@ -152,6 +160,7 @@ then AM_CONDITIONAL(ENABLE_VTY, false) AM_CONDITIONAL(ENABLE_TALLOC, false) AM_CONDITIONAL(ENABLE_UTILITIES, false) + AM_CONDITIONAL(ENABLE_GB, false) AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort]) fi diff --git a/src/shared/libosmocore/src/backtrace.c b/src/shared/libosmocore/src/backtrace.c index 4ca7adb8..5b93becb 100644 --- a/src/shared/libosmocore/src/backtrace.c +++ b/src/shared/libosmocore/src/backtrace.c @@ -81,7 +81,7 @@ void osmo_log_backtrace(int subsys, int level) #else void osmo_generate_backtrace(void) { - fprintf(stderr, "This platform has no backtrace function\n"); + printf("This platform has no backtrace function\n"); } void osmo_log_backtrace(int subsys, int level) { diff --git a/src/shared/libosmocore/src/gb/Makefile.am b/src/shared/libosmocore/src/gb/Makefile.am index 71d47364..c1377665 100644 --- a/src/shared/libosmocore/src/gb/Makefile.am +++ b/src/shared/libosmocore/src/gb/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing # FIXME: this should eventually go into a milenage/Makefile.am noinst_HEADERS = common_vty.h +if ENABLE_GB lib_LTLIBRARIES = libosmogb.la libosmogb_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libosmogb.map -version-info $(LIBVERSION) @@ -19,6 +20,7 @@ libosmogb_la_LIBADD = \ libosmogb_la_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c \ gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c \ gprs_bssgp_bss.c common_vty.c +endif EXTRA_DIST = libosmogb.map |