From 6a272a5529c1f8e893fa92a7a764901dfd2ed0c9 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@x100e.coppice.org>
Date: Mon, 2 Sep 2013 10:58:47 +0800
Subject: [PATCH] Fix compile problem with the last spandsp update
---
libs/spandsp/configure.ac | 29 +++++++++++++++++++++++------
libs/spandsp/tests/Makefile.am | 9 ---------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/libs/spandsp/configure.ac b/libs/spandsp/configure.ac
index b28cf25f3c..de395ec4cc 100644
--- a/libs/spandsp/configure.ac
+++ b/libs/spandsp/configure.ac
@@ -125,6 +125,9 @@ AC_TYPE_SIGNAL
AC_ARG_ENABLE(doc, [ --enable-doc Build the documentation])
AC_ARG_ENABLE(tests, [ --enable-tests Build the test programs])
+AC_ARG_ENABLE(t43, [ --enable-t43 Enable T.43 support])
+AC_ARG_ENABLE(v32bis, [ --enable-v32bis Enable V.32bis support])
+AC_ARG_ENABLE(v34, [ --enable-v34 Enable V.34 support])
AC_ARG_ENABLE(mmx, [ --enable-mmx Enable MMX support])
AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support])
AC_ARG_ENABLE(sse2, [ --enable-sse2 Enable SSE2 support])
@@ -548,12 +551,26 @@ LIBS="$LIBS $TIFF_LIBS $JPEG_LIBS"
TESTLIBS="$SIMLIBS $TESTLIBS"
-AC_DEFINE([SPANDSP_SUPPORT_T43], [0], [Support T.43 JBIG gray and colour compression])
-SPANDSP_SUPPORT_T43="#undef SPANDSP_SUPPORT_T43"
-AC_DEFINE([SPANDSP_SUPPORT_V32BIS], [0], [Support the V.32bis modem])
-SPANDSP_SUPPORT_V32BIS="#undef SPANDSP_SUPPORT_V32BIS"
-AC_DEFINE([SPANDSP_SUPPORT_V34], [0], [Support the V.34 FAX modem])
-SPANDSP_SUPPORT_V34="#undef SPANDSP_SUPPORT_V34"
+if test "$enable_t43" = "yes" ; then
+ AC_DEFINE([SPANDSP_SUPPORT_T43], [1], [Support T.43 JBIG gray and colour compression])
+ SPANDSP_SUPPORT_T43="#define SPANDSP_SUPPORT_T43 1"
+else
+ SPANDSP_SUPPORT_T43="#undef SPANDSP_SUPPORT_T43"
+fi
+
+if test "$enable_v32bis" = "yes" ; then
+ AC_DEFINE([SPANDSP_SUPPORT_V32BIS], [1], [Support the V.32bis modem])
+ SPANDSP_SUPPORT_V32BIS="#define SPANDSP_SUPPORT_V32BIS 1"
+else
+ SPANDSP_SUPPORT_V32BIS="#undef SPANDSP_SUPPORT_V32BIS"
+fi
+
+if test "$enable_v34" = "yes" ; then
+ AC_DEFINE([SPANDSP_SUPPORT_V34], [1], [Support the V.34 FAX modem])
+ SPANDSP_SUPPORT_V34="#define SPANDSP_SUPPORT_V34 1"
+else
+ SPANDSP_SUPPORT_V34="#undef SPANDSP_SUPPORT_V34"
+fi
AM_CONDITIONAL([COND_DOC], [test "$enable_doc" = yes])
AM_CONDITIONAL([COND_TESTS], [test "$enable_tests" = yes])
diff --git a/libs/spandsp/tests/Makefile.am b/libs/spandsp/tests/Makefile.am
index f1ce1930b1..7149900a90 100644
--- a/libs/spandsp/tests/Makefile.am
+++ b/libs/spandsp/tests/Makefile.am
@@ -73,12 +73,10 @@ noinst_PROGRAMS = ademco_contactid_tests \
complex_vector_float_tests \
complex_vector_int_tests \
crc_tests \
- data_modems_tests \
dc_restore_tests \
dds_tests \
dtmf_rx_tests \
dtmf_tx_tests \
- dummy_modems_tests \
echo_tests \
fax_decode \
fax_tests \
@@ -153,7 +151,6 @@ noinst_HEADERS = echo_monitor.h \
modem_monitor.h \
pcap_parse.h \
pseudo_terminals.h \
- socket_harness.h \
udptl.h
ademco_contactid_tests_SOURCES = ademco_contactid_tests.c
@@ -201,9 +198,6 @@ complex_vector_int_tests_LDADD = $(LIBDIR) -lspandsp
crc_tests_SOURCES = crc_tests.c
crc_tests_LDADD = $(LIBDIR) -lspandsp
-data_modems_tests_SOURCES = data_modems_tests.c media_monitor.cpp
-data_modems_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
-
dc_restore_tests_SOURCES = dc_restore_tests.c
dc_restore_tests_LDADD = $(LIBDIR) -lspandsp
@@ -216,9 +210,6 @@ dtmf_rx_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lsp
dtmf_tx_tests_SOURCES = dtmf_tx_tests.c
dtmf_tx_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
-dummy_modems_tests_SOURCES = dummy_modems_tests.c media_monitor.cpp socket_harness.c
-dummy_modems_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
-
echo_tests_SOURCES = echo_tests.c echo_monitor.cpp
echo_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp