Skip to content

Commit 16769da

Browse files
achaloyanachaloyan
committed
Added new configure enable/disable options to control build of libraries and applications located in the platforms directory.
See ./configure --help for more info.
1 parent 9c91932 commit 16769da

File tree

4 files changed

+130
-17
lines changed

4 files changed

+130
-17
lines changed

‎conf/Makefile.am

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
11
MAINTAINERCLEANFILES = Makefile.in
22

3+
CONFFILES = logger.xml dirlayout.xml
4+
5+
if UNIMRCP_CLIENT_LIB
6+
CONFFILES += unimrcpclient.xml unimrcpclient.xsd
7+
endif
8+
9+
if UNIMRCP_SERVER_LIB
10+
CONFFILES += unimrcpserver.xml unimrcpserver.xsd
11+
endif
12+
13+
if UMC
14+
CONFFILES += umcscenarios.xml
15+
endif
16+
317
def-conf:
418
test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
5-
for conffile in `find $(top_srcdir)/conf/ -maxdepth 1 -name \*.xml -o -name \*.xsd` ; do \
6-
filename=`echo $$conffile | sed -e 's|^.*/||'`; \
7-
$(INSTALL) -m 644 $(top_srcdir)/conf/$$filename $(DESTDIR)$(sysconfdir); \
19+
for conffile in $(CONFFILES) ; do \
20+
$(INSTALL) -m 644 $(top_srcdir)/conf/$$conffile $(DESTDIR)$(sysconfdir); \
821
done
9-
22+
if UNIMRCP_CLIENT_LIB
1023
test -d $(DESTDIR)$(sysconfdir)/client-profiles || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/client-profiles
1124
for conffile in `find $(top_srcdir)/conf/client-profiles/ -maxdepth 1 -name \*.xml -o -name \*.xsd` ; do \
1225
filename=`echo $$conffile | sed -e 's|^.*/||'`; \
1326
$(INSTALL) -m 644 $(top_srcdir)/conf/client-profiles/$$filename $(DESTDIR)$(sysconfdir)/client-profiles; \
1427
done
28+
endif
1529

1630
install-data-local:
1731
test -d $(DESTDIR)$(sysconfdir) || $(MAKE) def-conf

‎configure.ac

+64-6
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,55 @@ if test "${enable_maintainer_mode}" != "no"; then
114114
fi
115115
fi
116116

117-
dnl Enable test suites.
118-
AC_ARG_ENABLE(test-suites,
119-
[AC_HELP_STRING([--enable-test-suites ],[build test suites])],
120-
[enable_test_suites="$enableval"],
121-
[enable_test_suites="no"])
117+
dnl UniMRCP client library.
118+
AC_ARG_ENABLE(client-lib,
119+
[AC_HELP_STRING([--disable-client-lib ],[exclude unimrcpclient lib from build])],
120+
[enable_client_lib="$enableval"],
121+
[enable_client_lib="yes"])
122122

123-
AM_CONDITIONAL([TEST_SUITES],[test "${enable_test_suites}" != "no"])
123+
AM_CONDITIONAL([UNIMRCP_CLIENT_LIB],[test "${enable_client_lib}" = "yes"])
124+
125+
dnl Sample UniMRCP client application in C.
126+
AC_ARG_ENABLE(client-app,
127+
[AC_HELP_STRING([--disable-client-app ],[exclude sample unimrcpclient app from build])],
128+
[enable_client_app="$enableval"],
129+
[enable_client_app="yes"])
130+
131+
AM_CONDITIONAL([UNIMRCP_CLIENT_APP],[test "${enable_client_lib}" = "yes" && test "${enable_client_app}" = "yes"])
132+
133+
dnl Sample UniMRCP client application in C++.
134+
AC_ARG_ENABLE(umc,
135+
[AC_HELP_STRING([--disable-umc ],[exclude sample unimrcpclient C++ app from build])],
136+
[enable_umc="$enableval"],
137+
[enable_umc="yes"])
138+
139+
AM_CONDITIONAL([UMC],[test "${enable_client_lib}" = "yes" && test "${enable_umc}" = "yes"])
140+
141+
dnl Miscellaneous ASR client library and application.
142+
AC_ARG_ENABLE(asr-client,
143+
[AC_HELP_STRING([--disable-asr-client ],[exclude misc ASR client lib and app from build])],
144+
[enable_asr_client="$enableval"],
145+
[enable_asr_client="yes"])
146+
147+
AM_CONDITIONAL([ASR_CLIENT],[test "${enable_client_lib}" = "yes" && test "${enable_asr_client}" = "yes"])
148+
149+
AM_CONDITIONAL([COMMON_CLIENT_DATA],[test "${enable_client_app}" = "yes" || test "${enable_umc}" = "yes" ||test "${enable_asr_client}" = "yes"])
150+
151+
dnl UniMRCP server library.
152+
AC_ARG_ENABLE(server-lib,
153+
[AC_HELP_STRING([--disable-server-lib ],[exclude unimrcpserver lib from build])],
154+
[enable_server_lib="$enableval"],
155+
[enable_server_lib="yes"])
156+
157+
AM_CONDITIONAL([UNIMRCP_SERVER_LIB],[test "${enable_server_lib}" = "yes"])
158+
159+
dnl UniMRCP server application.
160+
AC_ARG_ENABLE(server-app,
161+
[AC_HELP_STRING([--disable-server-app ],[exclude unimrcpserver app from build])],
162+
[enable_server_app="$enableval"],
163+
[enable_server_app="yes"])
164+
165+
AM_CONDITIONAL([UNIMRCP_SERVER_APP],[test "${enable_server_lib}" = "yes" && test "${enable_server_app}" = "yes"])
124166

125167
dnl Demo synthesizer plugin.
126168
UNI_PLUGIN_ENABLED(demosynth)
@@ -142,6 +184,14 @@ UNI_PLUGIN_ENABLED(recorder)
142184

143185
AM_CONDITIONAL([RECORDER_PLUGIN],[test "${enable_recorder_plugin}" = "yes"])
144186

187+
dnl Enable test suites.
188+
AC_ARG_ENABLE(test-suites,
189+
[AC_HELP_STRING([--enable-test-suites ],[build test suites])],
190+
[enable_test_suites="$enableval"],
191+
[enable_test_suites="no"])
192+
193+
AM_CONDITIONAL([TEST_SUITES],[test "${enable_test_suites}" != "no"])
194+
145195
AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
146196

147197
AC_CONFIG_FILES([
@@ -205,6 +255,14 @@ echo Compiler flags................ : $CFLAGS
205255
echo Preprocessor definitions...... : $CPPFLAGS
206256
echo Linker flags.................. : $LDFLAGS
207257
echo
258+
echo UniMRCP client lib............ : $enable_client_lib
259+
echo Sample UniMRCP client app..... : $enable_client_app
260+
echo Sample UMC C++ client app..... : $enable_umc
261+
echo Misc ASR client lib and app... : $enable_asr_client
262+
echo
263+
echo UniMRCP server lib............ : $enable_server_lib
264+
echo UniMRCP server app............ : $enable_server_app
265+
echo
208266
echo Demo synthesizer plugin....... : $enable_demosynth_plugin
209267
echo Demo recognizer plugin........ : $enable_demorecog_plugin
210268
echo Demo verifier plugin.......... : $enable_demoverifier_plugin

‎data/Makefile.am

+23-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
MAINTAINERCLEANFILES = Makefile.in
22

3+
DATAFILES =
4+
5+
if COMMON_CLIENT_DATA
6+
DATAFILES += grammar.jsgf grammar.mixed grammar.srgs grammar.xml \
7+
speak.txt speak.xml \
8+
one-16kHz.pcm one-8kHz.pcm \
9+
johnsmith-16kHz.pcm johnsmith-8kHz.pcm
10+
endif
11+
12+
if DEMOSYNTH_PLUGIN
13+
DATAFILES += demo-16kHz.pcm demo-8kHz.pcm
14+
endif
15+
16+
if DEMORECOG_PLUGIN
17+
DATAFILES += result.xml
18+
endif
19+
20+
if DEMOVERIFIER_PLUGIN
21+
DATAFILES += result-verification.xml
22+
endif
23+
324
def-data:
425
test -d $(DESTDIR)$(datadir) || $(mkinstalldirs) $(DESTDIR)$(datadir)
5-
for datafile in `find $(top_srcdir)/data/ -name \*.pcm -o -name \*.xml -o -name \*.jsgf -o -name \*.txt` ; do \
6-
filename=`echo $$datafile | sed -e 's|^.*/||'`; \
7-
$(INSTALL) -m 644 $(top_srcdir)/data/$$filename $(DESTDIR)$(datadir); \
26+
for datafile in $(DATAFILES) ; do \
27+
$(INSTALL) -m 644 $(top_srcdir)/data/$$datafile $(DESTDIR)$(datadir); \
828
done
929

1030
install-data-local:

‎platforms/Makefile.am

+25-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
MAINTAINERCLEANFILES = Makefile.in
22

3-
SUBDIRS = libunimrcp-server unimrcp-server \
4-
libunimrcp-client unimrcp-client \
5-
libasr-client asr-client \
6-
umc
3+
SUBDIRS =
4+
5+
if UNIMRCP_CLIENT_LIB
6+
SUBDIRS += libunimrcp-client
7+
endif
8+
9+
if UNIMRCP_CLIENT_APP
10+
SUBDIRS += unimrcp-client
11+
endif
12+
13+
if UMC
14+
SUBDIRS += umc
15+
endif
16+
17+
if ASR_CLIENT
18+
SUBDIRS += libasr-client asr-client
19+
endif
20+
21+
if UNIMRCP_SERVER_LIB
22+
SUBDIRS += libunimrcp-server
23+
endif
24+
25+
if UNIMRCP_SERVER_APP
26+
SUBDIRS += unimrcp-server
27+
endif

0 commit comments

Comments
 (0)