3 --- configure.orig Wed May 3 21:25:54 2000
4 +++ configure Tue Jun 20 01:11:25 2000
5 @@ -1837,10 +1837,48 @@
9 +echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
10 +echo "configure:1842: checking for main in -lossaudio" >&5
11 +ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
12 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13 + echo $ac_n "(cached) $ac_c" 1>&6
15 + ac_save_LIBS="$LIBS"
16 +LIBS="-lossaudio $LIBS"
17 +cat > conftest.$ac_ext <<EOF
18 +#line 1850 "configure"
19 +#include "confdefs.h"
25 +if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
27 + eval "ac_cv_lib_$ac_lib_var=yes"
29 + echo "configure: failed program was:" >&5
30 + cat conftest.$ac_ext >&5
32 + eval "ac_cv_lib_$ac_lib_var=no"
38 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39 + echo "$ac_t""yes" 1>&6
42 + echo "$ac_t""no" 1>&6
47 # Extract the first word of "cp", so it can be a program name with args.
48 set dummy cp; ac_word=$2
49 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
50 -echo "configure:1844: checking for $ac_word" >&5
51 +echo "configure:1882: checking for $ac_word" >&5
52 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
53 echo $ac_n "(cached) $ac_c" 1>&6
58 echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
59 -echo "configure:1879: checking which audio driver to install" >&5
60 +echo "configure:1917: checking which audio driver to install" >&5
61 my_have_audio_driver=no
63 *linux*) my_have_audio_driver=yes
67 echo $ac_n "checking build system type""... $ac_c" 1>&6
68 -echo "configure:1997: checking build system type" >&5
69 +echo "configure:2035: checking build system type" >&5
72 case "$build_alias" in
74 # Extract the first word of "ranlib", so it can be a program name with args.
75 set dummy ranlib; ac_word=$2
76 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
77 -echo "configure:2017: checking for $ac_word" >&5
78 +echo "configure:2055: checking for $ac_word" >&5
79 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
80 echo $ac_n "(cached) $ac_c" 1>&6
83 # Extract the first word of "gcc", so it can be a program name with args.
84 set dummy gcc; ac_word=$2
85 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
86 -echo "configure:2047: checking for $ac_word" >&5
87 +echo "configure:2085: checking for $ac_word" >&5
88 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
89 echo $ac_n "(cached) $ac_c" 1>&6
92 # Extract the first word of "cc", so it can be a program name with args.
93 set dummy cc; ac_word=$2
94 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
95 -echo "configure:2077: checking for $ac_word" >&5
96 +echo "configure:2115: checking for $ac_word" >&5
97 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
98 echo $ac_n "(cached) $ac_c" 1>&6
100 @@ -2124,7 +2162,7 @@
101 # Extract the first word of "cl", so it can be a program name with args.
102 set dummy cl; ac_word=$2
103 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
104 -echo "configure:2128: checking for $ac_word" >&5
105 +echo "configure:2166: checking for $ac_word" >&5
106 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
107 echo $ac_n "(cached) $ac_c" 1>&6
109 @@ -2156,7 +2194,7 @@
112 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
113 -echo "configure:2160: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
114 +echo "configure:2198: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
117 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
118 @@ -2167,12 +2205,12 @@
120 cat > conftest.$ac_ext << EOF
122 -#line 2171 "configure"
123 +#line 2209 "configure"
124 #include "confdefs.h"
128 -if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
129 +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
130 ac_cv_prog_cc_works=yes
131 # If we can't run a trivial program, we are probably using a cross compiler.
132 if (./conftest; exit) 2>/dev/null; then
133 @@ -2198,12 +2236,12 @@
134 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
136 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
137 -echo "configure:2202: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
138 +echo "configure:2240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
139 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
140 cross_compiling=$ac_cv_prog_cc_cross
142 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
143 -echo "configure:2207: checking whether we are using GNU C" >&5
144 +echo "configure:2245: checking whether we are using GNU C" >&5
145 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
146 echo $ac_n "(cached) $ac_c" 1>&6
148 @@ -2212,7 +2250,7 @@
152 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
153 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
157 @@ -2231,7 +2269,7 @@
158 ac_save_CFLAGS="$CFLAGS"
160 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
161 -echo "configure:2235: checking whether ${CC-cc} accepts -g" >&5
162 +echo "configure:2273: checking whether ${CC-cc} accepts -g" >&5
163 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
164 echo $ac_n "(cached) $ac_c" 1>&6
166 @@ -2274,7 +2312,7 @@
167 if test "$ac_cv_prog_gcc" = yes; then
168 # Check if gcc -print-prog-name=ld gives a path.
169 echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
170 -echo "configure:2278: checking for ld used by GCC" >&5
171 +echo "configure:2316: checking for ld used by GCC" >&5
172 ac_prog=`($CC -print-prog-name=ld) 2>&5`
174 # Accept absolute paths.
175 @@ -2298,10 +2336,10 @@
177 elif test "$with_gnu_ld" = yes; then
178 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
179 -echo "configure:2302: checking for GNU ld" >&5
180 +echo "configure:2340: checking for GNU ld" >&5
182 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
183 -echo "configure:2305: checking for non-GNU ld" >&5
184 +echo "configure:2343: checking for non-GNU ld" >&5
186 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
187 echo $ac_n "(cached) $ac_c" 1>&6
188 @@ -2336,7 +2374,7 @@
190 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
191 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
192 -echo "configure:2340: checking if the linker ($LD) is GNU ld" >&5
193 +echo "configure:2378: checking if the linker ($LD) is GNU ld" >&5
194 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
195 echo $ac_n "(cached) $ac_c" 1>&6
197 @@ -2352,7 +2390,7 @@
200 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
201 -echo "configure:2356: checking for BSD-compatible nm" >&5
202 +echo "configure:2394: checking for BSD-compatible nm" >&5
203 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
204 echo $ac_n "(cached) $ac_c" 1>&6
206 @@ -2388,7 +2426,7 @@
207 echo "$ac_t""$NM" 1>&6
209 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
210 -echo "configure:2392: checking whether ln -s works" >&5
211 +echo "configure:2430: checking whether ln -s works" >&5
212 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
213 echo $ac_n "(cached) $ac_c" 1>&6
215 @@ -2442,8 +2480,8 @@
218 # Find out which ABI we are using.
219 - echo '#line 2446 "configure"' > conftest.$ac_ext
220 - if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
221 + echo '#line 2484 "configure"' > conftest.$ac_ext
222 + if { (eval echo configure:2485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
223 case "`/usr/bin/file conftest.o`" in
226 @@ -2464,19 +2502,19 @@
227 SAVE_CFLAGS="$CFLAGS"
228 CFLAGS="$CFLAGS -belf"
229 echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
230 -echo "configure:2468: checking whether the C compiler needs -belf" >&5
231 +echo "configure:2506: checking whether the C compiler needs -belf" >&5
232 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
233 echo $ac_n "(cached) $ac_c" 1>&6
235 cat > conftest.$ac_ext <<EOF
236 -#line 2473 "configure"
237 +#line 2511 "configure"
238 #include "confdefs.h"
244 -if { (eval echo configure:2480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
245 +if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
247 lt_cv_cc_needs_belf=yes
249 @@ -2764,6 +2802,7 @@
250 s%@QT_INCLUDES@%$QT_INCLUDES%g
251 s%@QT_LDFLAGS@%$QT_LDFLAGS%g
253 +s%@LIBAUDIO@%$LIBAUDIO%g
256 s%@build_alias@%$build_alias%g