[MERGED] libosmocore[master]: configure.ac: Introduce --disable-ctrl

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Jan 15 17:34:05 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: configure.ac: Introduce --disable-ctrl
......................................................................


configure.ac: Introduce --disable-ctrl

Using --disable-ctrl, one can disable the building of libosmoctrl.

The 'embedded' target will also automaticall disable ctrl.

Change-Id: I6912396338c5b23ae860fef2a55854d6df9a579d
---
M configure.ac
M src/ctrl/Makefile.am
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index ec03c26..bbbe241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,14 @@
         [enable_gb=$enableval], [enable_gb="yes"])
 AM_CONDITIONAL(ENABLE_GB, test x"$enable_gb" = x"yes")
 
+AC_ARG_ENABLE(ctrl,
+        [AS_HELP_STRING(
+                [--disable-ctrl],
+                [Disable building CTRL library],
+        )],
+        [enable_ctrl=$enableval], [enable_ctrl="yes"])
+AM_CONDITIONAL(ENABLE_CTRL, test x"$enable_ctrl" = x"yes")
+
 AC_ARG_ENABLE(embedded,
 	[AS_HELP_STRING(
 		[--enable-embedded],
@@ -198,6 +206,7 @@
 	AM_CONDITIONAL(ENABLE_MSGFILE, false)
 	AM_CONDITIONAL(ENABLE_SERIAL, false)
 	AM_CONDITIONAL(ENABLE_VTY, false)
+	AM_CONDITIONAL(ENABLE_CTRL, false)
 	AM_CONDITIONAL(ENABLE_UTILITIES, false)
 	AM_CONDITIONAL(ENABLE_GB, false)
 	AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort])
diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am
index 8bf3442..1817cac 100644
--- a/src/ctrl/Makefile.am
+++ b/src/ctrl/Makefile.am
@@ -5,6 +5,7 @@
 
 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)
 
+if ENABLE_CTRL
 lib_LTLIBRARIES = libosmoctrl.la
 
 libosmoctrl_la_SOURCES = control_cmd.c control_if.c
@@ -18,3 +19,5 @@
 if ENABLE_VTY
 libosmoctrl_la_SOURCES += control_vty.c
 endif
+
+endif

-- 
To view, visit https://gerrit.osmocom.org/1603
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6912396338c5b23ae860fef2a55854d6df9a579d
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list