Merge commit 'f8b2ba7dc850396c5910e8c76875e75d37479d34'

diff --cc src/shared/libosmocore/configure.in
index 1154196,0000000..abf7bf4
mode 100644,000000..100644
--- 1/src/shared/libosmocore/configure.in
--- /dev/null
+++ b/src/shared/libosmocore/configure.in
@@@ -1,48 -1,0 +1,52 @@@
-       [  --disable-talloc Support message buffer ],
 +AC_INIT
 +
 +AM_INIT_AUTOMAKE(libosmocore, 0.0alpha1)
 +
 +dnl kernel style compile messages
 +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 +
 +dnl checks for programs
 +AC_PROG_MAKE_SET
 +AC_PROG_CC
 +AC_PROG_INSTALL
 +AC_PROG_RANLIB
 +AC_PROG_LIBTOOL
 +
 +dnl checks for header files
 +AC_HEADER_STDC
 +AC_CHECK_HEADERS(execinfo.h sys/select.h)
 +
 +# The following test is taken from WebKit's webkit.m4
 +saved_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -fvisibility=hidden "
 +AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
 +AC_COMPILE_IFELSE([char foo;],
 +      [ AC_MSG_RESULT([yes])
 +        SYMBOL_VISIBILITY="-fvisibility=hidden"],
 +        AC_MSG_RESULT([no]))
 +CFLAGS="$saved_CFLAGS"
 +AC_SUBST(SYMBOL_VISIBILITY)
 +
 +dnl Generate the output
 +AM_CONFIG_HEADER(config.h)
 +
 +AC_ARG_ENABLE(talloc,
- 
++      [  --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
 +      include/osmocore/protocol/Makefile
 +      include/Makefile
 +      src/Makefile
 +      tests/Makefile
 +      tests/timer/Makefile
 +      tests/sms/Makefile
 +      Makefile)

diff --cc src/shared/libosmocore/tests/Makefile.am
index 56e8b6f,0000000..0119a02
mode 100644,000000..100644
--- 1/src/shared/libosmocore/tests/Makefile.am
--- /dev/null
+++ b/src/shared/libosmocore/tests/Makefile.am
@@@ -1,1 -1,0 +1,3 @@@
++if ENABLE_TESTS
 +SUBDIRS = timer sms
++endif