summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorHarald Welte2010-03-07 20:34:24 +0100
committerHarald Welte2010-03-07 20:34:24 +0100
commit5f3ead20158d059d022a11e121861e14bd0674df (patch)
treec03109ad754db0352c83357463a233ea217ea380 /src/shared
parentMerge commit 'cbb29f7c94ad2a7cb0ebe7d43cbef5fb9d11d62e' (diff)
parentadd option --disable-tests to disable building of test binaries (diff)
downloadosmocom-5f3ead20158d059d022a11e121861e14bd0674df.tar.gz
osmocom-5f3ead20158d059d022a11e121861e14bd0674df.tar.xz
osmocom-5f3ead20158d059d022a11e121861e14bd0674df.zip
Merge commit 'f8b2ba7dc850396c5910e8c76875e75d37479d34'
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/libosmocore/configure.in8
-rw-r--r--src/shared/libosmocore/tests/Makefile.am2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/shared/libosmocore/configure.in b/src/shared/libosmocore/configure.in
index 1154196..abf7bf4 100644
--- a/src/shared/libosmocore/configure.in
+++ b/src/shared/libosmocore/configure.in
@@ -31,11 +31,15 @@ dnl Generate the output
AM_CONFIG_HEADER(config.h)
AC_ARG_ENABLE(talloc,
- [ --disable-talloc Support message buffer ],
+ [ --disable-talloc Disable building talloc memory allocator ],
[enable_talloc=0], [enable_talloc=1])
-
AM_CONDITIONAL(ENABLE_TALLOC, test "x$enable_talloc" = "x1")
+AC_ARG_ENABLE(tests,
+ [ --disable-tests Disable building test programs ],
+ [enable_tests=0], [enable_tests=1])
+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "x1")
+
AC_OUTPUT(
libosmocore.pc
include/osmocore/Makefile
diff --git a/src/shared/libosmocore/tests/Makefile.am b/src/shared/libosmocore/tests/Makefile.am
index 56e8b6f..0119a02 100644
--- a/src/shared/libosmocore/tests/Makefile.am
+++ b/src/shared/libosmocore/tests/Makefile.am
@@ -1 +1,3 @@
+if ENABLE_TESTS
SUBDIRS = timer sms
+endif