diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-04-07 22:07:11 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-04-07 22:07:11 +0200 |
| commit | fa91bffae55ae93809675d403acc678eaa44e119 (patch) | |
| tree | 25981af5ba1ea39caa2c931dcbc1bdfb86630743 | |
| parent | 55c0a9a7008599f94f36324db82dbb9ce213cfb8 (diff) | |
misc: Catch up with libosmocore changes
| -rw-r--r-- | openbsc/configure.in | 3 | ||||
| -rw-r--r-- | openbsc/src/Makefile.am | 4 | ||||
| -rw-r--r-- | openbsc/tests/channel/Makefile.am | 4 | ||||
| -rw-r--r-- | openbsc/tests/db/Makefile.am | 4 | ||||
| -rw-r--r-- | openbsc/tests/gsm0408/Makefile.am | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/openbsc/configure.in b/openbsc/configure.in index e32c4080f..e159037c0 100644 --- a/openbsc/configure.in +++ b/openbsc/configure.in @@ -15,8 +15,9 @@ dnl checks for libraries AC_SEARCH_LIBS(crypt, crypt, [LIBCRYPT="-lcrypt"; AC_DEFINE([VTY_CRYPT_PW], [], [Use crypt functionality of vty.])]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.23) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.2.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.3) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.2.0) dnl checks for header files AC_HEADER_STDC diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index 59e67185c..062c8730b 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOSCCP_LIBS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOSCCP_LIBS) sbin_PROGRAMS = bsc_hack bs11_config ipaccess-find ipaccess-config \ isdnsync bsc_mgcp ipaccess-proxy \ diff --git a/openbsc/tests/channel/Makefile.am b/openbsc/tests/channel/Makefile.am index 772965953..f67bc2857 100644 --- a/openbsc/tests/channel/Makefile.am +++ b/openbsc/tests/channel/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = channel_test @@ -11,5 +11,5 @@ channel_test_SOURCES = channel_test.c \ $(top_srcdir)/src/gsm_data.c \ $(top_srcdir)/src/bts_ipaccess_nanobts.c \ $(top_srcdir)/src/bts_siemens_bs11.c -channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) +channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) diff --git a/openbsc/tests/db/Makefile.am b/openbsc/tests/db/Makefile.am index 6eb9180ce..7b81100b5 100644 --- a/openbsc/tests/db/Makefile.am +++ b/openbsc/tests/db/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = db_test db_test_SOURCES = db_test.c -db_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) -ldl -ldbi +db_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldl -ldbi diff --git a/openbsc/tests/gsm0408/Makefile.am b/openbsc/tests/gsm0408/Makefile.am index f98c673ea..d3e24d329 100644 --- a/openbsc/tests/gsm0408/Makefile.am +++ b/openbsc/tests/gsm0408/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = gsm0408_test gsm0408_test_SOURCES = gsm0408_test.c -gsm0408_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) -ldbi +gsm0408_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldbi |