Line 0
Link Here
|
|
|
1 |
|
2 |
$FreeBSD$ |
3 |
|
4 |
--- configure.orig |
5 |
+++ configure |
6 |
@@ -6433,214 +6433,8 @@ |
7 |
|
8 |
|
9 |
|
10 |
- ALSA_REQUIRED=1.0.0 |
11 |
- ALSA_MODULES="alsa >= $ALSA_REQUIRED" |
12 |
- |
13 |
- succeeded=no |
14 |
- |
15 |
- # Extract the first word of "pkg-config", so it can be a program name with args. |
16 |
-set dummy pkg-config; ac_word=$2 |
17 |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
18 |
-$as_echo_n "checking for $ac_word... " >&6; } |
19 |
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then |
20 |
- $as_echo_n "(cached) " >&6 |
21 |
-else |
22 |
- case $PKG_CONFIG in |
23 |
- [\\/]* | ?:[\\/]*) |
24 |
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
25 |
- ;; |
26 |
- *) |
27 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
28 |
-for as_dir in $PATH |
29 |
-do |
30 |
- IFS=$as_save_IFS |
31 |
- test -z "$as_dir" && as_dir=. |
32 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
33 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
34 |
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
35 |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
36 |
- break 2 |
37 |
- fi |
38 |
-done |
39 |
-done |
40 |
-IFS=$as_save_IFS |
41 |
- |
42 |
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" |
43 |
- ;; |
44 |
-esac |
45 |
-fi |
46 |
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
47 |
-if test -n "$PKG_CONFIG"; then |
48 |
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 |
49 |
-$as_echo "$PKG_CONFIG" >&6; } |
50 |
-else |
51 |
- { $as_echo "$as_me:$LINENO: result: no" >&5 |
52 |
-$as_echo "no" >&6; } |
53 |
-fi |
54 |
- |
55 |
- |
56 |
- |
57 |
- if test "$PKG_CONFIG" = "no" ; then |
58 |
- HAVE_ALSA=no |
59 |
- else |
60 |
- PKG_CONFIG_MIN_VERSION=0.9.0 |
61 |
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then |
62 |
- { $as_echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5 |
63 |
-$as_echo_n "checking for $ALSA_MODULES... " >&6; } |
64 |
- |
65 |
- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then |
66 |
- { $as_echo "$as_me:$LINENO: result: yes" >&5 |
67 |
-$as_echo "yes" >&6; } |
68 |
- succeeded=yes |
69 |
- |
70 |
- { $as_echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 |
71 |
-$as_echo_n "checking ALSA_CFLAGS... " >&6; } |
72 |
- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'` |
73 |
- { $as_echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 |
74 |
-$as_echo "$ALSA_CFLAGS" >&6; } |
75 |
- |
76 |
- { $as_echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 |
77 |
-$as_echo_n "checking ALSA_LIBS... " >&6; } |
78 |
- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'` |
79 |
- { $as_echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 |
80 |
-$as_echo "$ALSA_LIBS" >&6; } |
81 |
- else |
82 |
- { $as_echo "$as_me:$LINENO: result: no" >&5 |
83 |
-$as_echo "no" >&6; } |
84 |
- ALSA_CFLAGS="" |
85 |
- ALSA_LIBS="" |
86 |
- ## If we have a custom action on failure, don't print errors, but |
87 |
- ## do set a variable so people can do so. |
88 |
- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"` |
89 |
- |
90 |
- fi |
91 |
- |
92 |
- |
93 |
- |
94 |
- else |
95 |
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." |
96 |
- echo "*** See http://www.freedesktop.org/software/pkgconfig" |
97 |
- fi |
98 |
- fi |
99 |
- |
100 |
- if test $succeeded = yes; then |
101 |
- HAVE_ALSA=yes |
102 |
- else |
103 |
- HAVE_ALSA=no |
104 |
- fi |
105 |
- |
106 |
- if test $HAVE_ALSA = yes; then |
107 |
- SAVE_CFLAGS="$CFLAGS" |
108 |
- SAVE_LDFLAGS="$LDFLAGS" |
109 |
- CFLAGS="$ALSA_CFLAGS $CFLAGS" |
110 |
- LDFLAGS="$ALSA_LIBS $LDFLAGS" |
111 |
- cat >conftest.$ac_ext <<_ACEOF |
112 |
-/* confdefs.h. */ |
113 |
-_ACEOF |
114 |
-cat confdefs.h >>conftest.$ac_ext |
115 |
-cat >>conftest.$ac_ext <<_ACEOF |
116 |
-/* end confdefs.h. */ |
117 |
-#include <asoundlib.h> |
118 |
-int |
119 |
-main () |
120 |
-{ |
121 |
-snd_lib_error_set_handler (0); |
122 |
- ; |
123 |
- return 0; |
124 |
-} |
125 |
-_ACEOF |
126 |
-rm -f conftest.$ac_objext |
127 |
-if { (ac_try="$ac_compile" |
128 |
-case "(($ac_try" in |
129 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
130 |
- *) ac_try_echo=$ac_try;; |
131 |
-esac |
132 |
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
133 |
-$as_echo "$ac_try_echo") >&5 |
134 |
- (eval "$ac_compile") 2>conftest.er1 |
135 |
- ac_status=$? |
136 |
- grep -v '^ *+' conftest.er1 >conftest.err |
137 |
- rm -f conftest.er1 |
138 |
- cat conftest.err >&5 |
139 |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
140 |
- (exit $ac_status); } && { |
141 |
- test -z "$ac_c_werror_flag" || |
142 |
- test ! -s conftest.err |
143 |
- } && test -s conftest.$ac_objext; then |
144 |
- emacs_alsa_normal=yes |
145 |
-else |
146 |
- $as_echo "$as_me: failed program was:" >&5 |
147 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
148 |
- |
149 |
- emacs_alsa_normal=no |
150 |
fi |
151 |
|
152 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
153 |
- if test "$emacs_alsa_normal" != yes; then |
154 |
- cat >conftest.$ac_ext <<_ACEOF |
155 |
-/* confdefs.h. */ |
156 |
-_ACEOF |
157 |
-cat confdefs.h >>conftest.$ac_ext |
158 |
-cat >>conftest.$ac_ext <<_ACEOF |
159 |
-/* end confdefs.h. */ |
160 |
-#include <alsa/asoundlib.h> |
161 |
-int |
162 |
-main () |
163 |
-{ |
164 |
-snd_lib_error_set_handler (0); |
165 |
- ; |
166 |
- return 0; |
167 |
-} |
168 |
-_ACEOF |
169 |
-rm -f conftest.$ac_objext |
170 |
-if { (ac_try="$ac_compile" |
171 |
-case "(($ac_try" in |
172 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
173 |
- *) ac_try_echo=$ac_try;; |
174 |
-esac |
175 |
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
176 |
-$as_echo "$ac_try_echo") >&5 |
177 |
- (eval "$ac_compile") 2>conftest.er1 |
178 |
- ac_status=$? |
179 |
- grep -v '^ *+' conftest.er1 >conftest.err |
180 |
- rm -f conftest.er1 |
181 |
- cat conftest.err >&5 |
182 |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
183 |
- (exit $ac_status); } && { |
184 |
- test -z "$ac_c_werror_flag" || |
185 |
- test ! -s conftest.err |
186 |
- } && test -s conftest.$ac_objext; then |
187 |
- emacs_alsa_subdir=yes |
188 |
-else |
189 |
- $as_echo "$as_me: failed program was:" >&5 |
190 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
191 |
- |
192 |
- emacs_alsa_subdir=no |
193 |
-fi |
194 |
- |
195 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
196 |
- if test "$emacs_alsa_subdir" != yes; then |
197 |
- { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&5 |
198 |
-$as_echo "$as_me: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&2;} |
199 |
- { (exit 1); exit 1; }; } |
200 |
- fi |
201 |
- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" |
202 |
- fi |
203 |
- |
204 |
- CFLAGS="$SAVE_CFLAGS" |
205 |
- LDFLAGS="$SAVE_LDFLAGS" |
206 |
- LIBSOUND="$LIBSOUND $ALSA_LIBS" |
207 |
- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" |
208 |
- |
209 |
-cat >>confdefs.h <<\_ACEOF |
210 |
-#define HAVE_ALSA 1 |
211 |
-_ACEOF |
212 |
- |
213 |
- fi |
214 |
- |
215 |
-fi |
216 |
- |
217 |
- |
218 |
|
219 |
|
220 |
|