<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16023">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Enable DAHDI support by default; require --disable-dahdi otherwise<br><br>libosmo-abis was built with DAHDI support, if the related header files<br>were present at built time, and without if not. This kind of automagic<br>enabling/disabling of features is wrong. Let's require DAHDI support by<br>default, and force the user to take a conscious decision by using an<br>explicit --disable-dahdi if he doesn't want it.<br><br>At the same time, update debian/control to list dahdi-source as build<br>dependency.<br><br>Change-Id: Id9f7f063e7ca9e3ab4aa96fc93f243caf50fb66a<br>Closes: OS#4248<br>---<br>M configure.ac<br>M debian/control<br>M src/Makefile.am<br>M src/input/dahdi.c<br>4 files changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/23/16023/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index ba33ed9..5a83eb1 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -64,7 +64,16 @@</span><br><span> PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)</span><br><span> PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([dahdi],</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_HELP_STRING([--disable-dahdi],</span><br><span style="color: hsl(120, 100%, 40%);">+ [disable support for DAHID ISDN (E1/T1) cards [default=yes]]),</span><br><span style="color: hsl(120, 100%, 40%);">+ [enable_dahdi="$enableval"], [enable_dahdi="yes"])</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(ENABLE_DAHDI, test "x$enable_dahdi" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$enable_dahdi" = "xyes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CHECK_HEADERS([dahdi/user.h],[],[AC_MSG_ERROR([DAHDI input driver enabled but DAHDI not found])])</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_WARN([DAHDI input driver will not be built])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> AC_ARG_ENABLE(sanitize,</span><br><span> [AS_HELP_STRING(</span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index 24a082e..b9e2078 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -6,6 +6,7 @@</span><br><span> autotools-dev,</span><br><span> autoconf,</span><br><span> automake,</span><br><span style="color: hsl(120, 100%, 40%);">+ dahdi-source,</span><br><span> libtool,</span><br><span> dh-autoreconf,</span><br><span> libdpkg-perl,</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index f4277ae..9c438c9 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -19,7 +19,6 @@</span><br><span> ipa_proxy.c \</span><br><span> subchan_demux.c \</span><br><span> trau_frame.c \</span><br><span style="color: hsl(0, 100%, 40%);">- input/dahdi.c \</span><br><span> input/ipa.c \</span><br><span> input/ipa_keepalive.c \</span><br><span> input/ipaccess.c \</span><br><span>@@ -28,6 +27,9 @@</span><br><span> input/misdn.c \</span><br><span> input/rs232.c \</span><br><span> input/unixsocket.c</span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_DAHDI</span><br><span style="color: hsl(120, 100%, 40%);">+libosmoabis_la_SOURCES += input/dahdi.c</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span> libosmotrau_la_CFLAGS = $(AM_CFLAGS) $(ORTP_CFLAGS)</span><br><span> libosmotrau_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(TRAU_LIBVERSION)</span><br><span>diff --git a/src/input/dahdi.c b/src/input/dahdi.c</span><br><span>index 6594eea..5da0a2d 100644</span><br><span>--- a/src/input/dahdi.c</span><br><span>+++ b/src/input/dahdi.c</span><br><span>@@ -26,8 +26,6 @@</span><br><span> </span><br><span> #include "config.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef HAVE_DAHDI_USER_H</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <stdio.h></span><br><span> #include <unistd.h></span><br><span> #include <stdlib.h></span><br><span>@@ -756,5 +754,3 @@</span><br><span> /* register the driver with the core */</span><br><span> return e1inp_driver_register(&dahdi_driver);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* HAVE_DAHDI_USER_H */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16023">change 16023</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-abis/+/16023"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id9f7f063e7ca9e3ab4aa96fc93f243caf50fb66a </div>
<div style="display:none"> Gerrit-Change-Number: 16023 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>