]>
Commit | Line | Data |
---|---|---|
a7e6bfef JB |
1 | --- opal-3.10.9/plugins/configure.ac.orig 2012-11-26 11:48:31.000000000 +0100 |
2 | +++ opal-3.10.9/plugins/configure.ac 2013-01-20 17:38:22.322544339 +0100 | |
3 | @@ -158,7 +158,7 @@ | |
4 | fi | |
5 | if test "x${HAVE_GSM0610}" = "xyes" ; then | |
6 | AC_CONFIG_FILES(audio/GSM0610/Makefile) | |
7 | - SUBDIRS+=" audio/GSM0610" | |
8 | + SUBDIRS="$SUBDIRS audio/GSM0610" | |
9 | ||
10 | AC_ARG_ENABLE([localgsm], | |
11 | [AC_HELP_STRING([--enable-localgsm],[Force use local version of GSM library rather than system version])], | |
12 | @@ -208,7 +208,7 @@ | |
13 | fi | |
14 | if test "x${HAVE_GSMAMR}" = "xyes" ; then | |
15 | AC_CONFIG_FILES(audio/gsm-amr/Makefile) | |
16 | - SUBDIRS+=" audio/gsm-amr" | |
17 | + SUBDIRS="$SUBDIRS audio/gsm-amr" | |
18 | fi | |
19 | ||
20 | dnl ######### | |
21 | @@ -223,7 +223,7 @@ | |
22 | fi | |
23 | if test "x${HAVE_iLBC}" = "xyes" ; then | |
24 | AC_CONFIG_FILES(audio/iLBC/Makefile) | |
25 | - SUBDIRS+=" audio/iLBC" | |
26 | + SUBDIRS="$SUBDIRS audio/iLBC" | |
27 | ||
28 | OPAL_DETERMINE_ILBC() | |
29 | AC_SUBST(ILBC_SYSTEM) | |
30 | @@ -244,7 +244,7 @@ | |
31 | if test "x${HAVE_SPEEX}" = "xyes" ; then | |
32 | AC_OUTPUT(audio/Speex/libspeex/speex_config_types.h) | |
33 | AC_CONFIG_FILES(audio/Speex/Makefile) | |
34 | - SUBDIRS+=" audio/Speex" | |
35 | + SUBDIRS="$SUBDIRS audio/Speex" | |
36 | ||
37 | OPAL_SPEEX_TYPES() | |
38 | AC_SUBST(SIZE16) | |
39 | @@ -267,7 +267,7 @@ | |
40 | fi | |
41 | if test "x${HAVE_G722}" = "xyes" ; then | |
42 | AC_CONFIG_FILES(audio/G722/Makefile) | |
43 | - SUBDIRS+=" audio/G722" | |
44 | + SUBDIRS="$SUBDIRS audio/G722" | |
45 | fi | |
46 | ||
47 | dnl ######### | |
48 | @@ -282,7 +282,7 @@ | |
49 | fi | |
50 | if test "x${HAVE_G7221}" = "xyes" ; then | |
51 | AC_CONFIG_FILES(audio/G.722.1/Makefile) | |
52 | - SUBDIRS+=" audio/G.722.1" | |
53 | + SUBDIRS="$SUBDIRS audio/G.722.1" | |
54 | fi | |
55 | ||
56 | dnl ######### | |
57 | @@ -297,7 +297,7 @@ | |
58 | fi | |
59 | if test "x${HAVE_G7222}" = "xyes" ; then | |
60 | AC_CONFIG_FILES(audio/G.722.2/Makefile) | |
61 | - SUBDIRS+=" audio/G.722.2" | |
62 | + SUBDIRS="$SUBDIRS audio/G.722.2" | |
63 | fi | |
64 | ||
65 | dnl ######### | |
66 | @@ -312,7 +312,7 @@ | |
67 | fi | |
68 | if test "x${HAVE_G726}" = "xyes" ; then | |
69 | AC_CONFIG_FILES(audio/G726/Makefile) | |
70 | - SUBDIRS+=" audio/G726" | |
71 | + SUBDIRS="$SUBDIRS audio/G726" | |
72 | fi | |
73 | ||
74 | dnl ######### | |
75 | @@ -327,7 +327,7 @@ | |
76 | fi | |
77 | if test "x${HAVE_LPC10}" = "xyes" ; then | |
78 | AC_CONFIG_FILES(audio/LPC_10/Makefile) | |
79 | - SUBDIRS+=" audio/LPC_10" | |
80 | + SUBDIRS="$SUBDIRS audio/LPC_10" | |
81 | fi | |
82 | ||
83 | dnl ######### | |
84 | @@ -342,7 +342,7 @@ | |
85 | fi | |
86 | if test "x${HAVE_IMA_ADPCM}" = "xyes" ; then | |
87 | AC_CONFIG_FILES(audio/IMA_ADPCM/Makefile) | |
88 | - SUBDIRS+=" audio/IMA_ADPCM" | |
89 | + SUBDIRS="$SUBDIRS audio/IMA_ADPCM" | |
90 | fi | |
91 | ||
92 | dnl ######### | |
93 | @@ -362,7 +362,7 @@ | |
94 | fi | |
95 | if test "x${HAVE_SBC}" = "xyes" ; then | |
96 | AC_CONFIG_FILES(audio/SBC/Makefile) | |
97 | - SUBDIRS+=" audio/SBC" | |
98 | + SUBDIRS="$SUBDIRS audio/SBC" | |
99 | fi | |
100 | ||
101 | dnl ######### | |
102 | @@ -388,7 +388,7 @@ | |
103 | CELT_CFLAGS="${CELT_CFLAGS} -DCELT_VERSION=\"`pkg-config --modversion celt | \ | |
104 | sed -e "s/\./*10000+/" -e "s/\./*100+/"`\"" | |
105 | AC_CONFIG_FILES(audio/celt/Makefile) | |
106 | - SUBDIRS+=" audio/celt" | |
107 | + SUBDIRS="$SUBDIRS audio/celt" | |
108 | fi | |
109 | ||
110 | dnl ######### | |
111 | @@ -403,7 +403,7 @@ | |
112 | fi | |
113 | if test "x${HAVE_SILK}" = "xyes" ; then | |
114 | AC_CONFIG_FILES(audio/SILK/Makefile) | |
115 | - SUBDIRS+=" audio/SILK" | |
116 | + SUBDIRS="$SUBDIRS audio/SILK" | |
117 | fi | |
118 | ||
119 | ||
120 | @@ -421,7 +421,7 @@ | |
121 | fi | |
122 | if test "x${HAVE_H261}" = "xyes" ; then | |
123 | AC_CONFIG_FILES(video/H.261-vic/Makefile) | |
124 | - SUBDIRS+=" video/H.261-vic" | |
125 | + SUBDIRS="$SUBDIRS video/H.261-vic" | |
126 | fi | |
127 | ||
128 | ||
129 | @@ -534,12 +534,12 @@ | |
130 | ||
131 | if test "x${HAVE_LIBAVCODEC}" = "xyes"; then | |
132 | AC_CONFIG_FILES(video/H.263-1998/Makefile) | |
133 | - SUBDIRS+=" video/H.263-1998" | |
134 | + SUBDIRS="$SUBDIRS video/H.263-1998" | |
135 | fi | |
136 | ||
137 | if test "x${HAVE_LIBAVCODEC}" = "xyes"; then | |
138 | AC_CONFIG_FILES(video/MPEG4-ffmpeg/Makefile) | |
139 | - SUBDIRS+=" video/MPEG4-ffmpeg" | |
140 | + SUBDIRS="$SUBDIRS video/MPEG4-ffmpeg" | |
141 | fi | |
142 | ||
143 | ||
144 | @@ -577,7 +577,7 @@ | |
145 | [AC_HELP_STRING([--enable-x264-licensed],[enable commercially licensed x264 support])], | |
146 | [IS_H264_LICENSED=$enableval]) | |
147 | ||
148 | - SUBDIRS+=" video/H.264" | |
149 | + SUBDIRS="$SUBDIRS video/H.264" | |
150 | AC_CONFIG_FILES(video/H.264/Makefile) | |
151 | AC_CONFIG_FILES(video/H.264/gpl/Makefile) | |
152 | fi | |
153 | @@ -605,7 +605,7 @@ | |
154 | fi | |
155 | if test "x$HAVE_THEORA" = "xyes" ; then | |
156 | AC_CONFIG_FILES(video/THEORA/Makefile) | |
157 | - SUBDIRS+=" video/THEORA" | |
158 | + SUBDIRS="$SUBDIRS video/THEORA" | |
159 | fi | |
160 | ||
161 | ||
162 | @@ -639,7 +639,7 @@ | |
163 | ||
164 | if test "x$HAVE_IXJ" = "xyes" ; then | |
165 | AC_CONFIG_FILES(LID/IxJ/Makefile) | |
166 | - SUBDIRS+=" LID/IxJ" | |
167 | + SUBDIRS="$SUBDIRS LID/IxJ" | |
168 | fi | |
169 | ||
170 | dnl ######################## | |
171 | @@ -650,7 +650,7 @@ | |
172 | fi | |
173 | if test "x$HAVE_VPB" = "xyes" ; then | |
174 | AC_CONFIG_FILES(LID/VPB/Makefile) | |
175 | - SUBDIRS+=" LID/VPB" | |
176 | + SUBDIRS="$SUBDIRS LID/VPB" | |
177 | fi | |
178 | ||
179 | ||
180 | @@ -675,7 +675,7 @@ | |
181 | ||
182 | if test "x$HAVE_SPANDSP" = "xyes" ; then | |
183 | AC_CONFIG_FILES(fax/fax_spandsp/Makefile) | |
184 | - SUBDIRS+=" fax/fax_spandsp" | |
185 | + SUBDIRS="$SUBDIRS fax/fax_spandsp" | |
186 | fi | |
187 | ||
188 |