aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2010-08-03 15:11:51 +0200
committerHarald Welte <laforge@gnumonks.org>2010-08-03 15:11:51 +0200
commitd5db12c16061062ad5c27c9833cffa3c71ed1f17 (patch)
tree42639cc792bee0afe11e7f110e71f78cd8c35ba2 /openbsc
parent3bcbc0c47a193381495c6e0fde3e6b9575b5a329 (diff)
Use new include paths of libosmo-sccp 0.0.2
Diffstat (limited to 'openbsc')
-rw-r--r--openbsc/configure.in6
-rw-r--r--openbsc/include/openbsc/bsc_nat_sccp.h2
-rw-r--r--openbsc/src/bsc/osmo_bsc_main.c2
-rw-r--r--openbsc/src/nat/bsc_filter.c2
-rw-r--r--openbsc/src/nat/bsc_mgcp_utils.c2
-rw-r--r--openbsc/src/nat/bsc_nat.c2
-rw-r--r--openbsc/src/nat/bsc_nat_utils.c2
-rw-r--r--openbsc/src/nat/bsc_nat_vty.c2
-rw-r--r--openbsc/src/nat/bsc_sccp.c2
-rw-r--r--openbsc/tests/bsc-nat/bsc_nat_test.c2
10 files changed, 12 insertions, 12 deletions
diff --git a/openbsc/configure.in b/openbsc/configure.in
index b877e6b8..6f96910b 100644
--- a/openbsc/configure.in
+++ b/openbsc/configure.in
@@ -25,7 +25,7 @@ AM_CONDITIONAL(HAVE_LIBGTP, test "x$GPRS_LIBGTP" != "x")
AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])],
[
- PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp)
+ PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2)
osmo_ac_build_nat="yes"
],
[
@@ -33,9 +33,9 @@ AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Require
])
AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes")
-AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-bsc], [Build the Osmo BSC])],
+AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])],
[
- PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp)
+ PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2)
osmo_ac_build_bsc="yes"
],
[
diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/openbsc/include/openbsc/bsc_nat_sccp.h
index 0a06a876..73e9c690 100644
--- a/openbsc/include/openbsc/bsc_nat_sccp.h
+++ b/openbsc/include/openbsc/bsc_nat_sccp.h
@@ -24,7 +24,7 @@
#define BSC_NAT_SCCP_H
#include <sys/types.h>
-#include <sccp/sccp_types.h>
+#include <osmocom/sccp/sccp_types.h>
/*
* For the NAT we will need to analyze and later patch
diff --git a/openbsc/src/bsc/osmo_bsc_main.c b/openbsc/src/bsc/osmo_bsc_main.c
index a6782276..60b5225e 100644
--- a/openbsc/src/bsc/osmo_bsc_main.c
+++ b/openbsc/src/bsc/osmo_bsc_main.c
@@ -26,7 +26,7 @@
#include <osmocom/vty/command.h>
#include <osmocore/talloc.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#define _GNU_SOURCE
#include <getopt.h>
diff --git a/openbsc/src/nat/bsc_filter.c b/openbsc/src/nat/bsc_filter.c
index 3e92abd8..233f515a 100644
--- a/openbsc/src/nat/bsc_filter.c
+++ b/openbsc/src/nat/bsc_filter.c
@@ -29,7 +29,7 @@
#include <osmocore/talloc.h>
#include <osmocore/protocol/gsm_08_08.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
/*
* The idea is to have a simple struct describing a IPA packet with
diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c
index 00b7d6d5..1881cf6e 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/nat/bsc_mgcp_utils.c
@@ -26,7 +26,7 @@
#include <openbsc/mgcp.h>
#include <openbsc/mgcp_internal.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#include <osmocore/talloc.h>
#include <osmocore/gsm0808.h>
diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/nat/bsc_nat.c
index b47d7ce7..0a442298 100644
--- a/openbsc/src/nat/bsc_nat.c
+++ b/openbsc/src/nat/bsc_nat.c
@@ -52,7 +52,7 @@
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/vty.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#include "../../bscconfig.h"
diff --git a/openbsc/src/nat/bsc_nat_utils.c b/openbsc/src/nat/bsc_nat_utils.c
index bb5ee94b..05825136 100644
--- a/openbsc/src/nat/bsc_nat_utils.c
+++ b/openbsc/src/nat/bsc_nat_utils.c
@@ -35,7 +35,7 @@
#include <osmocore/protocol/gsm_08_08.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/nat/bsc_nat_vty.c
index b1734633..6493593b 100644
--- a/openbsc/src/nat/bsc_nat_vty.c
+++ b/openbsc/src/nat/bsc_nat_vty.c
@@ -30,7 +30,7 @@
#include <osmocore/talloc.h>
#include <osmocore/rate_ctr.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#include <stdlib.h>
diff --git a/openbsc/src/nat/bsc_sccp.c b/openbsc/src/nat/bsc_sccp.c
index f67e4ada..dae59504 100644
--- a/openbsc/src/nat/bsc_sccp.c
+++ b/openbsc/src/nat/bsc_sccp.c
@@ -24,7 +24,7 @@
#include <openbsc/bsc_nat.h>
#include <openbsc/bsc_nat_sccp.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#include <osmocore/talloc.h>
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index 524daf06..c5234aa2 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -30,7 +30,7 @@
#include <osmocore/talloc.h>
-#include <sccp/sccp.h>
+#include <osmocom/sccp/sccp.h>
#include <stdio.h>