From patchwork Fri Apr 22 12:41:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Kostanbaev X-Patchwork-Id: 613590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 3qrwHK6G1wz9t3q for ; Fri, 22 Apr 2016 22:42:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=RLmqnJtI; dkim-atps=neutral Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 676321322D; Fri, 22 Apr 2016 12:42:04 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) by lists.osmocom.org (Postfix) with ESMTP id 9DD76131D2 for ; Fri, 22 Apr 2016 12:41:56 +0000 (UTC) Received: by mail-wm0-x232.google.com with SMTP id u206so25004365wme.1 for ; Fri, 22 Apr 2016 05:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rnqj1v0+Vcz3uq4c8QCFp2bRP00q13CnlvDs5pnbAn4=; b=RLmqnJtIOxuE5v/PzieNi14sJQAQO3Jm0T2EVTAIGMY1TjbGuL8ELkDgVf/3f7Z9ZO CJD0Aie81q1MW/y8AwBKYWYMeWqimJI8SNtYGoGKan1XwbxiQF3JPazf4maIeif3ZGk2 HHWJnr54spHmN/bzpb3jpOtjkM+SzaawRAXH8kjOms9zU9pD2t0nEdPdp8wAmvjkk8pa pphkejAQpDA/dqv969nhOhjWZMpwYjFyrVzvTdOZOst31LQNx54D/igjj5OKAmf6hjs6 DGMgkMo3ojhEzV/+IXAijL+fXG6WU6JYK6sSJnBD7Ugo3depzQP/NDkfKaMJ9t6bjaP7 i6xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rnqj1v0+Vcz3uq4c8QCFp2bRP00q13CnlvDs5pnbAn4=; b=QYaWAa73LTN+vpI/36TBI0d1gz14EVmocodcIwywWwjHU4q9QlDoBpgU+O/s4HJ6O4 sP12HX5unlDy61Wv8z/2+AE5S0wDVEkE4Lb1V5cigO6gHtpBadyZnXbE30RSwPodayDK 1R/b2nexDwJW48sXpGvgXp7vleWv6I8wOZXnbYD/eBdx3VfC7V46kPuEPWa7wrvcWvub zuTBmMTT6zdQ6ruZxdX2fehUUCG/FClD6oucr8b0XWdcRxacsQJA4PClAa0/gpWUtgdT rEDb3nGIcdbyEAzOG9tC7AH0W1bIOAvB/OzPuxZ4grYxDFHCSG12TZTRa8RPEzK+N1sX pmPg== X-Gm-Message-State: AOPr4FUr7acIqOZfkBoph5rLv9zZZADT5izqcXZS32fPuey6P9JqDu7+DiiUUM7xCRp2CA== X-Received: by 10.194.63.8 with SMTP id c8mr20181851wjs.89.1461328916457; Fri, 22 Apr 2016 05:41:56 -0700 (PDT) Received: from serg-X55SR.in-berlin.de ([185.11.247.108]) by smtp.gmail.com with ESMTPSA id b15sm3224216wmd.1.2016.04.22.05.41.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Apr 2016 05:41:55 -0700 (PDT) From: Sergey Kostanbaev To: openbsc@lists.osmocom.org Subject: [PATCH 7/9] ussd_proxy: Add to openbsc build system Date: Fri, 22 Apr 2016 14:41:36 +0200 Message-Id: <1461328898-8298-7-git-send-email-sergey.kostanbaev@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461328898-8298-1-git-send-email-sergey.kostanbaev@gmail.com> References: <1461328898-8298-1-git-send-email-sergey.kostanbaev@gmail.com> X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Kostanbaev Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" From: Sergey Kostanbaev --- openbsc/configure.ac | 12 ++++++++++++ openbsc/src/Makefile.am | 2 +- openbsc/src/ussd-proxy/Makefile.am | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 60601fe..b53eca6 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -177,6 +177,17 @@ AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# Enable/disable ussd_proxy utility +AC_ARG_ENABLE([ussd_proxy], [AS_HELP_STRING([--enable-ussd-proxy], [Build the USSD MAP SUP to SIP proxy])], + [osmo_ac_build_ussd_proxy="$enableval"],[osmo_ac_build_ussd_proxy="no"]) +if test "$osmo_ac_build_ussd_proxy" = "yes" ; then + PKG_CHECK_MODULES(LIBSOFIA_SIP_UA, sofia-sip-ua >= 1.10) + AC_DEFINE(BUILD_USSD_PROXY, 1, [Define if we want to build ussd_proxy]) +fi +AM_CONDITIONAL(BUILD_USSD_PROXY, test "x$osmo_ac_build_ussd_proxy" = "xyes") +AC_SUBST(osmo_ac_build_smpp) + + dnl Generate the output AM_CONFIG_HEADER(bscconfig.h) @@ -198,6 +209,7 @@ AC_OUTPUT( src/ipaccess/Makefile src/utils/Makefile src/gprs/Makefile + src/ussd-proxy/Makefile tests/Makefile tests/atlocal tests/gsm0408/Makefile diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index 6f6174e..f12ed54 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) -SUBDIRS = libcommon libmgcp libbsc libmsc libtrau libfilter osmo-nitb osmo-bsc_mgcp utils ipaccess gprs +SUBDIRS = libcommon libmgcp libbsc libmsc libtrau libfilter osmo-nitb osmo-bsc_mgcp utils ipaccess gprs ussd-proxy # Conditional modules if BUILD_NAT diff --git a/openbsc/src/ussd-proxy/Makefile.am b/openbsc/src/ussd-proxy/Makefile.am index 85f3e64..0f9413a 100644 --- a/openbsc/src/ussd-proxy/Makefile.am +++ b/openbsc/src/ussd-proxy/Makefile.am @@ -1,3 +1,4 @@ +if BUILD_USSD_PROXY AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(COVERAGE_CFLAGS) \ $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ @@ -15,3 +16,4 @@ ussd_proxy_LDADD = \ -lsofia-sip-ua \ $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) $(LIBOSMOABIS_LIBS) +endif