1
--- btscanner-2.1.orig/configure.in
2
+++ btscanner-2.1/configure.in
6
CFLAGS="$CFLAGS -Wall -pthread -Wshadow -Wbad-function-cast \
7
- -Wformat -Wimplicit-function-dec -Wparentheses -Wsign-compare \
8
+ -Wformat -Wparentheses -Wsign-compare \
9
-Wstrict-prototypes -Wtrigraphs -Wundef -Wuninitialized \
10
-W -Wunused -Wformat-security -Wmissing-braces -Wbad-function-cast \
11
-Wcast-qual -falign-functions -falign-labels -falign-loops\
12
--- btscanner-2.1.orig/aclocal.m4
13
+++ btscanner-2.1/aclocal.m4
15
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
16
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
18
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
19
# 2005 Free Software Foundation, Inc.
21
# Call AM_AUTOMAKE_VERSION so it can be traced.
22
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
23
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
24
- [AM_AUTOMAKE_VERSION([1.9.5])])
25
+ [AM_AUTOMAKE_VERSION([1.9.6])])
27
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
29
--- btscanner-2.1.orig/Makefile.in
30
+++ btscanner-2.1/Makefile.in
32
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
33
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
36
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
41
-SOURCES = $(btscanner_SOURCES)
44
top_srcdir = @top_srcdir@
46
--- btscanner-2.1.orig/configure
47
+++ btscanner-2.1/configure
50
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
59
echo "$as_me:$LINENO: \$? = $ac_status" >&5
60
(exit $ac_status); } &&
61
- { ac_try='test -z "$ac_c_werror_flag"
62
- || test ! -s conftest.err'
63
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
64
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
69
echo "$as_me:$LINENO: \$? = $ac_status" >&5
70
(exit $ac_status); } &&
71
- { ac_try='test -z "$ac_c_werror_flag"
72
- || test ! -s conftest.err'
73
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
74
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
79
echo "$as_me:$LINENO: \$? = $ac_status" >&5
80
(exit $ac_status); } &&
81
- { ac_try='test -z "$ac_c_werror_flag"
82
- || test ! -s conftest.err'
83
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
84
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
89
echo "$as_me:$LINENO: \$? = $ac_status" >&5
90
(exit $ac_status); } &&
91
- { ac_try='test -z "$ac_c_werror_flag"
92
- || test ! -s conftest.err'
93
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
94
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
99
echo "$as_me:$LINENO: \$? = $ac_status" >&5
100
(exit $ac_status); } &&
101
- { ac_try='test -z "$ac_c_werror_flag"
102
- || test ! -s conftest.err'
103
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
104
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
107
@@ -2633,8 +2628,7 @@
109
echo "$as_me:$LINENO: \$? = $ac_status" >&5
110
(exit $ac_status); } &&
111
- { ac_try='test -z "$ac_c_werror_flag"
112
- || test ! -s conftest.err'
113
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
114
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
117
@@ -2930,8 +2924,7 @@
119
echo "$as_me:$LINENO: \$? = $ac_status" >&5
120
(exit $ac_status); } &&
121
- { ac_try='test -z "$ac_c_werror_flag"
122
- || test ! -s conftest.err'
123
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
124
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
127
@@ -2985,8 +2978,7 @@
129
echo "$as_me:$LINENO: \$? = $ac_status" >&5
130
(exit $ac_status); } &&
131
- { ac_try='test -z "$ac_c_werror_flag"
132
- || test ! -s conftest.err'
133
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
134
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
137
@@ -3053,8 +3045,7 @@
139
echo "$as_me:$LINENO: \$? = $ac_status" >&5
140
(exit $ac_status); } &&
141
- { ac_try='test -z "$ac_c_werror_flag"
142
- || test ! -s conftest.err'
143
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
144
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
147
@@ -3126,8 +3117,7 @@
149
echo "$as_me:$LINENO: \$? = $ac_status" >&5
150
(exit $ac_status); } &&
151
- { ac_try='test -z "$ac_c_werror_flag"
152
- || test ! -s conftest.err'
153
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
154
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
157
@@ -3199,8 +3189,7 @@
159
echo "$as_me:$LINENO: \$? = $ac_status" >&5
160
(exit $ac_status); } &&
161
- { ac_try='test -z "$ac_c_werror_flag"
162
- || test ! -s conftest.err'
163
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
164
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
167
@@ -3272,8 +3261,7 @@
169
echo "$as_me:$LINENO: \$? = $ac_status" >&5
170
(exit $ac_status); } &&
171
- { ac_try='test -z "$ac_c_werror_flag"
172
- || test ! -s conftest.err'
173
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
174
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
177
@@ -3345,8 +3333,7 @@
179
echo "$as_me:$LINENO: \$? = $ac_status" >&5
180
(exit $ac_status); } &&
181
- { ac_try='test -z "$ac_c_werror_flag"
182
- || test ! -s conftest.err'
183
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
184
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
187
@@ -3670,8 +3657,7 @@
189
echo "$as_me:$LINENO: \$? = $ac_status" >&5
190
(exit $ac_status); } &&
191
- { ac_try='test -z "$ac_c_werror_flag"
192
- || test ! -s conftest.err'
193
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
194
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
197
@@ -3841,8 +3827,7 @@
199
echo "$as_me:$LINENO: \$? = $ac_status" >&5
200
(exit $ac_status); } &&
201
- { ac_try='test -z "$ac_c_werror_flag"
202
- || test ! -s conftest.err'
203
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
204
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
207
@@ -3918,8 +3903,7 @@
209
echo "$as_me:$LINENO: \$? = $ac_status" >&5
210
(exit $ac_status); } &&
211
- { ac_try='test -z "$ac_c_werror_flag"
212
- || test ! -s conftest.err'
213
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
214
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
217
@@ -4068,8 +4052,7 @@
219
echo "$as_me:$LINENO: \$? = $ac_status" >&5
220
(exit $ac_status); } &&
221
- { ac_try='test -z "$ac_c_werror_flag"
222
- || test ! -s conftest.err'
223
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
224
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
227
@@ -4222,8 +4205,7 @@
229
echo "$as_me:$LINENO: \$? = $ac_status" >&5
230
(exit $ac_status); } &&
231
- { ac_try='test -z "$ac_c_werror_flag"
232
- || test ! -s conftest.err'
233
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
234
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
237
@@ -4419,8 +4401,7 @@
239
echo "$as_me:$LINENO: \$? = $ac_status" >&5
240
(exit $ac_status); } &&
241
- { ac_try='test -z "$ac_c_werror_flag"
242
- || test ! -s conftest.err'
243
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
244
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
247
@@ -4483,8 +4464,7 @@
249
echo "$as_me:$LINENO: \$? = $ac_status" >&5
250
(exit $ac_status); } &&
251
- { ac_try='test -z "$ac_c_werror_flag"
252
- || test ! -s conftest.err'
253
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
254
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
257
@@ -4603,8 +4583,7 @@
259
echo "$as_me:$LINENO: \$? = $ac_status" >&5
260
(exit $ac_status); } &&
261
- { ac_try='test -z "$ac_c_werror_flag"
262
- || test ! -s conftest.err'
263
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
264
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
267
@@ -4839,8 +4818,7 @@
269
echo "$as_me:$LINENO: \$? = $ac_status" >&5
270
(exit $ac_status); } &&
271
- { ac_try='test -z "$ac_c_werror_flag"
272
- || test ! -s conftest.err'
273
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
274
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
277
@@ -4939,8 +4917,7 @@
279
echo "$as_me:$LINENO: \$? = $ac_status" >&5
280
(exit $ac_status); } &&
281
- { ac_try='test -z "$ac_c_werror_flag"
282
- || test ! -s conftest.err'
283
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
284
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
287
@@ -5114,8 +5091,7 @@
289
echo "$as_me:$LINENO: \$? = $ac_status" >&5
290
(exit $ac_status); } &&
291
- { ac_try='test -z "$ac_c_werror_flag"
292
- || test ! -s conftest.err'
293
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
294
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
297
@@ -5267,8 +5243,7 @@
299
echo "$as_me:$LINENO: \$? = $ac_status" >&5
300
(exit $ac_status); } &&
301
- { ac_try='test -z "$ac_c_werror_flag"
302
- || test ! -s conftest.err'
303
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
304
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
307
@@ -5310,7 +5285,7 @@
310
CFLAGS="$CFLAGS -Wall -pthread -Wshadow -Wbad-function-cast \
311
- -Wformat -Wimplicit-function-dec -Wparentheses -Wsign-compare \
312
+ -Wformat -Wparentheses -Wsign-compare \
313
-Wstrict-prototypes -Wtrigraphs -Wundef -Wuninitialized \
314
-W -Wunused -Wformat-security -Wmissing-braces -Wbad-function-cast \
315
-Wcast-qual -falign-functions -falign-labels -falign-loops\
316
@@ -6196,11 +6171,6 @@
317
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
320
- if test x"$ac_file" != x-; then
321
- { echo "$as_me:$LINENO: creating $ac_file" >&5
322
-echo "$as_me: creating $ac_file" >&6;}
325
# Let's still pretend it is `configure' which instantiates (i.e., don't
326
# use $as_me), people would be surprised to read:
327
# /* config.h. Generated by config.status. */
328
@@ -6239,6 +6209,12 @@
331
done` || { (exit 1); exit 1; }
333
+ if test x"$ac_file" != x-; then
334
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
335
+echo "$as_me: creating $ac_file" >&6;}
339
cat >>$CONFIG_STATUS <<_ACEOF