diff options
| author | Harald Welte <laforge@osmocom.org> | 2019-11-11 17:00:12 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2019-12-01 20:03:39 +0000 |
| commit | d4be696bbc20522a0284b6d0aefa872585f6926f (patch) | |
| tree | e5255e97d9897a2d797c2485ae48aca99e327a2a | |
| parent | b43ce424115ec3e9395263a646a35e433e07cebe (diff) | |
Enable DAHDI support by default; require --disable-dahdi otherwise
libosmo-abis was built with DAHDI support, if the related header files
were present at built time, and without if not. This kind of automagic
enabling/disabling of features is wrong. Let's require DAHDI support by
default, and force the user to take a conscious decision by using an
explicit --disable-dahdi if he doesn't want it.
At the same time, update debian/control to list dahdi-source as build
dependency.
Change-Id: Id9f7f063e7ca9e3ab4aa96fc93f243caf50fb66a
Closes: OS#4248
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/input/dahdi.c | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ba33ed9..5a83eb1 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,16 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) -AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) +AC_ARG_ENABLE([dahdi], + AC_HELP_STRING([--disable-dahdi], + [disable support for DAHID ISDN (E1/T1) cards [default=yes]]), + [enable_dahdi="$enableval"], [enable_dahdi="yes"]) +AM_CONDITIONAL(ENABLE_DAHDI, test "x$enable_dahdi" = "xyes") +if test "x$enable_dahdi" = "xyes"; then + AC_CHECK_HEADERS([dahdi/user.h],[],[AC_MSG_ERROR([DAHDI input driver enabled but DAHDI not found])]) +else + AC_MSG_WARN([DAHDI input driver will not be built]) +fi AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/control b/debian/control index 24a082e..b9e2078 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, + dahdi-source, libtool, dh-autoreconf, libdpkg-perl, diff --git a/src/Makefile.am b/src/Makefile.am index f4277ae..9c438c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,6 @@ libosmoabis_la_SOURCES = init.c \ ipa_proxy.c \ subchan_demux.c \ trau_frame.c \ - input/dahdi.c \ input/ipa.c \ input/ipa_keepalive.c \ input/ipaccess.c \ @@ -28,6 +27,9 @@ libosmoabis_la_SOURCES = init.c \ input/misdn.c \ input/rs232.c \ input/unixsocket.c +if ENABLE_DAHDI +libosmoabis_la_SOURCES += input/dahdi.c +endif libosmotrau_la_CFLAGS = $(AM_CFLAGS) $(ORTP_CFLAGS) libosmotrau_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(TRAU_LIBVERSION) diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 6594eea..5da0a2d 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -26,8 +26,6 @@ #include "config.h" -#ifdef HAVE_DAHDI_USER_H - #include <stdio.h> #include <unistd.h> #include <stdlib.h> @@ -756,5 +754,3 @@ int e1inp_dahdi_init(void) /* register the driver with the core */ return e1inp_driver_register(&dahdi_driver); } - -#endif /* HAVE_DAHDI_USER_H */ |