]>
Commit | Line | Data |
---|---|---|
ac139c07 | 1 | diff -aurN alsa-patch-bay-1.0.0.orig/m4/aclocal-include.m4 alsa-patch-bay-1.0.0/m4/aclocal-include.m4 |
2 | --- alsa-patch-bay-1.0.0.orig/m4/aclocal-include.m4 1970-01-01 01:00:00.000000000 +0100 | |
3 | +++ alsa-patch-bay-1.0.0/m4/aclocal-include.m4 2002-02-19 19:59:18.000000000 +0100 | |
4 | @@ -0,0 +1,16 @@ | |
5 | +# aclocal-include.m4 | |
6 | +# | |
7 | +# This macro adds the name macrodir to the set of directories | |
8 | +# that `aclocal' searches for macros. | |
9 | + | |
10 | +# serial 1 | |
11 | + | |
12 | +dnl AM_ACLOCAL_INCLUDE(macrodir) | |
13 | +AC_DEFUN([AM_ACLOCAL_INCLUDE], | |
14 | +[ | |
15 | + AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) | |
16 | + | |
17 | + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" | |
18 | + | |
19 | + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done | |
20 | +]) | |
21 | diff -aurN alsa-patch-bay-1.0.0.orig/m4/alsa.m4 alsa-patch-bay-1.0.0/m4/alsa.m4 | |
22 | --- alsa-patch-bay-1.0.0.orig/m4/alsa.m4 1970-01-01 01:00:00.000000000 +0100 | |
23 | +++ alsa-patch-bay-1.0.0/m4/alsa.m4 2002-03-01 22:58:41.000000000 +0100 | |
24 | @@ -0,0 +1,146 @@ | |
25 | +dnl Configure Paths for Alsa | |
26 | +dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org> | |
27 | +dnl Christopher Lansdown <lansdoct@cs.alfred.edu> | |
28 | +dnl Jaroslav Kysela <perex@suse.cz> | |
29 | +dnl Last modification: alsa.m4,v 1.19 2001/12/19 07:28:40 perex Exp | |
30 | +dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | |
31 | +dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. | |
32 | +dnl enables arguments --with-alsa-prefix= | |
33 | +dnl --with-alsa-enc-prefix= | |
34 | +dnl --disable-alsatest (this has no effect, as yet) | |
35 | +dnl | |
36 | +dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, | |
37 | +dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. | |
38 | +dnl | |
39 | +AC_DEFUN(AM_PATH_ALSA, | |
40 | +[dnl Save the original CFLAGS, LDFLAGS, and LIBS | |
41 | +alsa_save_CFLAGS="$CFLAGS" | |
42 | +alsa_save_LDFLAGS="$LDFLAGS" | |
43 | +alsa_save_LIBS="$LIBS" | |
44 | +alsa_found=yes | |
45 | + | |
46 | +dnl | |
47 | +dnl Get the cflags and libraries for alsa | |
48 | +dnl | |
49 | +AC_ARG_WITH(alsa-prefix, | |
50 | +[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], | |
51 | +[alsa_prefix="$withval"], [alsa_prefix=""]) | |
52 | + | |
53 | +AC_ARG_WITH(alsa-inc-prefix, | |
54 | +[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], | |
55 | +[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) | |
56 | + | |
57 | +dnl FIXME: this is not yet implemented | |
58 | +AC_ARG_ENABLE(alsatest, | |
59 | +[ --disable-alsatest Do not try to compile and run a test Alsa program], | |
60 | +[enable_alsatest=no], | |
61 | +[enable_alsatest=yes]) | |
62 | + | |
63 | +dnl Add any special include directories | |
64 | +AC_MSG_CHECKING(for ALSA CFLAGS) | |
65 | +if test "$alsa_inc_prefix" != "" ; then | |
66 | + ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" | |
67 | + CFLAGS="$CFLAGS -I$alsa_inc_prefix" | |
68 | +fi | |
69 | +AC_MSG_RESULT($ALSA_CFLAGS) | |
70 | + | |
71 | +dnl add any special lib dirs | |
72 | +AC_MSG_CHECKING(for ALSA LDFLAGS) | |
73 | +if test "$alsa_prefix" != "" ; then | |
74 | + ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" | |
75 | + LDFLAGS="$LDFLAGS $ALSA_LIBS" | |
76 | +fi | |
77 | + | |
78 | +dnl add the alsa library | |
79 | +ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" | |
80 | +LIBS=`echo $LIBS | sed 's/-lm//'` | |
81 | +LIBS=`echo $LIBS | sed 's/-ldl//'` | |
82 | +LIBS=`echo $LIBS | sed 's/-lpthread//'` | |
83 | +LIBS=`echo $LIBS | sed 's/ //'` | |
84 | +LIBS="$ALSA_LIBS $LIBS" | |
85 | +AC_MSG_RESULT($ALSA_LIBS) | |
86 | + | |
87 | +dnl Check for a working version of libasound that is of the right version. | |
88 | +min_alsa_version=ifelse([$1], ,0.1.1,$1) | |
89 | +AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) | |
90 | +no_alsa="" | |
91 | + alsa_min_major_version=`echo $min_alsa_version | \ | |
92 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
93 | + alsa_min_minor_version=`echo $min_alsa_version | \ | |
94 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
95 | + alsa_min_micro_version=`echo $min_alsa_version | \ | |
96 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
97 | + | |
98 | +AC_LANG_SAVE | |
99 | +AC_LANG_C | |
100 | +AC_TRY_COMPILE([ | |
101 | +#include <alsa/asoundlib.h> | |
102 | +], [ | |
103 | +void main(void) | |
104 | +{ | |
105 | +/* ensure backward compatibility */ | |
106 | +#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) | |
107 | +#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR | |
108 | +#endif | |
109 | +#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) | |
110 | +#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR | |
111 | +#endif | |
112 | +#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) | |
113 | +#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR | |
114 | +#endif | |
115 | + | |
116 | +# if(SND_LIB_MAJOR > $alsa_min_major_version) | |
117 | + exit(0); | |
118 | +# else | |
119 | +# if(SND_LIB_MAJOR < $alsa_min_major_version) | |
120 | +# error not present | |
121 | +# endif | |
122 | + | |
123 | +# if(SND_LIB_MINOR > $alsa_min_minor_version) | |
124 | + exit(0); | |
125 | +# else | |
126 | +# if(SND_LIB_MINOR < $alsa_min_minor_version) | |
127 | +# error not present | |
128 | +# endif | |
129 | + | |
130 | +# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) | |
131 | +# error not present | |
132 | +# endif | |
133 | +# endif | |
134 | +# endif | |
135 | +exit(0); | |
136 | +} | |
137 | +], | |
138 | + [AC_MSG_RESULT(found.)], | |
139 | + [AC_MSG_RESULT(not present.) | |
140 | + ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) | |
141 | + alsa_found=no] | |
142 | +) | |
143 | +AC_LANG_RESTORE | |
144 | + | |
145 | +dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. | |
146 | +AC_CHECK_LIB([asound], [snd_seq_create_event],, | |
147 | + [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) | |
148 | + alsa_found=no] | |
149 | +) | |
150 | + | |
151 | +if test "x$alsa_found" = "xyes" ; then | |
152 | + ifelse([$2], , :, [$2]) | |
153 | + LIBS=`echo $LIBS | sed 's/-lasound//g'` | |
154 | + LIBS=`echo $LIBS | sed 's/ //'` | |
155 | + LIBS="-lasound $LIBS" | |
156 | +fi | |
157 | +if test "x$alsa_found" = "xno" ; then | |
158 | + ifelse([$3], , :, [$3]) | |
159 | + CFLAGS="$alsa_save_CFLAGS" | |
160 | + LDFLAGS="$alsa_save_LDFLAGS" | |
161 | + LIBS="$alsa_save_LIBS" | |
162 | + ALSA_CFLAGS="" | |
163 | + ALSA_LIBS="" | |
164 | +fi | |
165 | + | |
166 | +dnl That should be it. Now just export out symbols: | |
167 | +AC_SUBST(ALSA_CFLAGS) | |
168 | +AC_SUBST(ALSA_LIBS) | |
169 | +]) | |
170 | + | |
171 | diff -aurN alsa-patch-bay-1.0.0.orig/m4/fltk.m4 alsa-patch-bay-1.0.0/m4/fltk.m4 | |
172 | --- alsa-patch-bay-1.0.0.orig/m4/fltk.m4 1970-01-01 01:00:00.000000000 +0100 | |
173 | +++ alsa-patch-bay-1.0.0/m4/fltk.m4 2003-05-07 18:35:26.000000000 +0200 | |
174 | @@ -0,0 +1,99 @@ | |
175 | +# | |
176 | +# fltk.m4 | |
177 | +# | |
178 | +# You have permission to use this file under GNU's General Public License, | |
179 | +# version 2 or later | |
180 | +# | |
181 | +# Copyright (C) 2002 Robert Ham (node@users.sourceforge.net) | |
182 | +# | |
183 | + | |
184 | +AC_DEFUN([AC_LIB_FLTK],[ | |
185 | + AC_LANG_PUSH([C++]) | |
186 | + AC_ARG_ENABLE( | |
187 | + [fltktest], | |
188 | + AC_HELP_STRING([--disable-fltktest], | |
189 | + [assume fltk is installed and skip the test]), | |
190 | + [ | |
191 | + case "$enableval" in | |
192 | + "yes") | |
193 | + FLTK_TEST="yes" | |
194 | + ;; | |
195 | + "no") | |
196 | + FLTK_TEST="no" | |
197 | + ;; | |
198 | + *) | |
199 | + AC_MSG_ERROR([must use --enable-fltktest(=yes/no) or --disable-fltktest]) | |
200 | + ;; | |
201 | + esac | |
202 | + ], | |
203 | + [ FLTK_TEST="yes" | |
204 | + ]) | |
205 | + | |
206 | + if test "$FLTK_TEST" = "no"; then | |
207 | + AC_MSG_WARN([fltk test disabled: assuming FLTK_LDFLAGS="-lfltk" and FLTK_CXXFLAGS=""]) | |
208 | + FLTK_LDFLAGS="-lfltk" | |
209 | + FLTK_CXXFLAGS="" | |
210 | + FLTK_FOUND="yes" | |
211 | + else | |
212 | + AC_CACHE_VAL( | |
213 | + [fltk_cv_prog_fltkconfig], | |
214 | + [ | |
215 | + AC_ARG_WITH( | |
216 | + [fltk-config], | |
217 | + AC_HELP_STRING([--with-fltk-config=DIR], | |
218 | + [the directory containing the fltk-config program]), | |
219 | + [ | |
220 | + case "$withval" in | |
221 | + "yes") | |
222 | + if test -d yes; then | |
223 | + FLTK_CONFIG_PATH="yes" | |
224 | + else | |
225 | + AC_MSG_ERROR([you must use --with-fltk-config=DIR with DIR as a directory name]) | |
226 | + fi | |
227 | + ;; | |
228 | + "no") | |
229 | + AC_MSG_ERROR([you must use --with-fltk-config=DIR with DIR as a directory name]) | |
230 | + ;; | |
231 | + *) | |
232 | + FLTK_CONFIG_PATH="$withval" | |
233 | + ;; | |
234 | + esac | |
235 | + ]) | |
236 | + | |
237 | + if test "$FLTK_CONFIG_PATH" = ""; then | |
238 | + AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no]) | |
239 | + else | |
240 | + AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no], "${FLTK_CONFIG_PATH}:${PATH}") | |
241 | + fi | |
242 | + | |
243 | + if test "$FLTK_CONFIG" = "no"; then | |
244 | + AC_MSG_WARN([could not find the fltk-config program - try using --with-fltk-config=DIR]) | |
245 | + FLTK_FOUND="no" | |
246 | + else | |
247 | + fltk_needed_version=ifelse([$1], ,no,$1) | |
248 | + if test x$fltk_needed_version != xno; then | |
249 | + fltk_config_version="$( "$FLTK_CONFIG" --api-version )" | |
250 | + AC_MSG_CHECKING([for fltk == $fltk_config_version]) | |
251 | + if test x$fltk_config_version = x$fltk_needed_version; then | |
252 | + AC_MSG_RESULT([$fltk_config_version (ok)]) | |
253 | + FLTK_FOUND="yes" | |
254 | + else | |
255 | + AC_MSG_RESULT([$fltk_config_version (not ok)]) | |
256 | + FLTK_FOUND="no" | |
257 | + fi | |
258 | + fi | |
259 | + fi | |
260 | + | |
261 | + fltk_cv_prog_fltkconfig="$FLTK_CONFIG" | |
262 | + ]) | |
263 | + | |
264 | + FLTK_CXXFLAGS="$( "$fltk_cv_prog_fltkconfig" --cxxflags )" | |
265 | + FLTK_LDFLAGS="$( "$fltk_cv_prog_fltkconfig" --ldflags )" | |
266 | + FLTK_FOUND="yes" | |
267 | + | |
268 | + fi | |
269 | + AC_LANG_POP([C++]) | |
270 | + | |
271 | + AC_SUBST(FLTK_CXXFLAGS) | |
272 | + AC_SUBST(FLTK_LDFLAGS) | |
273 | +]) |