Use new include paths of libosmo-sccp 0.0.2

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"
     ],
     [

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

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>

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

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>

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"
 

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>

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>
 

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>
 

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>