« back to all changes in this revision
Viewing changes to debian/patches/99_autoreconf.patch
- browse files at revision 30
- compare with another revision
- download diff
- download tarball
- view history from revision 30
- Committer: Andreas Noteng
- Date: 2010-05-03 20:06:48 UTC
- Revision ID: andreas@andreas-laptop-20100503200648-hlzgbymtnsxck8ay
Update the 99_autoreconf.patch
- files modified:
- debian/changelog
added
removed
debian/patches/99_autoreconf.patch
1
diff -uNr transmission-1.92.pristine/aclocal.m4 transmission-1.92/aclocal.m4
2
--- transmission-1.92.pristine/aclocal.m4 2010-03-12 13:21:40.177737128 +0100
3
+++ transmission-1.92/aclocal.m4 2010-03-12 13:21:49.917776222 +0100
1
Index: transmission-1.93/aclocal.m4
2
===================================================================
3
--- transmission-1.93.orig/aclocal.m4 2010-05-03 21:56:02.590118850 +0200
4
+++ transmission-1.93/aclocal.m4 2010-05-03 21:56:39.000000000 +0200
4
5
@@ -13,8 +13,8 @@
5
6
6
7
m4_ifndef([AC_AUTOCONF_VERSION],
12
13
You have another version of autoconf. It may work, but is not guaranteed to.
13
14
If you have problems, you may need to regenerate the build system entirely.
14
15
To do so, use the procedure documented by the package, typically `autoreconf'.])])
15
diff -uNr transmission-1.92.pristine/autom4te.cache/output.0 transmission-1.92/autom4te.cache/output.0
16
diff -uNr transmission-1.92.pristine/autom4te.cache/output.1 transmission-1.92/autom4te.cache/output.1
17
diff -uNr transmission-1.92.pristine/autom4te.cache/requests transmission-1.92/autom4te.cache/requests
18
diff -uNr transmission-1.92.pristine/autom4te.cache/traces.0 transmission-1.92/autom4te.cache/traces.0
19
diff -uNr transmission-1.92.pristine/autom4te.cache/traces.1 transmission-1.92/autom4te.cache/traces.1
20
diff -uNr transmission-1.92.pristine/cli/Makefile.in transmission-1.92/cli/Makefile.in
21
--- transmission-1.92.pristine/cli/Makefile.in 2010-03-12 13:21:40.185736607 +0100
22
+++ transmission-1.92/cli/Makefile.in 2010-03-12 13:21:53.921754870 +0100
16
Index: transmission-1.93/cli/Makefile.in
17
===================================================================
18
--- transmission-1.93.orig/cli/Makefile.in 2010-05-03 21:56:03.490117732 +0200
19
+++ transmission-1.93/cli/Makefile.in 2010-05-03 21:56:48.000000000 +0200
23
20
@@ -201,6 +201,8 @@
24
21
LIBTOOL = @LIBTOOL@
25
22
LIPO = @LIPO@
45
42
sysconfdir = @sysconfdir@
46
43
target_alias = @target_alias@
47
44
top_build_prefix = @top_build_prefix@
48
diff -uNr transmission-1.92.pristine/configure transmission-1.92/configure
49
--- transmission-1.92.pristine/configure 2010-03-12 13:21:40.209756765 +0100
50
+++ transmission-1.92/configure 2010-03-12 13:21:53.337754809 +0100
45
Index: transmission-1.93/configure
46
===================================================================
47
--- transmission-1.93.orig/configure 2010-05-03 21:56:02.806119409 +0200
48
+++ transmission-1.93/configure 2010-05-03 21:56:47.000000000 +0200
51
49
@@ -1,20 +1,24 @@
52
50
#! /bin/sh
53
51
# Guess values for system-dependent variables and create Makefiles.
54
-# Generated by GNU Autoconf 2.63 for transmission 1.92.
55
+# Generated by GNU Autoconf 2.65 for transmission 1.92.
52
-# Generated by GNU Autoconf 2.63 for transmission 1.93.
53
+# Generated by GNU Autoconf 2.65 for transmission 1.93.
56
54
#
57
55
# Report bugs to <http://trac.transmissionbt.com/newticket>.
58
56
#
857
855
# Identity of this package.
858
856
PACKAGE_NAME='transmission'
859
857
@@ -748,6 +704,7 @@
860
PACKAGE_VERSION='1.92'
861
PACKAGE_STRING='transmission 1.92'
858
PACKAGE_VERSION='1.93'
859
PACKAGE_STRING='transmission 1.93'
862
860
PACKAGE_BUGREPORT='http://trac.transmissionbt.com/newticket'
863
861
+PACKAGE_URL=''
864
862
907
905
GIO_LIBS
908
906
LIBNOTIFY_CFLAGS
909
907
@@ -1064,7 +1024,7 @@
910
LIBGCONF_LIBS
908
GCONF2_LIBS
911
909
DBUS_GLIB_CFLAGS
912
910
DBUS_GLIB_LIBS'
913
911
-ac_subdirs_all='third-party/libevent'
1055
1053
GIO_CFLAGS C compiler flags for GIO, overriding pkg-config
1056
1054
GIO_LIBS linker flags for GIO, overriding pkg-config
1057
1055
LIBNOTIFY_CFLAGS
1058
@@ -1845,189 +1796,706 @@
1056
@@ -1844,189 +1795,706 @@
1059
1057
if $ac_init_version; then
1060
1058
cat <<\_ACEOF
1061
transmission configure 1.92
1059
transmission configure 1.93
1062
1060
-generated by GNU Autoconf 2.63
1063
1061
+generated by GNU Autoconf 2.65
1064
1062
1074
1072
-This file contains any messages produced by compilers while
1075
1073
-running configure, to aid debugging if configure makes a mistake.
1076
1074
1077
-It was created by transmission $as_me 1.92, which was
1075
-It was created by transmission $as_me 1.93, which was
1078
1076
-generated by GNU Autoconf 2.63. Invocation command line was
1079
1077
+## ------------------------ ##
1080
1078
+## Autoconf initialization. ##
1746
1744
+This file contains any messages produced by compilers while
1747
1745
+running configure, to aid debugging if configure makes a mistake.
1748
1746
+
1749
+It was created by transmission $as_me 1.92, which was
1747
+It was created by transmission $as_me 1.93, which was
1750
1748
+generated by GNU Autoconf 2.65. Invocation command line was
1751
1749
+
1752
1750
+ $ $0 $@
1919
1917
_ASBOX
1920
1918
echo
1921
1919
for ac_var in $ac_subst_files
1922
@@ -2060,39 +2528,41 @@
1920
@@ -2059,39 +2527,41 @@
1923
1921
exit $exit_status
1924
1922
' 0
1925
1923
for ac_signal in 1 2 13 15; do
1966
1964
1967
1965
# Let the site file select an alternate cache file if it wants to.
1968
1966
# Prefer an explicitly selected file to automatically selected ones.
1969
@@ -2110,8 +2580,8 @@
1967
@@ -2109,8 +2579,8 @@
1970
1968
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
1971
1969
do
1972
1970
test "x$ac_site_file" = xNONE && continue
1977
1975
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
1978
1976
sed 's/^/| /' "$ac_site_file" >&5
1979
1977
. "$ac_site_file"
1980
@@ -2119,10 +2589,10 @@
1978
@@ -2118,10 +2588,10 @@
1981
1979
done
1982
1980
1983
1981
if test -r "$cache_file"; then
1992
1990
$as_echo "$as_me: loading cache $cache_file" >&6;}
1993
1991
case $cache_file in
1994
1992
[\\/]* | ?:[\\/]* ) . "$cache_file";;
1995
@@ -2130,7 +2600,7 @@
1993
@@ -2129,7 +2599,7 @@
1996
1994
esac
1997
1995
fi
1998
1996
else
2001
1999
$as_echo "$as_me: creating cache $cache_file" >&6;}
2002
2000
>$cache_file
2003
2001
fi
2004
@@ -2145,11 +2615,11 @@
2002
@@ -2144,11 +2614,11 @@
2005
2003
eval ac_new_val=\$ac_env_${ac_var}_value
2006
2004
case $ac_old_set,$ac_new_set in
2007
2005
set,)
2015
2013
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
2016
2014
ac_cache_corrupted=: ;;
2017
2015
,);;
2018
@@ -2159,17 +2629,17 @@
2016
@@ -2158,17 +2628,17 @@
2019
2017
ac_old_val_w=`echo x $ac_old_val`
2020
2018
ac_new_val_w=`echo x $ac_new_val`
2021
2019
if test "$ac_old_val_w" != "$ac_new_val_w"; then
2037
2035
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
2038
2036
fi;;
2039
2037
esac
2040
@@ -2181,43 +2651,20 @@
2038
@@ -2180,43 +2650,20 @@
2041
2039
esac
2042
2040
case " $ac_configure_args " in
2043
2041
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
2088
2086
2089
2087
ac_ext=c
2090
2088
ac_cpp='$CPP $CPPFLAGS'
2091
@@ -2232,7 +2679,7 @@
2089
@@ -2231,7 +2678,7 @@
2092
2090
2093
2091
2094
2092
# Check whether --enable-silent-rules was given.
2097
2095
enableval=$enable_silent_rules;
2098
2096
fi
2099
2097
2100
@@ -2251,24 +2698,16 @@
2098
@@ -2250,24 +2697,16 @@
2101
2099
2102
2100
ac_aux_dir=
2103
2101
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2130
2128
fi
2131
2129
2132
2130
# These three variables are undocumented and unsupported,
2133
@@ -2294,10 +2733,10 @@
2131
@@ -2293,10 +2732,10 @@
2134
2132
# OS/2's system install, which has a completely different semantic
2135
2133
# ./install, which can be erroneously created by make from ./install.sh.
2136
2134
# Reject install programs that cannot install multiple files.
2143
2141
$as_echo_n "(cached) " >&6
2144
2142
else
2145
2143
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2146
@@ -2305,11 +2744,11 @@
2144
@@ -2304,11 +2743,11 @@
2147
2145
do
2148
2146
IFS=$as_save_IFS
2149
2147
test -z "$as_dir" && as_dir=.
2159
2157
/usr/ucb/* ) ;;
2160
2158
*)
2161
2159
# OSF1 and SCO ODT 3.0 have their own names for install.
2162
@@ -2346,7 +2785,7 @@
2160
@@ -2345,7 +2784,7 @@
2163
2161
;;
2164
2162
esac
2165
2163
2168
2166
IFS=$as_save_IFS
2169
2167
2170
2168
rm -rf conftest.one conftest.two conftest.dir
2171
@@ -2362,7 +2801,7 @@
2169
@@ -2361,7 +2800,7 @@
2172
2170
INSTALL=$ac_install_sh
2173
2171
fi
2174
2172
fi
2177
2175
$as_echo "$INSTALL" >&6; }
2178
2176
2179
2177
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2180
@@ -2373,7 +2812,7 @@
2178
@@ -2372,7 +2811,7 @@
2181
2179
2182
2180
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2183
2181
2186
2184
$as_echo_n "checking whether build environment is sane... " >&6; }
2187
2185
# Just in case
2188
2186
sleep 1
2189
@@ -2384,15 +2823,11 @@
2187
@@ -2383,15 +2822,11 @@
2190
2188
'
2191
2189
case `pwd` in
2192
2190
*[\\\"\#\$\&\'\`$am_lf]*)
2204
2202
esac
2205
2203
2206
2204
# Do `set' in a subshell so we don't clobber the current shell's
2207
@@ -2414,11 +2849,8 @@
2205
@@ -2413,11 +2848,8 @@
2208
2206
# if, for instance, CONFIG_SHELL is bash and it inherits a
2209
2207
# broken ls alias from the environment. This has actually
2210
2208
# happened. Such a system could not be considered "sane".
2218
2216
fi
2219
2217
2220
2218
test "$2" = conftest.file
2221
@@ -2427,13 +2859,10 @@
2219
@@ -2426,13 +2858,10 @@
2222
2220
# Ok.
2223
2221
:
2224
2222
else
2235
2233
$as_echo "yes" >&6; }
2236
2234
test "$program_prefix" != NONE &&
2237
2235
program_transform_name="s&^&$program_prefix&;$program_transform_name"
2238
@@ -2461,7 +2890,7 @@
2236
@@ -2460,7 +2889,7 @@
2239
2237
am_missing_run="$MISSING --run "
2240
2238
else
2241
2239
am_missing_run=
2244
2242
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2245
2243
fi
2246
2244
2247
@@ -2482,9 +2911,9 @@
2245
@@ -2481,9 +2910,9 @@
2248
2246
if test -n "$ac_tool_prefix"; then
2249
2247
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2250
2248
set dummy ${ac_tool_prefix}strip; ac_word=$2
2256
2254
$as_echo_n "(cached) " >&6
2257
2255
else
2258
2256
if test -n "$STRIP"; then
2259
@@ -2495,24 +2924,24 @@
2257
@@ -2494,24 +2923,24 @@
2260
2258
do
2261
2259
IFS=$as_save_IFS
2262
2260
test -z "$as_dir" && as_dir=.
2286
2284
$as_echo "no" >&6; }
2287
2285
fi
2288
2286
2289
@@ -2522,9 +2951,9 @@
2287
@@ -2521,9 +2950,9 @@
2290
2288
ac_ct_STRIP=$STRIP
2291
2289
# Extract the first word of "strip", so it can be a program name with args.
2292
2290
set dummy strip; ac_word=$2
2298
2296
$as_echo_n "(cached) " >&6
2299
2297
else
2300
2298
if test -n "$ac_ct_STRIP"; then
2301
@@ -2535,24 +2964,24 @@
2299
@@ -2534,24 +2963,24 @@
2302
2300
do
2303
2301
IFS=$as_save_IFS
2304
2302
test -z "$as_dir" && as_dir=.
2328
2326
$as_echo "no" >&6; }
2329
2327
fi
2330
2328
2331
@@ -2561,7 +2990,7 @@
2329
@@ -2560,7 +2989,7 @@
2332
2330
else
2333
2331
case $cross_compiling:$ac_tool_warned in
2334
2332
yes:)
2337
2335
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2338
2336
ac_tool_warned=yes ;;
2339
2337
esac
2340
@@ -2574,10 +3003,10 @@
2338
@@ -2573,10 +3002,10 @@
2341
2339
fi
2342
2340
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2343
2341
2350
2348
$as_echo_n "(cached) " >&6
2351
2349
else
2352
2350
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2353
@@ -2585,7 +3014,7 @@
2351
@@ -2584,7 +3013,7 @@
2354
2352
do
2355
2353
IFS=$as_save_IFS
2356
2354
test -z "$as_dir" && as_dir=.
2359
2357
for ac_exec_ext in '' $ac_executable_extensions; do
2360
2358
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2361
2359
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2362
@@ -2597,11 +3026,12 @@
2360
@@ -2596,11 +3025,12 @@
2363
2361
esac
2364
2362
done
2365
2363
done
2373
2371
if test "${ac_cv_path_mkdir+set}" = set; then
2374
2372
MKDIR_P="$ac_cv_path_mkdir -p"
2375
2373
else
2376
@@ -2609,11 +3039,10 @@
2374
@@ -2608,11 +3038,10 @@
2377
2375
# value for MKDIR_P within a source directory, because that will
2378
2376
# break other packages using the cache if that directory is
2379
2377
# removed, or if the value is a relative name.
2386
2384
$as_echo "$MKDIR_P" >&6; }
2387
2385
2388
2386
mkdir_p="$MKDIR_P"
2389
@@ -2626,9 +3055,9 @@
2387
@@ -2625,9 +3054,9 @@
2390
2388
do
2391
2389
# Extract the first word of "$ac_prog", so it can be a program name with args.
2392
2390
set dummy $ac_prog; ac_word=$2
2398
2396
$as_echo_n "(cached) " >&6
2399
2397
else
2400
2398
if test -n "$AWK"; then
2401
@@ -2639,24 +3068,24 @@
2399
@@ -2638,24 +3067,24 @@
2402
2400
do
2403
2401
IFS=$as_save_IFS
2404
2402
test -z "$as_dir" && as_dir=.
2428
2426
$as_echo "no" >&6; }
2429
2427
fi
2430
2428
2431
@@ -2664,11 +3093,11 @@
2429
@@ -2663,11 +3092,11 @@
2432
2430
test -n "$AWK" && break
2433
2431
done
2434
2432
2442
2440
$as_echo_n "(cached) " >&6
2443
2441
else
2444
2442
cat >conftest.make <<\_ACEOF
2445
@@ -2686,11 +3115,11 @@
2443
@@ -2685,11 +3114,11 @@
2446
2444
rm -f conftest.make
2447
2445
fi
2448
2446
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2456
2454
$as_echo "no" >&6; }
2457
2455
SET_MAKE="MAKE=${MAKE-make}"
2458
2456
fi
2459
@@ -2710,9 +3139,7 @@
2457
@@ -2709,9 +3138,7 @@
2460
2458
am__isrc=' -I$(srcdir)'
2461
2459
# test to see if srcdir already configured
2462
2460
if test -f $srcdir/config.status; then
2467
2465
fi
2468
2466
fi
2469
2467
2470
@@ -2763,7 +3190,7 @@
2468
@@ -2762,7 +3189,7 @@
2471
2469
AMTAR=${AMTAR-"${am_missing_run}tar"}
2472
2470
2473
2471
2476
2474
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
2477
2475
# Loop over all known methods to create a tar archive until one works.
2478
2476
_am_tools='gnutar plaintar pax cpio none'
2479
@@ -2836,13 +3263,13 @@
2477
@@ -2835,13 +3262,13 @@
2480
2478
done
2481
2479
rm -rf conftest.dir
2482
2480
2492
2490
$as_echo "$am_cv_prog_tar_ustar" >&6; }
2493
2491
2494
2492
2495
@@ -2851,7 +3278,7 @@
2493
@@ -2850,7 +3277,7 @@
2496
2494
2497
2495
case `pwd` in
2498
2496
*\ * | *\ *)
2501
2499
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
2502
2500
esac
2503
2501
2504
@@ -2876,35 +3303,27 @@
2502
@@ -2875,35 +3302,27 @@
2505
2503
2506
2504
# Make sure we can run config.sub.
2507
2505
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
2544
2542
esac
2545
2543
build=$ac_cv_build
2546
2544
ac_save_IFS=$IFS; IFS='-'
2547
@@ -2920,28 +3339,24 @@
2545
@@ -2919,28 +3338,24 @@
2548
2546
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
2549
2547
2550
2548
2578
2576
esac
2579
2577
host=$ac_cv_host
2580
2578
ac_save_IFS=$IFS; IFS='-'
2581
@@ -2969,7 +3384,7 @@
2579
@@ -2968,7 +3383,7 @@
2582
2580
.PHONY: am__doit
2583
2581
END
2584
2582
# If we don't find an include directive, just comment out the code.
2587
2585
$as_echo_n "checking for style of include used by $am_make... " >&6; }
2588
2586
am__include="#"
2589
2587
am__quote=
2590
@@ -2997,12 +3412,12 @@
2588
@@ -2996,12 +3411,12 @@
2591
2589
fi
2592
2590
2593
2591
2602
2600
enableval=$enable_dependency_tracking;
2603
2601
fi
2604
2602
2605
@@ -3027,9 +3442,9 @@
2603
@@ -3026,9 +3441,9 @@
2606
2604
if test -n "$ac_tool_prefix"; then
2607
2605
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2608
2606
set dummy ${ac_tool_prefix}gcc; ac_word=$2
2614
2612
$as_echo_n "(cached) " >&6
2615
2613
else
2616
2614
if test -n "$CC"; then
2617
@@ -3040,24 +3455,24 @@
2615
@@ -3039,24 +3454,24 @@
2618
2616
do
2619
2617
IFS=$as_save_IFS
2620
2618
test -z "$as_dir" && as_dir=.
2644
2642
$as_echo "no" >&6; }
2645
2643
fi
2646
2644
2647
@@ -3067,9 +3482,9 @@
2645
@@ -3066,9 +3481,9 @@
2648
2646
ac_ct_CC=$CC
2649
2647
# Extract the first word of "gcc", so it can be a program name with args.
2650
2648
set dummy gcc; ac_word=$2
2656
2654
$as_echo_n "(cached) " >&6
2657
2655
else
2658
2656
if test -n "$ac_ct_CC"; then
2659
@@ -3080,24 +3495,24 @@
2657
@@ -3079,24 +3494,24 @@
2660
2658
do
2661
2659
IFS=$as_save_IFS
2662
2660
test -z "$as_dir" && as_dir=.
2686
2684
$as_echo "no" >&6; }
2687
2685
fi
2688
2686
2689
@@ -3106,7 +3521,7 @@
2687
@@ -3105,7 +3520,7 @@
2690
2688
else
2691
2689
case $cross_compiling:$ac_tool_warned in
2692
2690
yes:)
2695
2693
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2696
2694
ac_tool_warned=yes ;;
2697
2695
esac
2698
@@ -3120,9 +3535,9 @@
2696
@@ -3119,9 +3534,9 @@
2699
2697
if test -n "$ac_tool_prefix"; then
2700
2698
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2701
2699
set dummy ${ac_tool_prefix}cc; ac_word=$2
2707
2705
$as_echo_n "(cached) " >&6
2708
2706
else
2709
2707
if test -n "$CC"; then
2710
@@ -3133,24 +3548,24 @@
2708
@@ -3132,24 +3547,24 @@
2711
2709
do
2712
2710
IFS=$as_save_IFS
2713
2711
test -z "$as_dir" && as_dir=.
2737
2735
$as_echo "no" >&6; }
2738
2736
fi
2739
2737
2740
@@ -3160,9 +3575,9 @@
2738
@@ -3159,9 +3574,9 @@
2741
2739
if test -z "$CC"; then
2742
2740
# Extract the first word of "cc", so it can be a program name with args.
2743
2741
set dummy cc; ac_word=$2
2749
2747
$as_echo_n "(cached) " >&6
2750
2748
else
2751
2749
if test -n "$CC"; then
2752
@@ -3174,18 +3589,18 @@
2750
@@ -3173,18 +3588,18 @@
2753
2751
do
2754
2752
IFS=$as_save_IFS
2755
2753
test -z "$as_dir" && as_dir=.
2771
2769
IFS=$as_save_IFS
2772
2770
2773
2771
if test $ac_prog_rejected = yes; then
2774
@@ -3204,10 +3619,10 @@
2772
@@ -3203,10 +3618,10 @@
2775
2773
fi
2776
2774
CC=$ac_cv_prog_CC
2777
2775
if test -n "$CC"; then
2784
2782
$as_echo "no" >&6; }
2785
2783
fi
2786
2784
2787
@@ -3219,9 +3634,9 @@
2785
@@ -3218,9 +3633,9 @@
2788
2786
do
2789
2787
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2790
2788
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2796
2794
$as_echo_n "(cached) " >&6
2797
2795
else
2798
2796
if test -n "$CC"; then
2799
@@ -3232,24 +3647,24 @@
2797
@@ -3231,24 +3646,24 @@
2800
2798
do
2801
2799
IFS=$as_save_IFS
2802
2800
test -z "$as_dir" && as_dir=.
2826
2824
$as_echo "no" >&6; }
2827
2825
fi
2828
2826
2829
@@ -3263,9 +3678,9 @@
2827
@@ -3262,9 +3677,9 @@
2830
2828
do
2831
2829
# Extract the first word of "$ac_prog", so it can be a program name with args.
2832
2830
set dummy $ac_prog; ac_word=$2
2838
2836
$as_echo_n "(cached) " >&6
2839
2837
else
2840
2838
if test -n "$ac_ct_CC"; then
2841
@@ -3276,24 +3691,24 @@
2839
@@ -3275,24 +3690,24 @@
2842
2840
do
2843
2841
IFS=$as_save_IFS
2844
2842
test -z "$as_dir" && as_dir=.
2868
2866
$as_echo "no" >&6; }
2869
2867
fi
2870
2868
2871
@@ -3306,7 +3721,7 @@
2869
@@ -3305,7 +3720,7 @@
2872
2870
else
2873
2871
case $cross_compiling:$ac_tool_warned in
2874
2872
yes:)
2877
2875
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2878
2876
ac_tool_warned=yes ;;
2879
2877
esac
2880
@@ -3317,57 +3732,37 @@
2878
@@ -3316,57 +3731,37 @@
2881
2879
fi
2882
2880
2883
2881
2955
2953
/* end confdefs.h. */
2956
2954
2957
2955
int
2958
@@ -3383,8 +3778,8 @@
2956
@@ -3382,8 +3777,8 @@
2959
2957
# Try to create an executable without -o first, disregard a.out.
2960
2958
# It will help us diagnose broken compilers, and finding out an intuition
2961
2959
# of exeext.
2966
2964
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2967
2965
2968
2966
# The possible output files:
2969
@@ -3400,17 +3795,17 @@
2967
@@ -3399,17 +3794,17 @@
2970
2968
done
2971
2969
rm -f $ac_rmfiles
2972
2970
2989
2987
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
2990
2988
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
2991
2989
# in a Makefile. We should not override ac_cv_exeext if it was cached,
2992
@@ -3427,7 +3822,7 @@
2990
@@ -3426,7 +3821,7 @@
2993
2991
# certainly right.
2994
2992
break;;
2995
2993
*.* )
2998
2996
then :; else
2999
2997
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3000
2998
fi
3001
@@ -3446,84 +3841,42 @@
2999
@@ -3445,84 +3840,42 @@
3002
3000
else
3003
3001
ac_file=''
3004
3002
fi
3104
3102
# If both `conftest.exe' and `conftest' are `present' (well, observable)
3105
3103
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
3106
3104
# work properly (i.e., refer to `conftest.exe'), while it won't with
3107
@@ -3538,32 +3891,83 @@
3105
@@ -3537,32 +3890,83 @@
3108
3106
esac
3109
3107
done
3110
3108
else
3204
3202
/* end confdefs.h. */
3205
3203
3206
3204
int
3207
@@ -3575,17 +3979,17 @@
3205
@@ -3574,17 +3978,17 @@
3208
3206
}
3209
3207
_ACEOF
3210
3208
rm -f conftest.o conftest.obj
3227
3225
for ac_file in conftest.o conftest.obj conftest.*; do
3228
3226
test -f "$ac_file" || continue;
3229
3227
case $ac_file in
3230
@@ -3598,31 +4002,23 @@
3228
@@ -3597,31 +4001,23 @@
3231
3229
$as_echo "$as_me: failed program was:" >&5
3232
3230
sed 's/^/| /' conftest.$ac_ext >&5
3233
3231
3266
3264
/* end confdefs.h. */
3267
3265
3268
3266
int
3269
@@ -3636,37 +4032,16 @@
3267
@@ -3635,37 +4031,16 @@
3270
3268
return 0;
3271
3269
}
3272
3270
_ACEOF
3307
3305
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
3308
3306
if test $ac_compiler_gnu = yes; then
3309
3307
GCC=yes
3310
@@ -3675,59 +4050,31 @@
3308
@@ -3674,59 +4049,31 @@
3311
3309
fi
3312
3310
ac_test_CFLAGS=${CFLAGS+set}
3313
3311
ac_save_CFLAGS=$CFLAGS
3382
3380
/* end confdefs.h. */
3383
3381
3384
3382
int
3385
@@ -3738,36 +4085,12 @@
3383
@@ -3737,36 +4084,12 @@
3386
3384
return 0;
3387
3385
}
3388
3386
_ACEOF
3423
3421
/* end confdefs.h. */
3424
3422
3425
3423
int
3426
@@ -3778,42 +4101,17 @@
3424
@@ -3777,42 +4100,17 @@
3427
3425
return 0;
3428
3426
}
3429
3427
_ACEOF
3468
3466
$as_echo "$ac_cv_prog_cc_g" >&6; }
3469
3467
if test "$ac_test_CFLAGS" = set; then
3470
3468
CFLAGS=$ac_save_CFLAGS
3471
@@ -3830,18 +4128,14 @@
3469
@@ -3829,18 +4127,14 @@
3472
3470
CFLAGS=
3473
3471
fi
3474
3472
fi
3490
3488
/* end confdefs.h. */
3491
3489
#include <stdarg.h>
3492
3490
#include <stdio.h>
3493
@@ -3898,32 +4192,9 @@
3491
@@ -3897,32 +4191,9 @@
3494
3492
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3495
3493
do
3496
3494
CC="$ac_save_CC $ac_arg"
3524
3522
rm -f core conftest.err conftest.$ac_objext
3525
3523
test "x$ac_cv_prog_cc_c89" != "xno" && break
3526
3524
done
3527
@@ -3934,17 +4205,19 @@
3525
@@ -3933,17 +4204,19 @@
3528
3526
# AC_CACHE_VAL
3529
3527
case "x$ac_cv_prog_cc_c89" in
3530
3528
x)
3547
3545
3548
3546
ac_ext=c
3549
3547
ac_cpp='$CPP $CPPFLAGS'
3550
@@ -3954,9 +4227,9 @@
3548
@@ -3953,9 +4226,9 @@
3551
3549
3552
3550
depcc="$CC" am_compiler_list=
3553
3551
3559
3557
$as_echo_n "(cached) " >&6
3560
3558
else
3561
3559
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3562
@@ -4064,7 +4337,7 @@
3560
@@ -4063,7 +4336,7 @@
3563
3561
fi
3564
3562
3565
3563
fi
3568
3566
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
3569
3567
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
3570
3568
3571
@@ -4079,9 +4352,9 @@
3569
@@ -4078,9 +4351,9 @@
3572
3570
fi
3573
3571
3574
3572
3580
3578
$as_echo_n "(cached) " >&6
3581
3579
else
3582
3580
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
3583
@@ -4089,7 +4362,7 @@
3581
@@ -4088,7 +4361,7 @@
3584
3582
ac_script="$ac_script$as_nl$ac_script"
3585
3583
done
3586
3584
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
3589
3587
if test -z "$SED"; then
3590
3588
ac_path_SED_found=false
3591
3589
# Loop through the user's path and test for each of PROGNAME-LIST
3592
@@ -4098,7 +4371,7 @@
3590
@@ -4097,7 +4370,7 @@
3593
3591
do
3594
3592
IFS=$as_save_IFS
3595
3593
test -z "$as_dir" && as_dir=.
3598
3596
for ac_exec_ext in '' $ac_executable_extensions; do
3599
3597
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
3600
3598
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
3601
@@ -4118,7 +4391,7 @@
3599
@@ -4117,7 +4390,7 @@
3602
3600
$as_echo '' >> "conftest.nl"
3603
3601
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
3604
3602
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3607
3605
if test $ac_count -gt ${ac_path_SED_max-0}; then
3608
3606
# Best one so far, save it but keep looking for a better one
3609
3607
ac_cv_path_SED="$ac_path_SED"
3610
@@ -4133,19 +4406,17 @@
3608
@@ -4132,19 +4405,17 @@
3611
3609
$ac_path_SED_found && break 3
3612
3610
done
3613
3611
done
3630
3628
$as_echo "$ac_cv_path_SED" >&6; }
3631
3629
SED="$ac_cv_path_SED"
3632
3630
rm -f conftest.sed
3633
@@ -4163,9 +4434,9 @@
3631
@@ -4162,9 +4433,9 @@
3634
3632
3635
3633
3636
3634
3642
3640
$as_echo_n "(cached) " >&6
3643
3641
else
3644
3642
if test -z "$GREP"; then
3645
@@ -4176,7 +4447,7 @@
3643
@@ -4175,7 +4446,7 @@
3646
3644
do
3647
3645
IFS=$as_save_IFS
3648
3646
test -z "$as_dir" && as_dir=.
3651
3649
for ac_exec_ext in '' $ac_executable_extensions; do
3652
3650
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
3653
3651
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
3654
@@ -4196,7 +4467,7 @@
3652
@@ -4195,7 +4466,7 @@
3655
3653
$as_echo 'GREP' >> "conftest.nl"
3656
3654
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3657
3655
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3660
3658
if test $ac_count -gt ${ac_path_GREP_max-0}; then
3661
3659
# Best one so far, save it but keep looking for a better one
3662
3660
ac_cv_path_GREP="$ac_path_GREP"
3663
@@ -4211,26 +4482,24 @@
3661
@@ -4210,26 +4481,24 @@
3664
3662
$ac_path_GREP_found && break 3
3665
3663
done
3666
3664
done
3692
3690
$as_echo_n "(cached) " >&6
3693
3691
else
3694
3692
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
3695
@@ -4244,7 +4513,7 @@
3693
@@ -4243,7 +4512,7 @@
3696
3694
do
3697
3695
IFS=$as_save_IFS
3698
3696
test -z "$as_dir" && as_dir=.
3701
3699
for ac_exec_ext in '' $ac_executable_extensions; do
3702
3700
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
3703
3701
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
3704
@@ -4264,7 +4533,7 @@
3702
@@ -4263,7 +4532,7 @@
3705
3703
$as_echo 'EGREP' >> "conftest.nl"
3706
3704
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3707
3705
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3710
3708
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
3711
3709
# Best one so far, save it but keep looking for a better one
3712
3710
ac_cv_path_EGREP="$ac_path_EGREP"
3713
@@ -4279,12 +4548,10 @@
3711
@@ -4278,12 +4547,10 @@
3714
3712
$ac_path_EGREP_found && break 3
3715
3713
done
3716
3714
done
3725
3723
fi
3726
3724
else
3727
3725
ac_cv_path_EGREP=$EGREP
3728
@@ -4292,14 +4559,14 @@
3726
@@ -4291,14 +4558,14 @@
3729
3727
3730
3728
fi
3731
3729
fi
3743
3741
$as_echo_n "(cached) " >&6
3744
3742
else
3745
3743
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
3746
@@ -4313,7 +4580,7 @@
3744
@@ -4312,7 +4579,7 @@
3747
3745
do
3748
3746
IFS=$as_save_IFS
3749
3747
test -z "$as_dir" && as_dir=.
3752
3750
for ac_exec_ext in '' $ac_executable_extensions; do
3753
3751
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
3754
3752
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
3755
@@ -4333,7 +4600,7 @@
3753
@@ -4332,7 +4599,7 @@
3756
3754
$as_echo 'FGREP' >> "conftest.nl"
3757
3755
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
3758
3756
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3761
3759
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
3762
3760
# Best one so far, save it but keep looking for a better one
3763
3761
ac_cv_path_FGREP="$ac_path_FGREP"
3764
@@ -4348,12 +4615,10 @@
3762
@@ -4347,12 +4614,10 @@
3765
3763
$ac_path_FGREP_found && break 3
3766
3764
done
3767
3765
done
3776
3774
fi
3777
3775
else
3778
3776
ac_cv_path_FGREP=$FGREP
3779
@@ -4361,7 +4626,7 @@
3777
@@ -4360,7 +4625,7 @@
3780
3778
3781
3779
fi
3782
3780
fi
3785
3783
$as_echo "$ac_cv_path_FGREP" >&6; }
3786
3784
FGREP="$ac_cv_path_FGREP"
3787
3785
3788
@@ -4387,7 +4652,7 @@
3786
@@ -4386,7 +4651,7 @@
3789
3787
3790
3788
3791
3789
# Check whether --with-gnu-ld was given.
3794
3792
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
3795
3793
else
3796
3794
with_gnu_ld=no
3797
@@ -4396,7 +4661,7 @@
3795
@@ -4395,7 +4660,7 @@
3798
3796
ac_prog=ld
3799
3797
if test "$GCC" = yes; then
3800
3798
# Check if gcc -print-prog-name=ld gives a path.
3803
3801
$as_echo_n "checking for ld used by $CC... " >&6; }
3804
3802
case $host in
3805
3803
*-*-mingw*)
3806
@@ -4426,13 +4691,13 @@
3804
@@ -4425,13 +4690,13 @@
3807
3805
;;
3808
3806
esac
3809
3807
elif test "$with_gnu_ld" = yes; then
3820
3818
$as_echo_n "(cached) " >&6
3821
3819
else
3822
3820
if test -z "$LD"; then
3823
@@ -4463,18 +4728,16 @@
3821
@@ -4462,18 +4727,16 @@
3824
3822
3825
3823
LD="$lt_cv_path_LD"
3826
3824
if test -n "$LD"; then
3844
3842
$as_echo_n "(cached) " >&6
3845
3843
else
3846
3844
# I'd rather use --version here, but apparently some GNU lds only accept -v.
3847
@@ -4487,7 +4750,7 @@
3845
@@ -4486,7 +4749,7 @@
3848
3846
;;
3849
3847
esac
3850
3848
fi
3853
3851
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
3854
3852
with_gnu_ld=$lt_cv_prog_gnu_ld
3855
3853
3856
@@ -4499,9 +4762,9 @@
3854
@@ -4498,9 +4761,9 @@
3857
3855
3858
3856
3859
3857
3865
3863
$as_echo_n "(cached) " >&6
3866
3864
else
3867
3865
if test -n "$NM"; then
3868
@@ -4548,7 +4811,7 @@
3866
@@ -4547,7 +4810,7 @@
3869
3867
: ${lt_cv_path_NM=no}
3870
3868
fi
3871
3869
fi
3874
3872
$as_echo "$lt_cv_path_NM" >&6; }
3875
3873
if test "$lt_cv_path_NM" != "no"; then
3876
3874
NM="$lt_cv_path_NM"
3877
@@ -4559,9 +4822,9 @@
3875
@@ -4558,9 +4821,9 @@
3878
3876
do
3879
3877
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3880
3878
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3886
3884
$as_echo_n "(cached) " >&6
3887
3885
else
3888
3886
if test -n "$DUMPBIN"; then
3889
@@ -4572,24 +4835,24 @@
3887
@@ -4571,24 +4834,24 @@
3890
3888
do
3891
3889
IFS=$as_save_IFS
3892
3890
test -z "$as_dir" && as_dir=.
3916
3914
$as_echo "no" >&6; }
3917
3915
fi
3918
3916
3919
@@ -4603,9 +4866,9 @@
3917
@@ -4602,9 +4865,9 @@
3920
3918
do
3921
3919
# Extract the first word of "$ac_prog", so it can be a program name with args.
3922
3920
set dummy $ac_prog; ac_word=$2
3928
3926
$as_echo_n "(cached) " >&6
3929
3927
else
3930
3928
if test -n "$ac_ct_DUMPBIN"; then
3931
@@ -4616,24 +4879,24 @@
3929
@@ -4615,24 +4878,24 @@
3932
3930
do
3933
3931
IFS=$as_save_IFS
3934
3932
test -z "$as_dir" && as_dir=.
3958
3956
$as_echo "no" >&6; }
3959
3957
fi
3960
3958
3961
@@ -4646,7 +4909,7 @@
3959
@@ -4645,7 +4908,7 @@
3962
3960
else
3963
3961
case $cross_compiling:$ac_tool_warned in
3964
3962
yes:)
3967
3965
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3968
3966
ac_tool_warned=yes ;;
3969
3967
esac
3970
@@ -4666,44 +4929,44 @@
3968
@@ -4665,44 +4928,44 @@
3971
3969
3972
3970
3973
3971
3980
3978
else
3981
3979
lt_cv_nm_interface="BSD nm"
3982
3980
echo "int some_variable = 0;" > conftest.$ac_ext
3983
- (eval echo "\"\$as_me:4676: $ac_compile\"" >&5)
3984
+ (eval echo "\"\$as_me:4939: $ac_compile\"" >&5)
3981
- (eval echo "\"\$as_me:4675: $ac_compile\"" >&5)
3982
+ (eval echo "\"\$as_me:4938: $ac_compile\"" >&5)
3985
3983
(eval "$ac_compile" 2>conftest.err)
3986
3984
cat conftest.err >&5
3987
- (eval echo "\"\$as_me:4679: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3988
+ (eval echo "\"\$as_me:4942: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3985
- (eval echo "\"\$as_me:4678: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3986
+ (eval echo "\"\$as_me:4941: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3989
3987
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3990
3988
cat conftest.err >&5
3991
- (eval echo "\"\$as_me:4682: output\"" >&5)
3992
+ (eval echo "\"\$as_me:4945: output\"" >&5)
3989
- (eval echo "\"\$as_me:4681: output\"" >&5)
3990
+ (eval echo "\"\$as_me:4944: output\"" >&5)
3993
3991
cat conftest.out >&5
3994
3992
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3995
3993
lt_cv_nm_interface="MS dumpbin"
4023
4021
$as_echo_n "(cached) " >&6
4024
4022
else
4025
4023
i=0
4026
@@ -4821,10 +5084,10 @@
4024
@@ -4820,10 +5083,10 @@
4027
4025
fi
4028
4026
4029
4027
if test -n $lt_cv_sys_max_cmd_len ; then
4036
4034
$as_echo "none" >&6; }
4037
4035
fi
4038
4036
max_cmd_len=$lt_cv_sys_max_cmd_len
4039
@@ -4838,7 +5101,7 @@
4037
@@ -4837,7 +5100,7 @@
4040
4038
: ${MV="mv -f"}
4041
4039
: ${RM="rm -f"}
4042
4040
4045
4043
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
4046
4044
# Try some XSI features
4047
4045
xsi_shell=no
4048
@@ -4848,17 +5111,17 @@
4046
@@ -4847,17 +5110,17 @@
4049
4047
&& eval 'test $(( 1 + 1 )) -eq 2 \
4050
4048
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
4051
4049
&& xsi_shell=yes
4066
4064
$as_echo "$lt_shell_append" >&6; }
4067
4065
4068
4066
4069
@@ -4893,14 +5156,14 @@
4067
@@ -4892,14 +5155,14 @@
4070
4068
4071
4069
4072
4070
4084
4082
$as_echo "$lt_cv_ld_reload_flag" >&6; }
4085
4083
reload_flag=$lt_cv_ld_reload_flag
4086
4084
case $reload_flag in
4087
@@ -4929,9 +5192,9 @@
4085
@@ -4928,9 +5191,9 @@
4088
4086
if test -n "$ac_tool_prefix"; then
4089
4087
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
4090
4088
set dummy ${ac_tool_prefix}objdump; ac_word=$2
4096
4094
$as_echo_n "(cached) " >&6
4097
4095
else
4098
4096
if test -n "$OBJDUMP"; then
4099
@@ -4942,24 +5205,24 @@
4097
@@ -4941,24 +5204,24 @@
4100
4098
do
4101
4099
IFS=$as_save_IFS
4102
4100
test -z "$as_dir" && as_dir=.
4126
4124
$as_echo "no" >&6; }
4127
4125
fi
4128
4126
4129
@@ -4969,9 +5232,9 @@
4127
@@ -4968,9 +5231,9 @@
4130
4128
ac_ct_OBJDUMP=$OBJDUMP
4131
4129
# Extract the first word of "objdump", so it can be a program name with args.
4132
4130
set dummy objdump; ac_word=$2
4138
4136
$as_echo_n "(cached) " >&6
4139
4137
else
4140
4138
if test -n "$ac_ct_OBJDUMP"; then
4141
@@ -4982,24 +5245,24 @@
4139
@@ -4981,24 +5244,24 @@
4142
4140
do
4143
4141
IFS=$as_save_IFS
4144
4142
test -z "$as_dir" && as_dir=.
4168
4166
$as_echo "no" >&6; }
4169
4167
fi
4170
4168
4171
@@ -5008,7 +5271,7 @@
4169
@@ -5007,7 +5270,7 @@
4172
4170
else
4173
4171
case $cross_compiling:$ac_tool_warned in
4174
4172
yes:)
4177
4175
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4178
4176
ac_tool_warned=yes ;;
4179
4177
esac
4180
@@ -5028,9 +5291,9 @@
4178
@@ -5027,9 +5290,9 @@
4181
4179
4182
4180
4183
4181
4189
4187
$as_echo_n "(cached) " >&6
4190
4188
else
4191
4189
lt_cv_file_magic_cmd='$MAGIC_CMD'
4192
@@ -5224,7 +5487,7 @@
4190
@@ -5223,7 +5486,7 @@
4193
4191
esac
4194
4192
4195
4193
fi
4198
4196
$as_echo "$lt_cv_deplibs_check_method" >&6; }
4199
4197
file_magic_cmd=$lt_cv_file_magic_cmd
4200
4198
deplibs_check_method=$lt_cv_deplibs_check_method
4201
@@ -5244,9 +5507,9 @@
4199
@@ -5243,9 +5506,9 @@
4202
4200
if test -n "$ac_tool_prefix"; then
4203
4201
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4204
4202
set dummy ${ac_tool_prefix}ar; ac_word=$2
4210
4208
$as_echo_n "(cached) " >&6
4211
4209
else
4212
4210
if test -n "$AR"; then
4213
@@ -5257,24 +5520,24 @@
4211
@@ -5256,24 +5519,24 @@
4214
4212
do
4215
4213
IFS=$as_save_IFS
4216
4214
test -z "$as_dir" && as_dir=.
4240
4238
$as_echo "no" >&6; }
4241
4239
fi
4242
4240
4243
@@ -5284,9 +5547,9 @@
4241
@@ -5283,9 +5546,9 @@
4244
4242
ac_ct_AR=$AR
4245
4243
# Extract the first word of "ar", so it can be a program name with args.
4246
4244
set dummy ar; ac_word=$2
4252
4250
$as_echo_n "(cached) " >&6
4253
4251
else
4254
4252
if test -n "$ac_ct_AR"; then
4255
@@ -5297,24 +5560,24 @@
4253
@@ -5296,24 +5559,24 @@
4256
4254
do
4257
4255
IFS=$as_save_IFS
4258
4256
test -z "$as_dir" && as_dir=.
4282
4280
$as_echo "no" >&6; }
4283
4281
fi
4284
4282
4285
@@ -5323,7 +5586,7 @@
4283
@@ -5322,7 +5585,7 @@
4286
4284
else
4287
4285
case $cross_compiling:$ac_tool_warned in
4288
4286
yes:)
4291
4289
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4292
4290
ac_tool_warned=yes ;;
4293
4291
esac
4294
@@ -5349,9 +5612,9 @@
4292
@@ -5348,9 +5611,9 @@
4295
4293
if test -n "$ac_tool_prefix"; then
4296
4294
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4297
4295
set dummy ${ac_tool_prefix}strip; ac_word=$2
4303
4301
$as_echo_n "(cached) " >&6
4304
4302
else
4305
4303
if test -n "$STRIP"; then
4306
@@ -5362,24 +5625,24 @@
4304
@@ -5361,24 +5624,24 @@
4307
4305
do
4308
4306
IFS=$as_save_IFS
4309
4307
test -z "$as_dir" && as_dir=.
4333
4331
$as_echo "no" >&6; }
4334
4332
fi
4335
4333
4336
@@ -5389,9 +5652,9 @@
4334
@@ -5388,9 +5651,9 @@
4337
4335
ac_ct_STRIP=$STRIP
4338
4336
# Extract the first word of "strip", so it can be a program name with args.
4339
4337
set dummy strip; ac_word=$2
4345
4343
$as_echo_n "(cached) " >&6
4346
4344
else
4347
4345
if test -n "$ac_ct_STRIP"; then
4348
@@ -5402,24 +5665,24 @@
4346
@@ -5401,24 +5664,24 @@
4349
4347
do
4350
4348
IFS=$as_save_IFS
4351
4349
test -z "$as_dir" && as_dir=.
4375
4373
$as_echo "no" >&6; }
4376
4374
fi
4377
4375
4378
@@ -5428,7 +5691,7 @@
4376
@@ -5427,7 +5690,7 @@
4379
4377
else
4380
4378
case $cross_compiling:$ac_tool_warned in
4381
4379
yes:)
4384
4382
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4385
4383
ac_tool_warned=yes ;;
4386
4384
esac
4387
@@ -5448,9 +5711,9 @@
4385
@@ -5447,9 +5710,9 @@
4388
4386
if test -n "$ac_tool_prefix"; then
4389
4387
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
4390
4388
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
4396
4394
$as_echo_n "(cached) " >&6
4397
4395
else
4398
4396
if test -n "$RANLIB"; then
4399
@@ -5461,24 +5724,24 @@
4397
@@ -5460,24 +5723,24 @@
4400
4398
do
4401
4399
IFS=$as_save_IFS
4402
4400
test -z "$as_dir" && as_dir=.
4426
4424
$as_echo "no" >&6; }
4427
4425
fi
4428
4426
4429
@@ -5488,9 +5751,9 @@
4427
@@ -5487,9 +5750,9 @@
4430
4428
ac_ct_RANLIB=$RANLIB
4431
4429
# Extract the first word of "ranlib", so it can be a program name with args.
4432
4430
set dummy ranlib; ac_word=$2
4438
4436
$as_echo_n "(cached) " >&6
4439
4437
else
4440
4438
if test -n "$ac_ct_RANLIB"; then
4441
@@ -5501,24 +5764,24 @@
4439
@@ -5500,24 +5763,24 @@
4442
4440
do
4443
4441
IFS=$as_save_IFS
4444
4442
test -z "$as_dir" && as_dir=.
4468
4466
$as_echo "no" >&6; }
4469
4467
fi
4470
4468
4471
@@ -5527,7 +5790,7 @@
4469
@@ -5526,7 +5789,7 @@
4472
4470
else
4473
4471
case $cross_compiling:$ac_tool_warned in
4474
4472
yes:)
4477
4475
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4478
4476
ac_tool_warned=yes ;;
4479
4477
esac
4480
@@ -5605,9 +5868,9 @@
4478
@@ -5604,9 +5867,9 @@
4481
4479
4482
4480
4483
4481
# Check for command to grab the raw symbol name followed by C symbol from nm.
4489
4487
$as_echo_n "(cached) " >&6
4490
4488
else
4491
4489
4492
@@ -5723,18 +5986,18 @@
4490
@@ -5722,18 +5985,18 @@
4493
4491
int main(){nm_test_var='a';nm_test_func();return(0);}
4494
4492
_LT_EOF
4495
4493
4514
4512
# Try sorting and uniquifying the output.
4515
4513
if sort "$nlist" | uniq > "$nlist"T; then
4516
4514
mv -f "$nlist"T "$nlist"
4517
@@ -5787,11 +6050,11 @@
4515
@@ -5786,11 +6049,11 @@
4518
4516
lt_save_CFLAGS="$CFLAGS"
4519
4517
LIBS="conftstm.$ac_objext"
4520
4518
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4529
4527
pipe_works=yes
4530
4528
fi
4531
4529
LIBS="$lt_save_LIBS"
4532
@@ -5825,10 +6088,10 @@
4530
@@ -5824,10 +6087,10 @@
4533
4531
lt_cv_sys_global_symbol_to_cdecl=
4534
4532
fi
4535
4533
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
4542
4540
$as_echo "ok" >&6; }
4543
4541
fi
4544
4542
4545
@@ -5855,7 +6118,7 @@
4543
@@ -5854,7 +6117,7 @@
4546
4544
4547
4545
4548
4546
# Check whether --enable-libtool-lock was given.
4551
4549
enableval=$enable_libtool_lock;
4552
4550
fi
4553
4551
4554
@@ -5867,11 +6130,11 @@
4552
@@ -5866,11 +6129,11 @@
4555
4553
ia64-*-hpux*)
4556
4554
# Find out which ABI we are using.
4557
4555
echo 'int i;' > conftest.$ac_ext
4566
4564
case `/usr/bin/file conftest.$ac_objext` in
4567
4565
*ELF-32*)
4568
4566
HPUX_IA64_MODE="32"
4569
@@ -5885,12 +6148,12 @@
4567
@@ -5884,12 +6147,12 @@
4570
4568
;;
4571
4569
*-*-irix6*)
4572
4570
# Find out which ABI we are using.
4573
- echo '#line 5888 "configure"' > conftest.$ac_ext
4571
- echo '#line 5887 "configure"' > conftest.$ac_ext
4574
4572
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4575
+ echo '#line 6151 "configure"' > conftest.$ac_ext
4573
+ echo '#line 6150 "configure"' > conftest.$ac_ext
4576
4574
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4577
4575
(eval $ac_compile) 2>&5
4578
4576
ac_status=$?
4583
4581
if test "$lt_cv_prog_gnu_ld" = yes; then
4584
4582
case `/usr/bin/file conftest.$ac_objext` in
4585
4583
*32-bit*)
4586
@@ -5924,11 +6187,11 @@
4584
@@ -5923,11 +6186,11 @@
4587
4585
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
4588
4586
# Find out which ABI we are using.
4589
4587
echo 'int i;' > conftest.$ac_ext
4598
4596
case `/usr/bin/file conftest.o` in
4599
4597
*32-bit*)
4600
4598
case $host in
4601
@@ -5977,9 +6240,9 @@
4599
@@ -5976,9 +6239,9 @@
4602
4600
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
4603
4601
SAVE_CFLAGS="$CFLAGS"
4604
4602
CFLAGS="$CFLAGS -belf"
4610
4608
$as_echo_n "(cached) " >&6
4611
4609
else
4612
4610
ac_ext=c
4613
@@ -5988,11 +6251,7 @@
4611
@@ -5987,11 +6250,7 @@
4614
4612
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4615
4613
ac_compiler_gnu=$ac_cv_c_compiler_gnu
4616
4614
4623
4621
/* end confdefs.h. */
4624
4622
4625
4623
int
4626
@@ -6003,38 +6262,13 @@
4624
@@ -6002,38 +6261,13 @@
4627
4625
return 0;
4628
4626
}
4629
4627
_ACEOF
4666
4664
ac_ext=c
4667
4665
ac_cpp='$CPP $CPPFLAGS'
4668
4666
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4669
@@ -6042,7 +6276,7 @@
4667
@@ -6041,7 +6275,7 @@
4670
4668
ac_compiler_gnu=$ac_cv_c_compiler_gnu
4671
4669
4672
4670
fi
4675
4673
$as_echo "$lt_cv_cc_needs_belf" >&6; }
4676
4674
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
4677
4675
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
4678
@@ -6052,11 +6286,11 @@
4676
@@ -6051,11 +6285,11 @@
4679
4677
sparc*-*solaris*)
4680
4678
# Find out which ABI we are using.
4681
4679
echo 'int i;' > conftest.$ac_ext
4690
4688
case `/usr/bin/file conftest.o` in
4691
4689
*64-bit*)
4692
4690
case $lt_cv_prog_gnu_ld in
4693
@@ -6082,9 +6316,9 @@
4691
@@ -6081,9 +6315,9 @@
4694
4692
if test -n "$ac_tool_prefix"; then
4695
4693
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
4696
4694
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
4702
4700
$as_echo_n "(cached) " >&6
4703
4701
else
4704
4702
if test -n "$DSYMUTIL"; then
4705
@@ -6095,24 +6329,24 @@
4703
@@ -6094,24 +6328,24 @@
4706
4704
do
4707
4705
IFS=$as_save_IFS
4708
4706
test -z "$as_dir" && as_dir=.
4732
4730
$as_echo "no" >&6; }
4733
4731
fi
4734
4732
4735
@@ -6122,9 +6356,9 @@
4733
@@ -6121,9 +6355,9 @@
4736
4734
ac_ct_DSYMUTIL=$DSYMUTIL
4737
4735
# Extract the first word of "dsymutil", so it can be a program name with args.
4738
4736
set dummy dsymutil; ac_word=$2
4744
4742
$as_echo_n "(cached) " >&6
4745
4743
else
4746
4744
if test -n "$ac_ct_DSYMUTIL"; then
4747
@@ -6135,24 +6369,24 @@
4745
@@ -6134,24 +6368,24 @@
4748
4746
do
4749
4747
IFS=$as_save_IFS
4750
4748
test -z "$as_dir" && as_dir=.
4774
4772
$as_echo "no" >&6; }
4775
4773
fi
4776
4774
4777
@@ -6161,7 +6395,7 @@
4775
@@ -6160,7 +6394,7 @@
4778
4776
else
4779
4777
case $cross_compiling:$ac_tool_warned in
4780
4778
yes:)
4783
4781
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4784
4782
ac_tool_warned=yes ;;
4785
4783
esac
4786
@@ -6174,9 +6408,9 @@
4784
@@ -6173,9 +6407,9 @@
4787
4785
if test -n "$ac_tool_prefix"; then
4788
4786
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
4789
4787
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
4795
4793
$as_echo_n "(cached) " >&6
4796
4794
else
4797
4795
if test -n "$NMEDIT"; then
4798
@@ -6187,24 +6421,24 @@
4796
@@ -6186,24 +6420,24 @@
4799
4797
do
4800
4798
IFS=$as_save_IFS
4801
4799
test -z "$as_dir" && as_dir=.
4825
4823
$as_echo "no" >&6; }
4826
4824
fi
4827
4825
4828
@@ -6214,9 +6448,9 @@
4826
@@ -6213,9 +6447,9 @@
4829
4827
ac_ct_NMEDIT=$NMEDIT
4830
4828
# Extract the first word of "nmedit", so it can be a program name with args.
4831
4829
set dummy nmedit; ac_word=$2
4837
4835
$as_echo_n "(cached) " >&6
4838
4836
else
4839
4837
if test -n "$ac_ct_NMEDIT"; then
4840
@@ -6227,24 +6461,24 @@
4838
@@ -6226,24 +6460,24 @@
4841
4839
do
4842
4840
IFS=$as_save_IFS
4843
4841
test -z "$as_dir" && as_dir=.
4867
4865
$as_echo "no" >&6; }
4868
4866
fi
4869
4867
4870
@@ -6253,7 +6487,7 @@
4868
@@ -6252,7 +6486,7 @@
4871
4869
else
4872
4870
case $cross_compiling:$ac_tool_warned in
4873
4871
yes:)
4876
4874
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4877
4875
ac_tool_warned=yes ;;
4878
4876
esac
4879
@@ -6266,9 +6500,9 @@
4877
@@ -6265,9 +6499,9 @@
4880
4878
if test -n "$ac_tool_prefix"; then
4881
4879
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
4882
4880
set dummy ${ac_tool_prefix}lipo; ac_word=$2
4888
4886
$as_echo_n "(cached) " >&6
4889
4887
else
4890
4888
if test -n "$LIPO"; then
4891
@@ -6279,24 +6513,24 @@
4889
@@ -6278,24 +6512,24 @@
4892
4890
do
4893
4891
IFS=$as_save_IFS
4894
4892
test -z "$as_dir" && as_dir=.
4918
4916
$as_echo "no" >&6; }
4919
4917
fi
4920
4918
4921
@@ -6306,9 +6540,9 @@
4919
@@ -6305,9 +6539,9 @@
4922
4920
ac_ct_LIPO=$LIPO
4923
4921
# Extract the first word of "lipo", so it can be a program name with args.
4924
4922
set dummy lipo; ac_word=$2
4930
4928
$as_echo_n "(cached) " >&6
4931
4929
else
4932
4930
if test -n "$ac_ct_LIPO"; then
4933
@@ -6319,24 +6553,24 @@
4931
@@ -6318,24 +6552,24 @@
4934
4932
do
4935
4933
IFS=$as_save_IFS
4936
4934
test -z "$as_dir" && as_dir=.
4960
4958
$as_echo "no" >&6; }
4961
4959
fi
4962
4960
4963
@@ -6345,7 +6579,7 @@
4961
@@ -6344,7 +6578,7 @@
4964
4962
else
4965
4963
case $cross_compiling:$ac_tool_warned in
4966
4964
yes:)
4969
4967
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4970
4968
ac_tool_warned=yes ;;
4971
4969
esac
4972
@@ -6358,9 +6592,9 @@
4970
@@ -6357,9 +6591,9 @@
4973
4971
if test -n "$ac_tool_prefix"; then
4974
4972
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
4975
4973
set dummy ${ac_tool_prefix}otool; ac_word=$2
4981
4979
$as_echo_n "(cached) " >&6
4982
4980
else
4983
4981
if test -n "$OTOOL"; then
4984
@@ -6371,24 +6605,24 @@
4982
@@ -6370,24 +6604,24 @@
4985
4983
do
4986
4984
IFS=$as_save_IFS
4987
4985
test -z "$as_dir" && as_dir=.
5011
5009
$as_echo "no" >&6; }
5012
5010
fi
5013
5011
5014
@@ -6398,9 +6632,9 @@
5012
@@ -6397,9 +6631,9 @@
5015
5013
ac_ct_OTOOL=$OTOOL
5016
5014
# Extract the first word of "otool", so it can be a program name with args.
5017
5015
set dummy otool; ac_word=$2
5023
5021
$as_echo_n "(cached) " >&6
5024
5022
else
5025
5023
if test -n "$ac_ct_OTOOL"; then
5026
@@ -6411,24 +6645,24 @@
5024
@@ -6410,24 +6644,24 @@
5027
5025
do
5028
5026
IFS=$as_save_IFS
5029
5027
test -z "$as_dir" && as_dir=.
5053
5051
$as_echo "no" >&6; }
5054
5052
fi
5055
5053
5056
@@ -6437,7 +6671,7 @@
5054
@@ -6436,7 +6670,7 @@
5057
5055
else
5058
5056
case $cross_compiling:$ac_tool_warned in
5059
5057
yes:)
5062
5060
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5063
5061
ac_tool_warned=yes ;;
5064
5062
esac
5065
@@ -6450,9 +6684,9 @@
5063
@@ -6449,9 +6683,9 @@
5066
5064
if test -n "$ac_tool_prefix"; then
5067
5065
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
5068
5066
set dummy ${ac_tool_prefix}otool64; ac_word=$2
5074
5072
$as_echo_n "(cached) " >&6
5075
5073
else
5076
5074
if test -n "$OTOOL64"; then
5077
@@ -6463,24 +6697,24 @@
5075
@@ -6462,24 +6696,24 @@
5078
5076
do
5079
5077
IFS=$as_save_IFS
5080
5078
test -z "$as_dir" && as_dir=.
5104
5102
$as_echo "no" >&6; }
5105
5103
fi
5106
5104
5107
@@ -6490,9 +6724,9 @@
5105
@@ -6489,9 +6723,9 @@
5108
5106
ac_ct_OTOOL64=$OTOOL64
5109
5107
# Extract the first word of "otool64", so it can be a program name with args.
5110
5108
set dummy otool64; ac_word=$2
5116
5114
$as_echo_n "(cached) " >&6
5117
5115
else
5118
5116
if test -n "$ac_ct_OTOOL64"; then
5119
@@ -6503,24 +6737,24 @@
5117
@@ -6502,24 +6736,24 @@
5120
5118
do
5121
5119
IFS=$as_save_IFS
5122
5120
test -z "$as_dir" && as_dir=.
5146
5144
$as_echo "no" >&6; }
5147
5145
fi
5148
5146
5149
@@ -6529,7 +6763,7 @@
5147
@@ -6528,7 +6762,7 @@
5150
5148
else
5151
5149
case $cross_compiling:$ac_tool_warned in
5152
5150
yes:)
5155
5153
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5156
5154
ac_tool_warned=yes ;;
5157
5155
esac
5158
@@ -6565,9 +6799,9 @@
5156
@@ -6564,9 +6798,9 @@
5159
5157
5160
5158
5161
5159
5167
5165
$as_echo_n "(cached) " >&6
5168
5166
else
5169
5167
lt_cv_apple_cc_single_mod=no
5170
@@ -6592,22 +6826,18 @@
5168
@@ -6591,22 +6825,18 @@
5171
5169
rm -f conftest.*
5172
5170
fi
5173
5171
fi
5194
5192
/* end confdefs.h. */
5195
5193
5196
5194
int
5197
@@ -6618,42 +6848,17 @@
5195
@@ -6617,42 +6847,17 @@
5198
5196
return 0;
5199
5197
}
5200
5198
_ACEOF
5242
5240
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
5243
5241
case $host_os in
5244
5242
rhapsody* | darwin1.[012])
5245
@@ -6695,14 +6900,14 @@
5243
@@ -6694,14 +6899,14 @@
5246
5244
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5247
5245
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5248
5246
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5259
5257
$as_echo_n "(cached) " >&6
5260
5258
else
5261
5259
# Double quotes because CPP needs to be expanded
5262
@@ -6717,11 +6922,7 @@
5260
@@ -6716,11 +6921,7 @@
5263
5261
# <limits.h> exists even on freestanding compilers.
5264
5262
# On the NeXT, cc -E runs the code through the compiler's parser,
5265
5263
# not just through cpp. "Syntax error" is here to catch this case.
5272
5270
/* end confdefs.h. */
5273
5271
#ifdef __STDC__
5274
5272
# include <limits.h>
5275
@@ -6730,78 +6931,34 @@
5273
@@ -6729,78 +6930,34 @@
5276
5274
#endif
5277
5275
Syntax error
5278
5276
_ACEOF
5356
5354
break
5357
5355
fi
5358
5356
5359
@@ -6813,7 +6970,7 @@
5357
@@ -6812,7 +6969,7 @@
5360
5358
else
5361
5359
ac_cv_prog_CPP=$CPP
5362
5360
fi
5365
5363
$as_echo "$CPP" >&6; }
5366
5364
ac_preproc_ok=false
5367
5365
for ac_c_preproc_warn_flag in '' yes
5368
@@ -6824,11 +6981,7 @@
5366
@@ -6823,11 +6980,7 @@
5369
5367
# <limits.h> exists even on freestanding compilers.
5370
5368
# On the NeXT, cc -E runs the code through the compiler's parser,
5371
5369
# not just through cpp. "Syntax error" is here to catch this case.
5378
5376
/* end confdefs.h. */
5379
5377
#ifdef __STDC__
5380
5378
# include <limits.h>
5381
@@ -6837,87 +6990,40 @@
5379
@@ -6836,87 +6989,40 @@
5382
5380
#endif
5383
5381
Syntax error
5384
5382
_ACEOF
5475
5473
fi
5476
5474
5477
5475
ac_ext=c
5478
@@ -6927,16 +7033,12 @@
5476
@@ -6926,16 +7032,12 @@
5479
5477
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5480
5478
5481
5479
5495
5493
/* end confdefs.h. */
5496
5494
#include <stdlib.h>
5497
5495
#include <stdarg.h>
5498
@@ -6951,48 +7053,23 @@
5496
@@ -6950,48 +7052,23 @@
5499
5497
return 0;
5500
5498
}
5501
5499
_ACEOF
5549
5547
else
5550
5548
ac_cv_header_stdc=no
5551
5549
fi
5552
@@ -7002,18 +7079,14 @@
5550
@@ -7001,18 +7078,14 @@
5553
5551
5554
5552
if test $ac_cv_header_stdc = yes; then
5555
5553
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
5571
5569
else
5572
5570
ac_cv_header_stdc=no
5573
5571
fi
5574
@@ -7023,14 +7096,10 @@
5572
@@ -7022,14 +7095,10 @@
5575
5573
5576
5574
if test $ac_cv_header_stdc = yes; then
5577
5575
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
5588
5586
/* end confdefs.h. */
5589
5587
#include <ctype.h>
5590
5588
#include <stdlib.h>
5591
@@ -7053,122 +7122,38 @@
5589
@@ -7052,122 +7121,38 @@
5592
5590
for (i = 0; i < 256; i++)
5593
5591
if (XOR (islower (i), ISLOWER (i))
5594
5592
|| toupper (i) != TOUPPER (i))
5728
5726
cat >>confdefs.h <<_ACEOF
5729
5727
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
5730
5728
_ACEOF
5731
@@ -7178,62 +7163,13 @@
5729
@@ -7177,62 +7162,13 @@
5732
5730
done
5733
5731
5734
5732
5796
5794
_ACEOF
5797
5795
5798
5796
fi
5799
@@ -7253,7 +7189,7 @@
5797
@@ -7252,7 +7188,7 @@
5800
5798
5801
5799
5802
5800
# Check whether --enable-shared was given.
5805
5803
enableval=$enable_shared; p=${PACKAGE-default}
5806
5804
case $enableval in
5807
5805
yes) enable_shared=yes ;;
5808
@@ -7284,7 +7220,7 @@
5806
@@ -7283,7 +7219,7 @@
5809
5807
5810
5808
5811
5809
# Check whether --enable-static was given.
5814
5812
enableval=$enable_static; p=${PACKAGE-default}
5815
5813
case $enableval in
5816
5814
yes) enable_static=yes ;;
5817
@@ -7316,7 +7252,7 @@
5815
@@ -7315,7 +7251,7 @@
5818
5816
5819
5817
5820
5818
# Check whether --with-pic was given.
5823
5821
withval=$with_pic; pic_mode="$withval"
5824
5822
else
5825
5823
pic_mode=default
5826
@@ -7332,7 +7268,7 @@
5824
@@ -7331,7 +7267,7 @@
5827
5825
5828
5826
5829
5827
# Check whether --enable-fast-install was given.
5832
5830
enableval=$enable_fast_install; p=${PACKAGE-default}
5833
5831
case $enableval in
5834
5832
yes) enable_fast_install=yes ;;
5835
@@ -7413,9 +7349,9 @@
5833
@@ -7412,9 +7348,9 @@
5836
5834
setopt NO_GLOB_SUBST
5837
5835
fi
5838
5836
5844
5842
$as_echo_n "(cached) " >&6
5845
5843
else
5846
5844
rm -f .libs 2>/dev/null
5847
@@ -7428,7 +7364,7 @@
5845
@@ -7427,7 +7363,7 @@
5848
5846
fi
5849
5847
rmdir .libs 2>/dev/null
5850
5848
fi
5853
5851
$as_echo "$lt_cv_objdir" >&6; }
5854
5852
objdir=$lt_cv_objdir
5855
5853
5856
@@ -7521,9 +7457,9 @@
5854
@@ -7520,9 +7456,9 @@
5857
5855
case $deplibs_check_method in
5858
5856
file_magic*)
5859
5857
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
5865
5863
$as_echo_n "(cached) " >&6
5866
5864
else
5867
5865
case $MAGIC_CMD in
5868
@@ -7574,10 +7510,10 @@
5866
@@ -7573,10 +7509,10 @@
5869
5867
5870
5868
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5871
5869
if test -n "$MAGIC_CMD"; then
5878
5876
$as_echo "no" >&6; }
5879
5877
fi
5880
5878
5881
@@ -7587,9 +7523,9 @@
5879
@@ -7586,9 +7522,9 @@
5882
5880
5883
5881
if test -z "$lt_cv_path_MAGIC_CMD"; then
5884
5882
if test -n "$ac_tool_prefix"; then
5890
5888
$as_echo_n "(cached) " >&6
5891
5889
else
5892
5890
case $MAGIC_CMD in
5893
@@ -7640,10 +7576,10 @@
5891
@@ -7639,10 +7575,10 @@
5894
5892
5895
5893
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5896
5894
if test -n "$MAGIC_CMD"; then
5903
5901
$as_echo "no" >&6; }
5904
5902
fi
5905
5903
5906
@@ -7724,9 +7660,9 @@
5904
@@ -7723,9 +7659,9 @@
5907
5905
if test "$GCC" = yes; then
5908
5906
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
5909
5907
5915
5913
$as_echo_n "(cached) " >&6
5916
5914
else
5917
5915
lt_cv_prog_compiler_rtti_exceptions=no
5918
@@ -7742,11 +7678,11 @@
5916
@@ -7741,11 +7677,11 @@
5919
5917
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5920
5918
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5921
5919
-e 's:$: $lt_compiler_flag:'`
5922
- (eval echo "\"\$as_me:7745: $lt_compile\"" >&5)
5923
+ (eval echo "\"\$as_me:7681: $lt_compile\"" >&5)
5920
- (eval echo "\"\$as_me:7744: $lt_compile\"" >&5)
5921
+ (eval echo "\"\$as_me:7680: $lt_compile\"" >&5)
5924
5922
(eval "$lt_compile" 2>conftest.err)
5925
5923
ac_status=$?
5926
5924
cat conftest.err >&5
5927
- echo "$as_me:7749: \$? = $ac_status" >&5
5928
+ echo "$as_me:7685: \$? = $ac_status" >&5
5925
- echo "$as_me:7748: \$? = $ac_status" >&5
5926
+ echo "$as_me:7684: \$? = $ac_status" >&5
5929
5927
if (exit $ac_status) && test -s "$ac_outfile"; then
5930
5928
# The compiler can only warn and ignore the option if not recognized
5931
5929
# So say no if there are warnings other than the usual output.
5932
@@ -7759,7 +7695,7 @@
5930
@@ -7758,7 +7694,7 @@
5933
5931
$RM conftest*
5934
5932
5935
5933
fi
5938
5936
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
5939
5937
5940
5938
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
5941
@@ -7779,7 +7715,7 @@
5939
@@ -7778,7 +7714,7 @@
5942
5940
lt_prog_compiler_pic=
5943
5941
lt_prog_compiler_static=
5944
5942
5947
5945
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
5948
5946
5949
5947
if test "$GCC" = yes; then
5950
@@ -8051,7 +7987,7 @@
5948
@@ -8050,7 +7986,7 @@
5951
5949
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
5952
5950
;;
5953
5951
esac
5956
5954
$as_echo "$lt_prog_compiler_pic" >&6; }
5957
5955
5958
5956
5959
@@ -8063,9 +7999,9 @@
5957
@@ -8062,9 +7998,9 @@
5960
5958
# Check to make sure the PIC flag actually works.
5961
5959
#
5962
5960
if test -n "$lt_prog_compiler_pic"; then
5968
5966
$as_echo_n "(cached) " >&6
5969
5967
else
5970
5968
lt_cv_prog_compiler_pic_works=no
5971
@@ -8081,11 +8017,11 @@
5969
@@ -8080,11 +8016,11 @@
5972
5970
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5973
5971
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5974
5972
-e 's:$: $lt_compiler_flag:'`
5975
- (eval echo "\"\$as_me:8084: $lt_compile\"" >&5)
5976
+ (eval echo "\"\$as_me:8020: $lt_compile\"" >&5)
5973
- (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
5974
+ (eval echo "\"\$as_me:8019: $lt_compile\"" >&5)
5977
5975
(eval "$lt_compile" 2>conftest.err)
5978
5976
ac_status=$?
5979
5977
cat conftest.err >&5
5980
- echo "$as_me:8088: \$? = $ac_status" >&5
5981
+ echo "$as_me:8024: \$? = $ac_status" >&5
5978
- echo "$as_me:8087: \$? = $ac_status" >&5
5979
+ echo "$as_me:8023: \$? = $ac_status" >&5
5982
5980
if (exit $ac_status) && test -s "$ac_outfile"; then
5983
5981
# The compiler can only warn and ignore the option if not recognized
5984
5982
# So say no if there are warnings other than the usual output.
5985
@@ -8098,7 +8034,7 @@
5983
@@ -8097,7 +8033,7 @@
5986
5984
$RM conftest*
5987
5985
5988
5986
fi
5991
5989
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
5992
5990
5993
5991
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
5994
@@ -8122,9 +8058,9 @@
5992
@@ -8121,9 +8057,9 @@
5995
5993
# Check to make sure the static flag actually works.
5996
5994
#
5997
5995
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
6003
6001
$as_echo_n "(cached) " >&6
6004
6002
else
6005
6003
lt_cv_prog_compiler_static_works=no
6006
@@ -8150,7 +8086,7 @@
6004
@@ -8149,7 +8085,7 @@
6007
6005
LDFLAGS="$save_LDFLAGS"
6008
6006
6009
6007
fi
6012
6010
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
6013
6011
6014
6012
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
6015
@@ -8165,9 +8101,9 @@
6016
6017
6018
6019
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
6020
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
6021
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
6022
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
6023
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
6024
$as_echo_n "(cached) " >&6
6025
else
6026
lt_cv_prog_compiler_c_o=no
6027
@@ -8186,11 +8122,11 @@
6028
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6029
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6030
-e 's:$: $lt_compiler_flag:'`
6031
- (eval echo "\"\$as_me:8189: $lt_compile\"" >&5)
6032
+ (eval echo "\"\$as_me:8125: $lt_compile\"" >&5)
6033
(eval "$lt_compile" 2>out/conftest.err)
6034
ac_status=$?
6035
cat out/conftest.err >&5
6036
- echo "$as_me:8193: \$? = $ac_status" >&5
6037
+ echo "$as_me:8129: \$? = $ac_status" >&5
6038
if (exit $ac_status) && test -s out/conftest2.$ac_objext
6039
then
6040
# The compiler can only warn and ignore the option if not recognized
6041
@@ -8212,7 +8148,7 @@
6042
$RM conftest*
6043
6044
fi
6045
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
6046
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
6047
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
6048
6049
6050
@@ -8220,9 +8156,9 @@
6051
6052
6053
6054
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
6055
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
6056
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
6057
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
6058
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
6059
$as_echo_n "(cached) " >&6
6060
else
6061
lt_cv_prog_compiler_c_o=no
6062
@@ -8241,11 +8177,11 @@
6063
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6064
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6065
-e 's:$: $lt_compiler_flag:'`
6066
- (eval echo "\"\$as_me:8244: $lt_compile\"" >&5)
6067
+ (eval echo "\"\$as_me:8180: $lt_compile\"" >&5)
6068
(eval "$lt_compile" 2>out/conftest.err)
6069
ac_status=$?
6070
cat out/conftest.err >&5
6071
- echo "$as_me:8248: \$? = $ac_status" >&5
6072
+ echo "$as_me:8184: \$? = $ac_status" >&5
6073
if (exit $ac_status) && test -s out/conftest2.$ac_objext
6074
then
6075
# The compiler can only warn and ignore the option if not recognized
6076
@@ -8267,7 +8203,7 @@
6077
$RM conftest*
6078
6079
fi
6080
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
6081
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
6082
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
6083
6084
6085
@@ -8276,7 +8212,7 @@
6013
@@ -8164,9 +8100,9 @@
6014
6015
6016
6017
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
6018
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
6019
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
6020
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
6021
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
6022
$as_echo_n "(cached) " >&6
6023
else
6024
lt_cv_prog_compiler_c_o=no
6025
@@ -8185,11 +8121,11 @@
6026
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6027
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6028
-e 's:$: $lt_compiler_flag:'`
6029
- (eval echo "\"\$as_me:8188: $lt_compile\"" >&5)
6030
+ (eval echo "\"\$as_me:8124: $lt_compile\"" >&5)
6031
(eval "$lt_compile" 2>out/conftest.err)
6032
ac_status=$?
6033
cat out/conftest.err >&5
6034
- echo "$as_me:8192: \$? = $ac_status" >&5
6035
+ echo "$as_me:8128: \$? = $ac_status" >&5
6036
if (exit $ac_status) && test -s out/conftest2.$ac_objext
6037
then
6038
# The compiler can only warn and ignore the option if not recognized
6039
@@ -8211,7 +8147,7 @@
6040
$RM conftest*
6041
6042
fi
6043
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
6044
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
6045
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
6046
6047
6048
@@ -8219,9 +8155,9 @@
6049
6050
6051
6052
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
6053
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
6054
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
6055
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
6056
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
6057
$as_echo_n "(cached) " >&6
6058
else
6059
lt_cv_prog_compiler_c_o=no
6060
@@ -8240,11 +8176,11 @@
6061
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6062
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6063
-e 's:$: $lt_compiler_flag:'`
6064
- (eval echo "\"\$as_me:8243: $lt_compile\"" >&5)
6065
+ (eval echo "\"\$as_me:8179: $lt_compile\"" >&5)
6066
(eval "$lt_compile" 2>out/conftest.err)
6067
ac_status=$?
6068
cat out/conftest.err >&5
6069
- echo "$as_me:8247: \$? = $ac_status" >&5
6070
+ echo "$as_me:8183: \$? = $ac_status" >&5
6071
if (exit $ac_status) && test -s out/conftest2.$ac_objext
6072
then
6073
# The compiler can only warn and ignore the option if not recognized
6074
@@ -8266,7 +8202,7 @@
6075
$RM conftest*
6076
6077
fi
6078
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
6079
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
6080
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
6081
6082
6083
@@ -8275,7 +8211,7 @@
6086
6084
hard_links="nottested"
6087
6085
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
6088
6086
# do not overwrite the value of need_locks provided by the user
6091
6089
$as_echo_n "checking if we can lock with hard links... " >&6; }
6092
6090
hard_links=yes
6093
6091
$RM conftest*
6094
@@ -8284,10 +8220,10 @@
6092
@@ -8283,10 +8219,10 @@
6095
6093
touch conftest.a
6096
6094
ln conftest.a conftest.b 2>&5 || hard_links=no
6097
6095
ln conftest.a conftest.b 2>/dev/null && hard_links=no
6104
6102
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
6105
6103
need_locks=warn
6106
6104
fi
6107
@@ -8300,7 +8236,7 @@
6105
@@ -8299,7 +8235,7 @@
6108
6106
6109
6107
6110
6108
6113
6111
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
6114
6112
6115
6113
runpath_var=
6116
@@ -8742,11 +8678,7 @@
6114
@@ -8741,11 +8677,7 @@
6117
6115
allow_undefined_flag='-berok'
6118
6116
# Determine the default libpath from the value encoded in an
6119
6117
# empty executable.
6126
6124
/* end confdefs.h. */
6127
6125
6128
6126
int
6129
@@ -8757,27 +8689,7 @@
6127
@@ -8756,27 +8688,7 @@
6130
6128
return 0;
6131
6129
}
6132
6130
_ACEOF
6155
6153
6156
6154
lt_aix_libpath_sed='
6157
6155
/Import File Strings/,/^$/ {
6158
@@ -8791,16 +8703,9 @@
6156
@@ -8790,16 +8702,9 @@
6159
6157
if test -z "$aix_libpath"; then
6160
6158
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6161
6159
fi
6174
6172
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6175
6173
6176
6174
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6177
@@ -8813,11 +8718,7 @@
6175
@@ -8812,11 +8717,7 @@
6178
6176
else
6179
6177
# Determine the default libpath from the value encoded in an
6180
6178
# empty executable.
6187
6185
/* end confdefs.h. */
6188
6186
6189
6187
int
6190
@@ -8828,27 +8729,7 @@
6188
@@ -8827,27 +8728,7 @@
6191
6189
return 0;
6192
6190
}
6193
6191
_ACEOF
6216
6214
6217
6215
lt_aix_libpath_sed='
6218
6216
/Import File Strings/,/^$/ {
6219
@@ -8862,16 +8743,9 @@
6217
@@ -8861,16 +8742,9 @@
6220
6218
if test -z "$aix_libpath"; then
6221
6219
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6222
6220
fi
6235
6233
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6236
6234
6237
6235
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6238
@@ -9083,42 +8957,16 @@
6236
@@ -9082,42 +8956,16 @@
6239
6237
# implicitly export all symbols.
6240
6238
save_LDFLAGS="$LDFLAGS"
6241
6239
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6283
6281
LDFLAGS="$save_LDFLAGS"
6284
6282
else
6285
6283
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6286
@@ -9374,7 +9222,7 @@
6284
@@ -9373,7 +9221,7 @@
6287
6285
fi
6288
6286
fi
6289
6287
6292
6290
$as_echo "$ld_shlibs" >&6; }
6293
6291
test "$ld_shlibs" = no && can_build_shared=no
6294
6292
6295
@@ -9411,16 +9259,16 @@
6293
@@ -9410,16 +9258,16 @@
6296
6294
# Test whether the compiler implicitly links with -lc since on some
6297
6295
# systems, -lgcc has to come before -lc. If gcc already passes -lc
6298
6296
# to ld, don't add -lc before -lgcc.
6313
6311
soname=conftest
6314
6312
lib=conftest
6315
6313
libobjs=conftest.$ac_objext
6316
@@ -9434,11 +9282,11 @@
6314
@@ -9433,11 +9281,11 @@
6317
6315
libname=conftest
6318
6316
lt_save_allow_undefined_flag=$allow_undefined_flag
6319
6317
allow_undefined_flag=
6328
6326
then
6329
6327
archive_cmds_need_lc=no
6330
6328
else
6331
@@ -9449,7 +9297,7 @@
6329
@@ -9448,7 +9296,7 @@
6332
6330
cat conftest.err 1>&5
6333
6331
fi
6334
6332
$RM conftest*
6337
6335
$as_echo "$archive_cmds_need_lc" >&6; }
6338
6336
;;
6339
6337
esac
6340
@@ -9613,7 +9461,7 @@
6338
@@ -9612,7 +9460,7 @@
6341
6339
6342
6340
6343
6341
6346
6344
$as_echo_n "checking dynamic linker characteristics... " >&6; }
6347
6345
6348
6346
if test "$GCC" = yes; then
6349
@@ -10035,11 +9883,7 @@
6347
@@ -10034,11 +9882,7 @@
6350
6348
save_libdir=$libdir
6351
6349
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
6352
6350
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
6359
6357
/* end confdefs.h. */
6360
6358
6361
6359
int
6362
@@ -10050,41 +9894,13 @@
6360
@@ -10049,41 +9893,13 @@
6363
6361
return 0;
6364
6362
}
6365
6363
_ACEOF
6405
6403
LDFLAGS=$save_LDFLAGS
6406
6404
libdir=$save_libdir
6407
6405
6408
@@ -10299,7 +10115,7 @@
6406
@@ -10298,7 +10114,7 @@
6409
6407
dynamic_linker=no
6410
6408
;;
6411
6409
esac
6414
6412
$as_echo "$dynamic_linker" >&6; }
6415
6413
test "$dynamic_linker" = no && can_build_shared=no
6416
6414
6417
@@ -10401,7 +10217,7 @@
6415
@@ -10400,7 +10216,7 @@
6418
6416
6419
6417
6420
6418
6423
6421
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
6424
6422
hardcode_action=
6425
6423
if test -n "$hardcode_libdir_flag_spec" ||
6426
@@ -10426,7 +10242,7 @@
6424
@@ -10425,7 +10241,7 @@
6427
6425
# directories.
6428
6426
hardcode_action=unsupported
6429
6427
fi
6432
6430
$as_echo "$hardcode_action" >&6; }
6433
6431
6434
6432
if test "$hardcode_action" = relink ||
6435
@@ -10471,184 +10287,14 @@
6433
@@ -10470,184 +10286,14 @@
6436
6434
6437
6435
darwin*)
6438
6436
# if libdl is installed we need to link against it
6621
6619
/* end confdefs.h. */
6622
6620
6623
6621
/* Override any GCC internal prototype to avoid an error.
6624
@@ -10657,81 +10303,52 @@
6622
@@ -10656,81 +10302,52 @@
6625
6623
#ifdef __cplusplus
6626
6624
extern "C"
6627
6625
#endif
6734
6732
6735
6733
/* Override any GCC internal prototype to avoid an error.
6736
6734
Use char because int might match the return type of a GCC
6737
@@ -10739,72 +10356,41 @@
6735
@@ -10738,72 +10355,41 @@
6738
6736
#ifdef __cplusplus
6739
6737
extern "C"
6740
6738
#endif
6825
6823
/* end confdefs.h. */
6826
6824
6827
6825
/* Override any GCC internal prototype to avoid an error.
6828
@@ -10822,57 +10408,28 @@
6826
@@ -10821,57 +10407,28 @@
6829
6827
return 0;
6830
6828
}
6831
6829
_ACEOF
6892
6890
/* end confdefs.h. */
6893
6891
6894
6892
/* Override any GCC internal prototype to avoid an error.
6895
@@ -10890,57 +10447,28 @@
6893
@@ -10889,57 +10446,28 @@
6896
6894
return 0;
6897
6895
}
6898
6896
_ACEOF
6959
6957
/* end confdefs.h. */
6960
6958
6961
6959
/* Override any GCC internal prototype to avoid an error.
6962
@@ -10958,43 +10486,18 @@
6960
@@ -10957,43 +10485,18 @@
6963
6961
return 0;
6964
6962
}
6965
6963
_ACEOF
7009
7007
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
7010
7008
fi
7011
7009
7012
@@ -11033,9 +10536,9 @@
7010
@@ -11032,9 +10535,9 @@
7013
7011
save_LIBS="$LIBS"
7014
7012
LIBS="$lt_cv_dlopen_libs $LIBS"
7015
7013
7021
7019
$as_echo_n "(cached) " >&6
7022
7020
else
7023
7021
if test "$cross_compiling" = yes; then :
7024
@@ -11044,7 +10547,7 @@
7022
@@ -11043,7 +10546,7 @@
7025
7023
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7026
7024
lt_status=$lt_dlunknown
7027
7025
cat > conftest.$ac_ext <<_LT_EOF
7028
-#line 11047 "configure"
7029
+#line 10550 "configure"
7026
-#line 11046 "configure"
7027
+#line 10549 "configure"
7030
7028
#include "confdefs.h"
7031
7029
7032
7030
#if HAVE_DLFCN_H
7033
@@ -11103,11 +10606,11 @@
7031
@@ -11102,11 +10605,11 @@
7034
7032
return status;
7035
7033
}
7036
7034
_LT_EOF
7045
7043
(./conftest; exit; ) >&5 2>/dev/null
7046
7044
lt_status=$?
7047
7045
case x$lt_status in
7048
@@ -11124,14 +10627,14 @@
7046
@@ -11123,14 +10626,14 @@
7049
7047
7050
7048
7051
7049
fi
7063
7061
$as_echo_n "(cached) " >&6
7064
7062
else
7065
7063
if test "$cross_compiling" = yes; then :
7066
@@ -11140,7 +10643,7 @@
7064
@@ -11139,7 +10642,7 @@
7067
7065
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7068
7066
lt_status=$lt_dlunknown
7069
7067
cat > conftest.$ac_ext <<_LT_EOF
7070
-#line 11143 "configure"
7071
+#line 10646 "configure"
7068
-#line 11142 "configure"
7069
+#line 10645 "configure"
7072
7070
#include "confdefs.h"
7073
7071
7074
7072
#if HAVE_DLFCN_H
7075
@@ -11199,11 +10702,11 @@
7073
@@ -11198,11 +10701,11 @@
7076
7074
return status;
7077
7075
}
7078
7076
_LT_EOF
7087
7085
(./conftest; exit; ) >&5 2>/dev/null
7088
7086
lt_status=$?
7089
7087
case x$lt_status in
7090
@@ -11220,7 +10723,7 @@
7088
@@ -11219,7 +10722,7 @@
7091
7089
7092
7090
7093
7091
fi
7096
7094
$as_echo "$lt_cv_dlopen_self_static" >&6; }
7097
7095
fi
7098
7096
7099
@@ -11259,12 +10762,12 @@
7097
@@ -11258,12 +10761,12 @@
7100
7098
7101
7099
striplib=
7102
7100
old_striplib=
7111
7109
$as_echo "yes" >&6; }
7112
7110
else
7113
7111
# FIXME - insert some real tests, host_os isn't really good enough
7114
@@ -11273,15 +10776,15 @@
7112
@@ -11272,15 +10775,15 @@
7115
7113
if test -n "$STRIP" ; then
7116
7114
striplib="$STRIP -x"
7117
7115
old_striplib="$STRIP -S"
7130
7128
$as_echo "no" >&6; }
7131
7129
;;
7132
7130
esac
7133
@@ -11299,12 +10802,12 @@
7131
@@ -11298,12 +10801,12 @@
7134
7132
7135
7133
7136
7134
# Report which library types will actually be built
7146
7144
$as_echo_n "checking whether to build shared libraries... " >&6; }
7147
7145
test "$can_build_shared" = "no" && enable_shared=no
7148
7146
7149
@@ -11325,14 +10828,14 @@
7147
@@ -11324,14 +10827,14 @@
7150
7148
fi
7151
7149
;;
7152
7150
esac
7164
7162
$as_echo "$enable_static" >&6; }
7165
7163
7166
7164
7167
@@ -11446,9 +10949,9 @@
7165
@@ -11445,9 +10948,9 @@
7168
7166
if test -n "$ac_tool_prefix"; then
7169
7167
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
7170
7168
set dummy ${ac_tool_prefix}gcc; ac_word=$2
7176
7174
$as_echo_n "(cached) " >&6
7177
7175
else
7178
7176
if test -n "$CC"; then
7179
@@ -11459,24 +10962,24 @@
7177
@@ -11458,24 +10961,24 @@
7180
7178
do
7181
7179
IFS=$as_save_IFS
7182
7180
test -z "$as_dir" && as_dir=.
7206
7204
$as_echo "no" >&6; }
7207
7205
fi
7208
7206
7209
@@ -11486,9 +10989,9 @@
7207
@@ -11485,9 +10988,9 @@
7210
7208
ac_ct_CC=$CC
7211
7209
# Extract the first word of "gcc", so it can be a program name with args.
7212
7210
set dummy gcc; ac_word=$2
7218
7216
$as_echo_n "(cached) " >&6
7219
7217
else
7220
7218
if test -n "$ac_ct_CC"; then
7221
@@ -11499,24 +11002,24 @@
7219
@@ -11498,24 +11001,24 @@
7222
7220
do
7223
7221
IFS=$as_save_IFS
7224
7222
test -z "$as_dir" && as_dir=.
7248
7246
$as_echo "no" >&6; }
7249
7247
fi
7250
7248
7251
@@ -11525,7 +11028,7 @@
7249
@@ -11524,7 +11027,7 @@
7252
7250
else
7253
7251
case $cross_compiling:$ac_tool_warned in
7254
7252
yes:)
7257
7255
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7258
7256
ac_tool_warned=yes ;;
7259
7257
esac
7260
@@ -11539,9 +11042,9 @@
7258
@@ -11538,9 +11041,9 @@
7261
7259
if test -n "$ac_tool_prefix"; then
7262
7260
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
7263
7261
set dummy ${ac_tool_prefix}cc; ac_word=$2
7269
7267
$as_echo_n "(cached) " >&6
7270
7268
else
7271
7269
if test -n "$CC"; then
7272
@@ -11552,24 +11055,24 @@
7270
@@ -11551,24 +11054,24 @@
7273
7271
do
7274
7272
IFS=$as_save_IFS
7275
7273
test -z "$as_dir" && as_dir=.
7299
7297
$as_echo "no" >&6; }
7300
7298
fi
7301
7299
7302
@@ -11579,9 +11082,9 @@
7300
@@ -11578,9 +11081,9 @@
7303
7301
if test -z "$CC"; then
7304
7302
# Extract the first word of "cc", so it can be a program name with args.
7305
7303
set dummy cc; ac_word=$2
7311
7309
$as_echo_n "(cached) " >&6
7312
7310
else
7313
7311
if test -n "$CC"; then
7314
@@ -11593,18 +11096,18 @@
7312
@@ -11592,18 +11095,18 @@
7315
7313
do
7316
7314
IFS=$as_save_IFS
7317
7315
test -z "$as_dir" && as_dir=.
7333
7331
IFS=$as_save_IFS
7334
7332
7335
7333
if test $ac_prog_rejected = yes; then
7336
@@ -11623,10 +11126,10 @@
7334
@@ -11622,10 +11125,10 @@
7337
7335
fi
7338
7336
CC=$ac_cv_prog_CC
7339
7337
if test -n "$CC"; then
7346
7344
$as_echo "no" >&6; }
7347
7345
fi
7348
7346
7349
@@ -11638,9 +11141,9 @@
7347
@@ -11637,9 +11140,9 @@
7350
7348
do
7351
7349
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7352
7350
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7358
7356
$as_echo_n "(cached) " >&6
7359
7357
else
7360
7358
if test -n "$CC"; then
7361
@@ -11651,24 +11154,24 @@
7359
@@ -11650,24 +11153,24 @@
7362
7360
do
7363
7361
IFS=$as_save_IFS
7364
7362
test -z "$as_dir" && as_dir=.
7388
7386
$as_echo "no" >&6; }
7389
7387
fi
7390
7388
7391
@@ -11682,9 +11185,9 @@
7389
@@ -11681,9 +11184,9 @@
7392
7390
do
7393
7391
# Extract the first word of "$ac_prog", so it can be a program name with args.
7394
7392
set dummy $ac_prog; ac_word=$2
7400
7398
$as_echo_n "(cached) " >&6
7401
7399
else
7402
7400
if test -n "$ac_ct_CC"; then
7403
@@ -11695,24 +11198,24 @@
7401
@@ -11694,24 +11197,24 @@
7404
7402
do
7405
7403
IFS=$as_save_IFS
7406
7404
test -z "$as_dir" && as_dir=.
7430
7428
$as_echo "no" >&6; }
7431
7429
fi
7432
7430
7433
@@ -11725,7 +11228,7 @@
7431
@@ -11724,7 +11227,7 @@
7434
7432
else
7435
7433
case $cross_compiling:$ac_tool_warned in
7436
7434
yes:)
7439
7437
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7440
7438
ac_tool_warned=yes ;;
7441
7439
esac
7442
@@ -11736,62 +11239,42 @@
7440
@@ -11735,62 +11238,42 @@
7443
7441
fi
7444
7442
7445
7443
7524
7522
/* end confdefs.h. */
7525
7523
7526
7524
int
7527
@@ -11805,37 +11288,16 @@
7525
@@ -11804,37 +11287,16 @@
7528
7526
return 0;
7529
7527
}
7530
7528
_ACEOF
7565
7563
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
7566
7564
if test $ac_compiler_gnu = yes; then
7567
7565
GCC=yes
7568
@@ -11844,20 +11306,16 @@
7566
@@ -11843,20 +11305,16 @@
7569
7567
fi
7570
7568
ac_test_CFLAGS=${CFLAGS+set}
7571
7569
ac_save_CFLAGS=$CFLAGS
7589
7587
/* end confdefs.h. */
7590
7588
7591
7589
int
7592
@@ -11868,35 +11326,11 @@
7590
@@ -11867,35 +11325,11 @@
7593
7591
return 0;
7594
7592
}
7595
7593
_ACEOF
7628
7626
/* end confdefs.h. */
7629
7627
7630
7628
int
7631
@@ -11907,36 +11341,12 @@
7629
@@ -11906,36 +11340,12 @@
7632
7630
return 0;
7633
7631
}
7634
7632
_ACEOF
7669
7667
/* end confdefs.h. */
7670
7668
7671
7669
int
7672
@@ -11947,42 +11357,17 @@
7670
@@ -11946,42 +11356,17 @@
7673
7671
return 0;
7674
7672
}
7675
7673
_ACEOF
7714
7712
$as_echo "$ac_cv_prog_cc_g" >&6; }
7715
7713
if test "$ac_test_CFLAGS" = set; then
7716
7714
CFLAGS=$ac_save_CFLAGS
7717
@@ -11999,18 +11384,14 @@
7715
@@ -11998,18 +11383,14 @@
7718
7716
CFLAGS=
7719
7717
fi
7720
7718
fi
7736
7734
/* end confdefs.h. */
7737
7735
#include <stdarg.h>
7738
7736
#include <stdio.h>
7739
@@ -12067,32 +11448,9 @@
7737
@@ -12066,32 +11447,9 @@
7740
7738
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7741
7739
do
7742
7740
CC="$ac_save_CC $ac_arg"
7770
7768
rm -f core conftest.err conftest.$ac_objext
7771
7769
test "x$ac_cv_prog_cc_c89" != "xno" && break
7772
7770
done
7773
@@ -12103,17 +11461,19 @@
7771
@@ -12102,17 +11460,19 @@
7774
7772
# AC_CACHE_VAL
7775
7773
case "x$ac_cv_prog_cc_c89" in
7776
7774
x)
7793
7791
7794
7792
ac_ext=c
7795
7793
ac_cpp='$CPP $CPPFLAGS'
7796
@@ -12123,9 +11483,9 @@
7794
@@ -12122,9 +11482,9 @@
7797
7795
7798
7796
depcc="$CC" am_compiler_list=
7799
7797
7805
7803
$as_echo_n "(cached) " >&6
7806
7804
else
7807
7805
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7808
@@ -12233,7 +11593,7 @@
7806
@@ -12232,7 +11592,7 @@
7809
7807
fi
7810
7808
7811
7809
fi
7814
7812
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
7815
7813
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7816
7814
7817
@@ -12262,9 +11622,9 @@
7815
@@ -12261,9 +11621,9 @@
7818
7816
do
7819
7817
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7820
7818
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7826
7824
$as_echo_n "(cached) " >&6
7827
7825
else
7828
7826
if test -n "$CXX"; then
7829
@@ -12275,24 +11635,24 @@
7827
@@ -12274,24 +11634,24 @@
7830
7828
do
7831
7829
IFS=$as_save_IFS
7832
7830
test -z "$as_dir" && as_dir=.
7856
7854
$as_echo "no" >&6; }
7857
7855
fi
7858
7856
7859
@@ -12306,9 +11666,9 @@
7857
@@ -12305,9 +11665,9 @@
7860
7858
do
7861
7859
# Extract the first word of "$ac_prog", so it can be a program name with args.
7862
7860
set dummy $ac_prog; ac_word=$2
7868
7866
$as_echo_n "(cached) " >&6
7869
7867
else
7870
7868
if test -n "$ac_ct_CXX"; then
7871
@@ -12319,24 +11679,24 @@
7869
@@ -12318,24 +11678,24 @@
7872
7870
do
7873
7871
IFS=$as_save_IFS
7874
7872
test -z "$as_dir" && as_dir=.
7898
7896
$as_echo "no" >&6; }
7899
7897
fi
7900
7898
7901
@@ -12349,7 +11709,7 @@
7899
@@ -12348,7 +11708,7 @@
7902
7900
else
7903
7901
case $cross_compiling:$ac_tool_warned in
7904
7902
yes:)
7907
7905
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7908
7906
ac_tool_warned=yes ;;
7909
7907
esac
7910
@@ -12359,54 +11719,37 @@
7908
@@ -12358,54 +11718,37 @@
7911
7909
7912
7910
fi
7913
7911
fi
7984
7982
/* end confdefs.h. */
7985
7983
7986
7984
int
7987
@@ -12420,37 +11763,16 @@
7985
@@ -12419,37 +11762,16 @@
7988
7986
return 0;
7989
7987
}
7990
7988
_ACEOF
8025
8023
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
8026
8024
if test $ac_compiler_gnu = yes; then
8027
8025
GXX=yes
8028
@@ -12459,20 +11781,16 @@
8026
@@ -12458,20 +11780,16 @@
8029
8027
fi
8030
8028
ac_test_CXXFLAGS=${CXXFLAGS+set}
8031
8029
ac_save_CXXFLAGS=$CXXFLAGS
8049
8047
/* end confdefs.h. */
8050
8048
8051
8049
int
8052
@@ -12483,35 +11801,11 @@
8050
@@ -12482,35 +11800,11 @@
8053
8051
return 0;
8054
8052
}
8055
8053
_ACEOF
8088
8086
/* end confdefs.h. */
8089
8087
8090
8088
int
8091
@@ -12522,36 +11816,12 @@
8089
@@ -12521,36 +11815,12 @@
8092
8090
return 0;
8093
8091
}
8094
8092
_ACEOF
8129
8127
/* end confdefs.h. */
8130
8128
8131
8129
int
8132
@@ -12562,42 +11832,17 @@
8130
@@ -12561,42 +11831,17 @@
8133
8131
return 0;
8134
8132
}
8135
8133
_ACEOF
8174
8172
$as_echo "$ac_cv_prog_cxx_g" >&6; }
8175
8173
if test "$ac_test_CXXFLAGS" = set; then
8176
8174
CXXFLAGS=$ac_save_CXXFLAGS
8177
@@ -12622,9 +11867,9 @@
8175
@@ -12621,9 +11866,9 @@
8178
8176
8179
8177
depcc="$CXX" am_compiler_list=
8180
8178
8186
8184
$as_echo_n "(cached) " >&6
8187
8185
else
8188
8186
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8189
@@ -12732,7 +11977,7 @@
8187
@@ -12731,7 +11976,7 @@
8190
8188
fi
8191
8189
8192
8190
fi
8195
8193
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
8196
8194
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
8197
8195
8198
@@ -12762,9 +12007,9 @@
8196
@@ -12761,9 +12006,9 @@
8199
8197
do
8200
8198
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8201
8199
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8207
8205
$as_echo_n "(cached) " >&6
8208
8206
else
8209
8207
if test -n "$CXX"; then
8210
@@ -12775,24 +12020,24 @@
8208
@@ -12774,24 +12019,24 @@
8211
8209
do
8212
8210
IFS=$as_save_IFS
8213
8211
test -z "$as_dir" && as_dir=.
8237
8235
$as_echo "no" >&6; }
8238
8236
fi
8239
8237
8240
@@ -12806,9 +12051,9 @@
8238
@@ -12805,9 +12050,9 @@
8241
8239
do
8242
8240
# Extract the first word of "$ac_prog", so it can be a program name with args.
8243
8241
set dummy $ac_prog; ac_word=$2
8249
8247
$as_echo_n "(cached) " >&6
8250
8248
else
8251
8249
if test -n "$ac_ct_CXX"; then
8252
@@ -12819,24 +12064,24 @@
8250
@@ -12818,24 +12063,24 @@
8253
8251
do
8254
8252
IFS=$as_save_IFS
8255
8253
test -z "$as_dir" && as_dir=.
8279
8277
$as_echo "no" >&6; }
8280
8278
fi
8281
8279
8282
@@ -12849,7 +12094,7 @@
8280
@@ -12848,7 +12093,7 @@
8283
8281
else
8284
8282
case $cross_compiling:$ac_tool_warned in
8285
8283
yes:)
8288
8286
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8289
8287
ac_tool_warned=yes ;;
8290
8288
esac
8291
@@ -12860,53 +12105,36 @@
8289
@@ -12859,53 +12104,36 @@
8292
8290
fi
8293
8291
fi
8294
8292
# Provide some information about the compiler.
8361
8359
/* end confdefs.h. */
8362
8360
8363
8361
int
8364
@@ -12920,37 +12148,16 @@
8362
@@ -12919,37 +12147,16 @@
8365
8363
return 0;
8366
8364
}
8367
8365
_ACEOF
8402
8400
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
8403
8401
if test $ac_compiler_gnu = yes; then
8404
8402
GXX=yes
8405
@@ -12959,20 +12166,16 @@
8403
@@ -12958,20 +12165,16 @@
8406
8404
fi
8407
8405
ac_test_CXXFLAGS=${CXXFLAGS+set}
8408
8406
ac_save_CXXFLAGS=$CXXFLAGS
8426
8424
/* end confdefs.h. */
8427
8425
8428
8426
int
8429
@@ -12983,35 +12186,11 @@
8427
@@ -12982,35 +12185,11 @@
8430
8428
return 0;
8431
8429
}
8432
8430
_ACEOF
8465
8463
/* end confdefs.h. */
8466
8464
8467
8465
int
8468
@@ -13022,36 +12201,12 @@
8466
@@ -13021,36 +12200,12 @@
8469
8467
return 0;
8470
8468
}
8471
8469
_ACEOF
8506
8504
/* end confdefs.h. */
8507
8505
8508
8506
int
8509
@@ -13062,42 +12217,17 @@
8507
@@ -13061,42 +12216,17 @@
8510
8508
return 0;
8511
8509
}
8512
8510
_ACEOF
8551
8549
$as_echo "$ac_cv_prog_cxx_g" >&6; }
8552
8550
if test "$ac_test_CXXFLAGS" = set; then
8553
8551
CXXFLAGS=$ac_save_CXXFLAGS
8554
@@ -13122,9 +12252,9 @@
8552
@@ -13121,9 +12251,9 @@
8555
8553
8556
8554
depcc="$CXX" am_compiler_list=
8557
8555
8563
8561
$as_echo_n "(cached) " >&6
8564
8562
else
8565
8563
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8566
@@ -13232,7 +12362,7 @@
8564
@@ -13231,7 +12361,7 @@
8567
8565
fi
8568
8566
8569
8567
fi
8572
8570
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
8573
8571
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
8574
8572
8575
@@ -13255,10 +12385,10 @@
8573
@@ -13254,10 +12384,10 @@
8576
8574
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8577
8575
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8578
8576
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8585
8583
$as_echo_n "(cached) " >&6
8586
8584
else
8587
8585
# Double quotes because CXXCPP needs to be expanded
8588
@@ -13273,11 +12403,7 @@
8586
@@ -13272,11 +12402,7 @@
8589
8587
# <limits.h> exists even on freestanding compilers.
8590
8588
# On the NeXT, cc -E runs the code through the compiler's parser,
8591
8589
# not just through cpp. "Syntax error" is here to catch this case.
8598
8596
/* end confdefs.h. */
8599
8597
#ifdef __STDC__
8600
8598
# include <limits.h>
8601
@@ -13286,78 +12412,34 @@
8599
@@ -13285,78 +12411,34 @@
8602
8600
#endif
8603
8601
Syntax error
8604
8602
_ACEOF
8682
8680
break
8683
8681
fi
8684
8682
8685
@@ -13369,7 +12451,7 @@
8683
@@ -13368,7 +12450,7 @@
8686
8684
else
8687
8685
ac_cv_prog_CXXCPP=$CXXCPP
8688
8686
fi
8691
8689
$as_echo "$CXXCPP" >&6; }
8692
8690
ac_preproc_ok=false
8693
8691
for ac_cxx_preproc_warn_flag in '' yes
8694
@@ -13380,11 +12462,7 @@
8692
@@ -13379,11 +12461,7 @@
8695
8693
# <limits.h> exists even on freestanding compilers.
8696
8694
# On the NeXT, cc -E runs the code through the compiler's parser,
8697
8695
# not just through cpp. "Syntax error" is here to catch this case.
8704
8702
/* end confdefs.h. */
8705
8703
#ifdef __STDC__
8706
8704
# include <limits.h>
8707
@@ -13393,81 +12471,37 @@
8705
@@ -13392,81 +12470,37 @@
8708
8706
#endif
8709
8707
Syntax error
8710
8708
_ACEOF
8793
8791
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8794
8792
_lt_caught_CXX_error=yes; }
8795
8793
fi
8796
@@ -13610,7 +12644,7 @@
8794
@@ -13609,7 +12643,7 @@
8797
8795
8798
8796
8799
8797
# Check whether --with-gnu-ld was given.
8802
8800
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
8803
8801
else
8804
8802
with_gnu_ld=no
8805
@@ -13619,7 +12653,7 @@
8803
@@ -13618,7 +12652,7 @@
8806
8804
ac_prog=ld
8807
8805
if test "$GCC" = yes; then
8808
8806
# Check if gcc -print-prog-name=ld gives a path.
8811
8809
$as_echo_n "checking for ld used by $CC... " >&6; }
8812
8810
case $host in
8813
8811
*-*-mingw*)
8814
@@ -13649,13 +12683,13 @@
8812
@@ -13648,13 +12682,13 @@
8815
8813
;;
8816
8814
esac
8817
8815
elif test "$with_gnu_ld" = yes; then
8828
8826
$as_echo_n "(cached) " >&6
8829
8827
else
8830
8828
if test -z "$LD"; then
8831
@@ -13686,18 +12720,16 @@
8829
@@ -13685,18 +12719,16 @@
8832
8830
8833
8831
LD="$lt_cv_path_LD"
8834
8832
if test -n "$LD"; then
8852
8850
$as_echo_n "(cached) " >&6
8853
8851
else
8854
8852
# I'd rather use --version here, but apparently some GNU lds only accept -v.
8855
@@ -13710,7 +12742,7 @@
8853
@@ -13709,7 +12741,7 @@
8856
8854
;;
8857
8855
esac
8858
8856
fi
8861
8859
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
8862
8860
with_gnu_ld=$lt_cv_prog_gnu_ld
8863
8861
8864
@@ -13765,7 +12797,7 @@
8862
@@ -13764,7 +12796,7 @@
8865
8863
fi
8866
8864
8867
8865
# PORTME: fill in a description of your system's C++ link characteristics
8870
8868
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
8871
8869
ld_shlibs_CXX=yes
8872
8870
case $host_os in
8873
@@ -13866,11 +12898,7 @@
8871
@@ -13865,11 +12897,7 @@
8874
8872
allow_undefined_flag_CXX='-berok'
8875
8873
# Determine the default libpath from the value encoded in an empty
8876
8874
# executable.
8883
8881
/* end confdefs.h. */
8884
8882
8885
8883
int
8886
@@ -13881,27 +12909,7 @@
8884
@@ -13880,27 +12908,7 @@
8887
8885
return 0;
8888
8886
}
8889
8887
_ACEOF
8912
8910
8913
8911
lt_aix_libpath_sed='
8914
8912
/Import File Strings/,/^$/ {
8915
@@ -13915,16 +12923,9 @@
8913
@@ -13914,16 +12922,9 @@
8916
8914
if test -z "$aix_libpath"; then
8917
8915
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8918
8916
fi
8931
8929
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8932
8930
8933
8931
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
8934
@@ -13938,11 +12939,7 @@
8932
@@ -13937,11 +12938,7 @@
8935
8933
else
8936
8934
# Determine the default libpath from the value encoded in an
8937
8935
# empty executable.
8944
8942
/* end confdefs.h. */
8945
8943
8946
8944
int
8947
@@ -13953,27 +12950,7 @@
8945
@@ -13952,27 +12949,7 @@
8948
8946
return 0;
8949
8947
}
8950
8948
_ACEOF
8973
8971
8974
8972
lt_aix_libpath_sed='
8975
8973
/Import File Strings/,/^$/ {
8976
@@ -13987,16 +12964,9 @@
8974
@@ -13986,16 +12963,9 @@
8977
8975
if test -z "$aix_libpath"; then
8978
8976
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8979
8977
fi
8992
8990
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8993
8991
8994
8992
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
8995
@@ -14740,7 +13710,7 @@
8993
@@ -14739,7 +13709,7 @@
8996
8994
;;
8997
8995
esac
8998
8996
9001
8999
$as_echo "$ld_shlibs_CXX" >&6; }
9002
9000
test "$ld_shlibs_CXX" = no && can_build_shared=no
9003
9001
9004
@@ -14768,11 +13738,11 @@
9002
@@ -14767,11 +13737,11 @@
9005
9003
};
9006
9004
_LT_EOF
9007
9005
9016
9014
# Parse the compiler output and extract the necessary
9017
9015
# objects, libraries and library flags.
9018
9016
9019
@@ -14953,7 +13923,7 @@
9017
@@ -14952,7 +13922,7 @@
9020
9018
lt_prog_compiler_pic_CXX=
9021
9019
lt_prog_compiler_static_CXX=
9022
9020
9025
9023
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9026
9024
9027
9025
# C++ specific cases for pic, static, wl, etc.
9028
@@ -15270,7 +14240,7 @@
9026
@@ -15269,7 +14239,7 @@
9029
9027
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9030
9028
;;
9031
9029
esac
9034
9032
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9035
9033
9036
9034
9037
@@ -15279,9 +14249,9 @@
9035
@@ -15278,9 +14248,9 @@
9038
9036
# Check to make sure the PIC flag actually works.
9039
9037
#
9040
9038
if test -n "$lt_prog_compiler_pic_CXX"; then
9046
9044
$as_echo_n "(cached) " >&6
9047
9045
else
9048
9046
lt_cv_prog_compiler_pic_works_CXX=no
9049
@@ -15297,11 +14267,11 @@
9047
@@ -15296,11 +14266,11 @@
9050
9048
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9051
9049
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9052
9050
-e 's:$: $lt_compiler_flag:'`
9053
- (eval echo "\"\$as_me:15300: $lt_compile\"" >&5)
9054
+ (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
9051
- (eval echo "\"\$as_me:15299: $lt_compile\"" >&5)
9052
+ (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
9055
9053
(eval "$lt_compile" 2>conftest.err)
9056
9054
ac_status=$?
9057
9055
cat conftest.err >&5
9058
- echo "$as_me:15304: \$? = $ac_status" >&5
9059
+ echo "$as_me:14274: \$? = $ac_status" >&5
9056
- echo "$as_me:15303: \$? = $ac_status" >&5
9057
+ echo "$as_me:14273: \$? = $ac_status" >&5
9060
9058
if (exit $ac_status) && test -s "$ac_outfile"; then
9061
9059
# The compiler can only warn and ignore the option if not recognized
9062
9060
# So say no if there are warnings other than the usual output.
9063
@@ -15314,7 +14284,7 @@
9061
@@ -15313,7 +14283,7 @@
9064
9062
$RM conftest*
9065
9063
9066
9064
fi
9069
9067
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
9070
9068
9071
9069
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
9072
@@ -15335,9 +14305,9 @@
9070
@@ -15334,9 +14304,9 @@
9073
9071
# Check to make sure the static flag actually works.
9074
9072
#
9075
9073
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
9081
9079
$as_echo_n "(cached) " >&6
9082
9080
else
9083
9081
lt_cv_prog_compiler_static_works_CXX=no
9084
@@ -15363,7 +14333,7 @@
9082
@@ -15362,7 +14332,7 @@
9085
9083
LDFLAGS="$save_LDFLAGS"
9086
9084
9087
9085
fi
9090
9088
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
9091
9089
9092
9090
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
9093
@@ -15375,9 +14345,9 @@
9094
9095
9096
9097
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
9098
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
9099
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
9100
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
9101
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
9102
$as_echo_n "(cached) " >&6
9103
else
9104
lt_cv_prog_compiler_c_o_CXX=no
9105
@@ -15396,11 +14366,11 @@
9106
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9107
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9108
-e 's:$: $lt_compiler_flag:'`
9109
- (eval echo "\"\$as_me:15399: $lt_compile\"" >&5)
9110
+ (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
9111
(eval "$lt_compile" 2>out/conftest.err)
9112
ac_status=$?
9113
cat out/conftest.err >&5
9114
- echo "$as_me:15403: \$? = $ac_status" >&5
9115
+ echo "$as_me:14373: \$? = $ac_status" >&5
9116
if (exit $ac_status) && test -s out/conftest2.$ac_objext
9117
then
9118
# The compiler can only warn and ignore the option if not recognized
9119
@@ -15422,14 +14392,14 @@
9120
$RM conftest*
9121
9122
fi
9123
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9124
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9125
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
9126
9127
9128
9129
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
9130
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
9131
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
9132
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
9133
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
9134
$as_echo_n "(cached) " >&6
9135
else
9136
lt_cv_prog_compiler_c_o_CXX=no
9137
@@ -15448,11 +14418,11 @@
9138
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9139
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9140
-e 's:$: $lt_compiler_flag:'`
9141
- (eval echo "\"\$as_me:15451: $lt_compile\"" >&5)
9142
+ (eval echo "\"\$as_me:14421: $lt_compile\"" >&5)
9143
(eval "$lt_compile" 2>out/conftest.err)
9144
ac_status=$?
9145
cat out/conftest.err >&5
9146
- echo "$as_me:15455: \$? = $ac_status" >&5
9147
+ echo "$as_me:14425: \$? = $ac_status" >&5
9148
if (exit $ac_status) && test -s out/conftest2.$ac_objext
9149
then
9150
# The compiler can only warn and ignore the option if not recognized
9151
@@ -15474,7 +14444,7 @@
9152
$RM conftest*
9153
9154
fi
9155
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9156
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9157
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
9158
9159
9160
@@ -15483,7 +14453,7 @@
9091
@@ -15374,9 +14344,9 @@
9092
9093
9094
9095
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
9096
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
9097
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
9098
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
9099
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
9100
$as_echo_n "(cached) " >&6
9101
else
9102
lt_cv_prog_compiler_c_o_CXX=no
9103
@@ -15395,11 +14365,11 @@
9104
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9105
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9106
-e 's:$: $lt_compiler_flag:'`
9107
- (eval echo "\"\$as_me:15398: $lt_compile\"" >&5)
9108
+ (eval echo "\"\$as_me:14368: $lt_compile\"" >&5)
9109
(eval "$lt_compile" 2>out/conftest.err)
9110
ac_status=$?
9111
cat out/conftest.err >&5
9112
- echo "$as_me:15402: \$? = $ac_status" >&5
9113
+ echo "$as_me:14372: \$? = $ac_status" >&5
9114
if (exit $ac_status) && test -s out/conftest2.$ac_objext
9115
then
9116
# The compiler can only warn and ignore the option if not recognized
9117
@@ -15421,14 +14391,14 @@
9118
$RM conftest*
9119
9120
fi
9121
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9122
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9123
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
9124
9125
9126
9127
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
9128
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
9129
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
9130
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
9131
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
9132
$as_echo_n "(cached) " >&6
9133
else
9134
lt_cv_prog_compiler_c_o_CXX=no
9135
@@ -15447,11 +14417,11 @@
9136
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9137
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9138
-e 's:$: $lt_compiler_flag:'`
9139
- (eval echo "\"\$as_me:15450: $lt_compile\"" >&5)
9140
+ (eval echo "\"\$as_me:14420: $lt_compile\"" >&5)
9141
(eval "$lt_compile" 2>out/conftest.err)
9142
ac_status=$?
9143
cat out/conftest.err >&5
9144
- echo "$as_me:15454: \$? = $ac_status" >&5
9145
+ echo "$as_me:14424: \$? = $ac_status" >&5
9146
if (exit $ac_status) && test -s out/conftest2.$ac_objext
9147
then
9148
# The compiler can only warn and ignore the option if not recognized
9149
@@ -15473,7 +14443,7 @@
9150
$RM conftest*
9151
9152
fi
9153
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9154
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
9155
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
9156
9157
9158
@@ -15482,7 +14452,7 @@
9161
9159
hard_links="nottested"
9162
9160
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
9163
9161
# do not overwrite the value of need_locks provided by the user
9166
9164
$as_echo_n "checking if we can lock with hard links... " >&6; }
9167
9165
hard_links=yes
9168
9166
$RM conftest*
9169
@@ -15491,10 +14461,10 @@
9167
@@ -15490,10 +14460,10 @@
9170
9168
touch conftest.a
9171
9169
ln conftest.a conftest.b 2>&5 || hard_links=no
9172
9170
ln conftest.a conftest.b 2>/dev/null && hard_links=no
9179
9177
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
9180
9178
need_locks=warn
9181
9179
fi
9182
@@ -15504,7 +14474,7 @@
9180
@@ -15503,7 +14473,7 @@
9183
9181
9184
9182
9185
9183
9188
9186
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9189
9187
9190
9188
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9191
@@ -15530,7 +14500,7 @@
9189
@@ -15529,7 +14499,7 @@
9192
9190
esac
9193
9191
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9194
9192
9197
9195
$as_echo "$ld_shlibs_CXX" >&6; }
9198
9196
test "$ld_shlibs_CXX" = no && can_build_shared=no
9199
9197
9200
@@ -15558,16 +14528,16 @@
9198
@@ -15557,16 +14527,16 @@
9201
9199
# Test whether the compiler implicitly links with -lc since on some
9202
9200
# systems, -lgcc has to come before -lc. If gcc already passes -lc
9203
9201
# to ld, don't add -lc before -lgcc.
9218
9216
soname=conftest
9219
9217
lib=conftest
9220
9218
libobjs=conftest.$ac_objext
9221
@@ -15581,11 +14551,11 @@
9219
@@ -15580,11 +14550,11 @@
9222
9220
libname=conftest
9223
9221
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
9224
9222
allow_undefined_flag_CXX=
9233
9231
then
9234
9232
archive_cmds_need_lc_CXX=no
9235
9233
else
9236
@@ -15596,7 +14566,7 @@
9234
@@ -15595,7 +14565,7 @@
9237
9235
cat conftest.err 1>&5
9238
9236
fi
9239
9237
$RM conftest*
9242
9240
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
9243
9241
;;
9244
9242
esac
9245
@@ -15667,7 +14637,7 @@
9243
@@ -15666,7 +14636,7 @@
9246
9244
9247
9245
9248
9246
9251
9249
$as_echo_n "checking dynamic linker characteristics... " >&6; }
9252
9250
9253
9251
library_names_spec=
9254
@@ -16037,56 +15007,24 @@
9252
@@ -16036,56 +15006,24 @@
9255
9253
save_libdir=$libdir
9256
9254
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
9257
9255
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
9322
9320
LDFLAGS=$save_LDFLAGS
9323
9321
libdir=$save_libdir
9324
9322
9325
@@ -16301,7 +15239,7 @@
9323
@@ -16300,7 +15238,7 @@
9326
9324
dynamic_linker=no
9327
9325
;;
9328
9326
esac
9331
9329
$as_echo "$dynamic_linker" >&6; }
9332
9330
test "$dynamic_linker" = no && can_build_shared=no
9333
9331
9334
@@ -16352,7 +15290,7 @@
9332
@@ -16351,7 +15289,7 @@
9335
9333
9336
9334
9337
9335
9340
9338
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
9341
9339
hardcode_action_CXX=
9342
9340
if test -n "$hardcode_libdir_flag_spec_CXX" ||
9343
@@ -16377,7 +15315,7 @@
9341
@@ -16376,7 +15314,7 @@
9344
9342
# directories.
9345
9343
hardcode_action_CXX=unsupported
9346
9344
fi
9349
9347
$as_echo "$hardcode_action_CXX" >&6; }
9350
9348
9351
9349
if test "$hardcode_action_CXX" = relink ||
9352
@@ -16416,18 +15354,14 @@
9350
@@ -16415,18 +15353,14 @@
9353
9351
ac_compiler_gnu=$ac_cv_c_compiler_gnu
9354
9352
9355
9353
9371
9369
/* end confdefs.h. */
9372
9370
#ifndef __cplusplus
9373
9371
typedef int foo_t;
9374
@@ -16436,41 +15370,17 @@
9372
@@ -16435,41 +15369,17 @@
9375
9373
#endif
9376
9374
9377
9375
_ACEOF
9415
9413
case $ac_cv_c_inline in
9416
9414
inline | yes) ;;
9417
9415
*)
9418
@@ -16490,30 +15400,26 @@
9416
@@ -16489,30 +15399,26 @@
9419
9417
9420
9418
CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith -Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Wunused-parameter -Wwrite-strings"
9421
9419
9451
9449
/* end confdefs.h. */
9452
9450
#include <stdlib.h>
9453
9451
#include <stdarg.h>
9454
@@ -16528,48 +15434,23 @@
9452
@@ -16527,48 +15433,23 @@
9455
9453
return 0;
9456
9454
}
9457
9455
_ACEOF
9505
9503
else
9506
9504
ac_cv_header_stdc=no
9507
9505
fi
9508
@@ -16579,18 +15460,14 @@
9506
@@ -16578,18 +15459,14 @@
9509
9507
9510
9508
if test $ac_cv_header_stdc = yes; then
9511
9509
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
9527
9525
else
9528
9526
ac_cv_header_stdc=no
9529
9527
fi
9530
@@ -16600,14 +15477,10 @@
9528
@@ -16599,14 +15476,10 @@
9531
9529
9532
9530
if test $ac_cv_header_stdc = yes; then
9533
9531
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
9544
9542
/* end confdefs.h. */
9545
9543
#include <ctype.h>
9546
9544
#include <stdlib.h>
9547
@@ -16634,64 +15507,31 @@
9545
@@ -16633,64 +15506,31 @@
9548
9546
return 0;
9549
9547
}
9550
9548
_ACEOF
9619
9617
/* end confdefs.h. */
9620
9618
#include <sys/types.h>
9621
9619
#include <sys/time.h>
9622
@@ -16706,155 +15546,28 @@
9620
@@ -16705,155 +15545,28 @@
9623
9621
return 0;
9624
9622
}
9625
9623
_ACEOF
9784
9782
cat >>confdefs.h <<_ACEOF
9785
9783
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9786
9784
_ACEOF
9787
@@ -16862,104 +15575,12 @@
9785
@@ -16861,104 +15574,12 @@
9788
9786
fi
9789
9787
done
9790
9788
9891
9889
$as_echo_n "(cached) " >&6
9892
9890
else
9893
9891
cat >conftest.make <<\_ACEOF
9894
@@ -16977,11 +15598,11 @@
9892
@@ -16976,11 +15597,11 @@
9895
9893
rm -f conftest.make
9896
9894
fi
9897
9895
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
9905
9903
$as_echo "no" >&6; }
9906
9904
SET_MAKE="MAKE=${MAKE-make}"
9907
9905
fi
9908
@@ -17009,13 +15630,9 @@
9906
@@ -17008,13 +15629,9 @@
9909
9907
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
9910
9908
save_LIBS="$LIBS"
9911
9909
LIBS="$PTHREAD_LIBS $LIBS"
9921
9919
/* end confdefs.h. */
9922
9920
9923
9921
/* Override any GCC internal prototype to avoid an error.
9924
@@ -17033,39 +15650,12 @@
9922
@@ -17032,39 +15649,12 @@
9925
9923
return 0;
9926
9924
}
9927
9925
_ACEOF
9965
9963
$as_echo "$acx_pthread_ok" >&6; }
9966
9964
if test x"$acx_pthread_ok" = xno; then
9967
9965
PTHREAD_LIBS=""
9968
@@ -17127,12 +15717,12 @@
9966
@@ -17126,12 +15716,12 @@
9969
9967
9970
9968
case $flag in
9971
9969
none)
9980
9978
$as_echo_n "checking whether pthreads work with $flag... " >&6; }
9981
9979
PTHREAD_CFLAGS="$flag"
9982
9980
;;
9983
@@ -17140,9 +15730,9 @@
9981
@@ -17139,9 +15729,9 @@
9984
9982
pthread-config)
9985
9983
# Extract the first word of "pthread-config", so it can be a program name with args.
9986
9984
set dummy pthread-config; ac_word=$2
9992
9990
$as_echo_n "(cached) " >&6
9993
9991
else
9994
9992
if test -n "$acx_pthread_config"; then
9995
@@ -17153,14 +15743,14 @@
9993
@@ -17152,14 +15742,14 @@
9996
9994
do
9997
9995
IFS=$as_save_IFS
9998
9996
test -z "$as_dir" && as_dir=.
10010
10008
IFS=$as_save_IFS
10011
10009
10012
10010
test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
10013
@@ -17168,10 +15758,10 @@
10011
@@ -17167,10 +15757,10 @@
10014
10012
fi
10015
10013
acx_pthread_config=$ac_cv_prog_acx_pthread_config
10016
10014
if test -n "$acx_pthread_config"; then
10023
10021
$as_echo "no" >&6; }
10024
10022
fi
10025
10023
10026
@@ -17182,7 +15772,7 @@
10024
@@ -17181,7 +15771,7 @@
10027
10025
;;
10028
10026
10029
10027
*)
10032
10030
$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
10033
10031
PTHREAD_LIBS="-l$flag"
10034
10032
;;
10035
@@ -17202,11 +15792,7 @@
10033
@@ -17201,11 +15791,7 @@
10036
10034
# pthread_cleanup_push because it is one of the few pthread
10037
10035
# functions on Solaris that doesn't have a non-functional libc stub.
10038
10036
# We try pthread_create on general principles.
10045
10043
/* end confdefs.h. */
10046
10044
#include <pthread.h>
10047
10045
int
10048
@@ -17219,43 +15805,16 @@
10046
@@ -17218,43 +15804,16 @@
10049
10047
return 0;
10050
10048
}
10051
10049
_ACEOF
10093
10091
$as_echo "$acx_pthread_ok" >&6; }
10094
10092
if test "x$acx_pthread_ok" = xyes; then
10095
10093
break;
10096
@@ -17274,15 +15833,11 @@
10094
@@ -17273,15 +15832,11 @@
10097
10095
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
10098
10096
10099
10097
# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
10111
10109
/* end confdefs.h. */
10112
10110
#include <pthread.h>
10113
10111
int
10114
@@ -17293,40 +15848,13 @@
10112
@@ -17292,40 +15847,13 @@
10115
10113
return 0;
10116
10114
}
10117
10115
_ACEOF
10156
10154
$as_echo "$attr_name" >&6; }
10157
10155
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
10158
10156
10159
@@ -17336,14 +15864,14 @@
10157
@@ -17335,14 +15863,14 @@
10160
10158
10161
10159
fi
10162
10160
10173
10171
$as_echo "${flag}" >&6; }
10174
10172
if test "x$flag" != xno; then
10175
10173
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
10176
@@ -17358,9 +15886,9 @@
10174
@@ -17357,9 +15885,9 @@
10177
10175
do
10178
10176
# Extract the first word of "$ac_prog", so it can be a program name with args.
10179
10177
set dummy $ac_prog; ac_word=$2
10185
10183
$as_echo_n "(cached) " >&6
10186
10184
else
10187
10185
if test -n "$PTHREAD_CC"; then
10188
@@ -17371,24 +15899,24 @@
10186
@@ -17370,24 +15898,24 @@
10189
10187
do
10190
10188
IFS=$as_save_IFS
10191
10189
test -z "$as_dir" && as_dir=.
10215
10213
$as_echo "no" >&6; }
10216
10214
fi
10217
10215
10218
@@ -17411,9 +15939,7 @@
10216
@@ -17410,9 +15938,7 @@
10219
10217
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
10220
10218
if test x"$acx_pthread_ok" = xyes; then
10221
10219
10226
10224
10227
10225
:
10228
10226
else
10229
@@ -17432,17 +15958,13 @@
10227
@@ -17431,17 +15957,13 @@
10230
10228
CPPFLAGS="$CPPFLAGS -Dstrtold=strtod"
10231
10229
fi
10232
10230
10247
10245
/* end confdefs.h. */
10248
10246
10249
10247
/* Override any GCC internal prototype to avoid an error.
10250
@@ -17467,69 +15989,38 @@
10248
@@ -17466,69 +15988,38 @@
10251
10249
ac_res=-l$ac_lib
10252
10250
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
10253
10251
fi
10328
10326
/* end confdefs.h. */
10329
10327
10330
10328
/* Override any GCC internal prototype to avoid an error.
10331
@@ -17554,69 +16045,38 @@
10329
@@ -17553,69 +16044,38 @@
10332
10330
ac_res=-l$ac_lib
10333
10331
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
10334
10332
fi
10409
10407
/* end confdefs.h. */
10410
10408
10411
10409
/* Override any GCC internal prototype to avoid an error.
10412
@@ -17641,54 +16101,27 @@
10410
@@ -17640,54 +16100,27 @@
10413
10411
ac_res=-l$ac_lib
10414
10412
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
10415
10413
fi
10472
10470
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
10473
10471
10474
10472
fi
10475
@@ -17699,9 +16132,9 @@
10473
@@ -17698,9 +16131,9 @@
10476
10474
if test -n "$ac_tool_prefix"; then
10477
10475
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
10478
10476
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
10484
10482
$as_echo_n "(cached) " >&6
10485
10483
else
10486
10484
case $PKG_CONFIG in
10487
@@ -17714,14 +16147,14 @@
10485
@@ -17713,14 +16146,14 @@
10488
10486
do
10489
10487
IFS=$as_save_IFS
10490
10488
test -z "$as_dir" && as_dir=.
10502
10500
IFS=$as_save_IFS
10503
10501
10504
10502
;;
10505
@@ -17729,10 +16162,10 @@
10503
@@ -17728,10 +16161,10 @@
10506
10504
fi
10507
10505
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
10508
10506
if test -n "$PKG_CONFIG"; then
10515
10513
$as_echo "no" >&6; }
10516
10514
fi
10517
10515
10518
@@ -17742,9 +16175,9 @@
10516
@@ -17741,9 +16174,9 @@
10519
10517
ac_pt_PKG_CONFIG=$PKG_CONFIG
10520
10518
# Extract the first word of "pkg-config", so it can be a program name with args.
10521
10519
set dummy pkg-config; ac_word=$2
10527
10525
$as_echo_n "(cached) " >&6
10528
10526
else
10529
10527
case $ac_pt_PKG_CONFIG in
10530
@@ -17757,14 +16190,14 @@
10528
@@ -17756,14 +16189,14 @@
10531
10529
do
10532
10530
IFS=$as_save_IFS
10533
10531
test -z "$as_dir" && as_dir=.
10545
10543
IFS=$as_save_IFS
10546
10544
10547
10545
;;
10548
@@ -17772,10 +16205,10 @@
10546
@@ -17771,10 +16204,10 @@
10549
10547
fi
10550
10548
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
10551
10549
if test -n "$ac_pt_PKG_CONFIG"; then
10558
10556
$as_echo "no" >&6; }
10559
10557
fi
10560
10558
10561
@@ -17784,7 +16217,7 @@
10559
@@ -17783,7 +16216,7 @@
10562
10560
else
10563
10561
case $cross_compiling:$ac_tool_warned in
10564
10562
yes:)
10567
10565
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10568
10566
ac_tool_warned=yes ;;
10569
10567
esac
10570
@@ -17797,13 +16230,13 @@
10568
@@ -17796,13 +16229,13 @@
10571
10569
fi
10572
10570
if test -n "$PKG_CONFIG"; then
10573
10571
_pkg_min_version=0.9.0
10584
10582
$as_echo "no" >&6; }
10585
10583
PKG_CONFIG=""
10586
10584
fi
10587
@@ -17811,7 +16244,7 @@
10585
@@ -17810,7 +16243,7 @@
10588
10586
fi
10589
10587
10590
10588
pkg_failed=no
10593
10591
$as_echo_n "checking for OPENSSL... " >&6; }
10594
10592
10595
10593
if test -n "$PKG_CONFIG"; then
10596
@@ -17819,11 +16252,11 @@
10594
@@ -17818,11 +16251,11 @@
10597
10595
pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
10598
10596
else
10599
10597
if test -n "$PKG_CONFIG" && \
10608
10606
pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= $OPENSSL_MINIMUM" 2>/dev/null`
10609
10607
else
10610
10608
pkg_failed=yes
10611
@@ -17837,11 +16270,11 @@
10609
@@ -17836,11 +16269,11 @@
10612
10610
pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
10613
10611
else
10614
10612
if test -n "$PKG_CONFIG" && \
10623
10621
pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= $OPENSSL_MINIMUM" 2>/dev/null`
10624
10622
else
10625
10623
pkg_failed=yes
10626
@@ -17868,10 +16301,10 @@
10624
@@ -17867,10 +16300,10 @@
10627
10625
# Put the nasty error message in config.log where it belongs
10628
10626
echo "$OPENSSL_PKG_ERRORS" >&5
10629
10627
10636
10634
$as_echo_n "checking for OpenSSL... " >&6; }
10637
10635
10638
10636
for dir in $with_ssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
10639
@@ -17888,18 +16321,16 @@
10637
@@ -17887,18 +16320,16 @@
10640
10638
fi
10641
10639
done
10642
10640
if test x_$found_ssl != x_yes; then
10658
10656
$as_echo_n "checking for OpenSSL... " >&6; }
10659
10657
10660
10658
for dir in $with_ssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
10661
@@ -17916,11 +16347,9 @@
10659
@@ -17915,11 +16346,9 @@
10662
10660
fi
10663
10661
done
10664
10662
if test x_$found_ssl != x_yes; then
10672
10670
$as_echo "$ssldir" >&6; }
10673
10671
OPENSSL_LIBS="-L$ssldir/lib -lssl -lcrypto";
10674
10672
fi
10675
@@ -17928,13 +16357,13 @@
10673
@@ -17927,13 +16356,13 @@
10676
10674
else
10677
10675
OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
10678
10676
OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
10688
10686
$as_echo_n "checking for LIBCURL... " >&6; }
10689
10687
10690
10688
if test -n "$PKG_CONFIG"; then
10691
@@ -17942,11 +16371,11 @@
10689
@@ -17941,11 +16370,11 @@
10692
10690
pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
10693
10691
else
10694
10692
if test -n "$PKG_CONFIG" && \
10703
10701
pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= $CURL_MINIMUM" 2>/dev/null`
10704
10702
else
10705
10703
pkg_failed=yes
10706
@@ -17960,11 +16389,11 @@
10704
@@ -17959,11 +16388,11 @@
10707
10705
pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
10708
10706
else
10709
10707
if test -n "$PKG_CONFIG" && \
10718
10716
pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= $CURL_MINIMUM" 2>/dev/null`
10719
10717
else
10720
10718
pkg_failed=yes
10721
@@ -17991,18 +16420,7 @@
10719
@@ -17990,18 +16419,7 @@
10722
10720
# Put the nasty error message in config.log where it belongs
10723
10721
echo "$LIBCURL_PKG_ERRORS" >&5
10724
10722
10738
10736
10739
10737
$LIBCURL_PKG_ERRORS
10740
10738
10741
@@ -18012,22 +16430,11 @@
10739
@@ -18011,22 +16429,11 @@
10742
10740
Alternatively, you may set the environment variables LIBCURL_CFLAGS
10743
10741
and LIBCURL_LIBS to avoid the need to call pkg-config.
10744
10742
See the pkg-config man page for more details.
10764
10762
is in your PATH or set the PKG_CONFIG environment variable to the full
10765
10763
path to pkg-config.
10766
10764
10767
@@ -18036,19 +16443,18 @@
10765
@@ -18035,19 +16442,18 @@
10768
10766
See the pkg-config man page for more details.
10769
10767
10770
10768
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
10787
10785
withval=$with_zlib; for dir in `echo "$withval" | tr : ' '`; do
10788
10786
if test -d $dir/include; then
10789
10787
ZLIB_CFLAGS="$ZLIB_CFLAGS -I$dir/include"
10790
@@ -18062,7 +16468,7 @@
10788
@@ -18061,7 +16467,7 @@
10791
10789
10792
10790
10793
10791
# Check whether --with-zlib-includes was given.
10796
10794
withval=$with_zlib_includes; for dir in `echo "$withval" | tr : ' '`; do
10797
10795
if test -d $dir; then
10798
10796
ZLIB_CFLAGS="$ZLIB_CFLAGS -I$dir"
10799
@@ -18079,62 +16485,13 @@
10797
@@ -18078,62 +16484,13 @@
10800
10798
ac_have_zlibh=no
10801
10799
ac_have_zlib=no
10802
10800
touch /tmp/dummy1_zlib.h
10865
10863
_ACEOF
10866
10864
ac_have_zlibh=yes
10867
10865
else
10868
@@ -18145,17 +16502,13 @@
10866
@@ -18144,17 +16501,13 @@
10869
10867
10870
10868
rm /tmp/dummy1_zlib.h
10871
10869
if test $ac_have_zlibh = yes; then
10886
10884
/* end confdefs.h. */
10887
10885
10888
10886
/* Override any GCC internal prototype to avoid an error.
10889
@@ -18180,54 +16533,27 @@
10887
@@ -18179,54 +16532,27 @@
10890
10888
ac_res=-l$ac_lib
10891
10889
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
10892
10890
fi
10949
10947
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
10950
10948
ac_have_zlib=yes
10951
10949
else
10952
@@ -18245,62 +16571,13 @@
10950
@@ -18244,62 +16570,13 @@
10953
10951
ZLIB_LDFLAGS="-L$dir/lib"
10954
10952
LDFLAGS="$ac_zlib_saved_LDFLAGS $ZLIB_LDFLAGS"
10955
10953
touch /tmp/dummy3_zlib.h
11018
11016
_ACEOF
11019
11017
ac_have_zlibh=yes
11020
11018
else
11021
@@ -18313,17 +16590,13 @@
11019
@@ -18312,17 +16589,13 @@
11022
11020
if test $ac_have_zlibh = yes; then
11023
11021
# Force check
11024
11022
ac_cv_search_gzopen=" "
11039
11037
/* end confdefs.h. */
11040
11038
11041
11039
/* Override any GCC internal prototype to avoid an error.
11042
@@ -18348,54 +16621,27 @@
11040
@@ -18347,54 +16620,27 @@
11043
11041
ac_res=-l$ac_lib
11044
11042
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
11045
11043
fi
11102
11100
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
11103
11101
ac_have_zlib=yes
11104
11102
else
11105
@@ -18412,19 +16658,17 @@
11103
@@ -18411,19 +16657,17 @@
11106
11104
fi
11107
11105
done
11108
11106
if test $ac_have_zlib = no; then
11125
11123
11126
11124
fi
11127
11125
ZLIB_LIBS="$LIBS"
11128
@@ -18437,15 +16681,15 @@
11126
@@ -18436,15 +16680,15 @@
11129
11127
11130
11128
11131
11129
# Check whether --enable-largefile was given.
11144
11142
$as_echo_n "(cached) " >&6
11145
11143
else
11146
11144
ac_cv_sys_largefile_CC=no
11147
@@ -18454,11 +16698,7 @@
11145
@@ -18453,11 +16697,7 @@
11148
11146
while :; do
11149
11147
# IRIX 6.2 and later do not support large files by default,
11150
11148
# so use the C compiler's -n32 option if that helps.
11157
11155
/* end confdefs.h. */
11158
11156
#include <sys/types.h>
11159
11157
/* Check that off_t can represent 2**63 - 1 correctly.
11160
@@ -18477,60 +16717,14 @@
11158
@@ -18476,60 +16716,14 @@
11161
11159
return 0;
11162
11160
}
11163
11161
_ACEOF
11221
11219
rm -f core conftest.err conftest.$ac_objext
11222
11220
break
11223
11221
done
11224
@@ -18538,23 +16732,19 @@
11222
@@ -18537,23 +16731,19 @@
11225
11223
rm -f conftest.$ac_ext
11226
11224
fi
11227
11225
fi
11249
11247
/* end confdefs.h. */
11250
11248
#include <sys/types.h>
11251
11249
/* Check that off_t can represent 2**63 - 1 correctly.
11252
@@ -18573,38 +16763,11 @@
11250
@@ -18572,38 +16762,11 @@
11253
11251
return 0;
11254
11252
}
11255
11253
_ACEOF
11290
11288
/* end confdefs.h. */
11291
11289
#define _FILE_OFFSET_BITS 64
11292
11290
#include <sys/types.h>
11293
@@ -18624,38 +16787,15 @@
11291
@@ -18623,38 +16786,15 @@
11294
11292
return 0;
11295
11293
}
11296
11294
_ACEOF
11331
11329
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
11332
11330
case $ac_cv_sys_file_offset_bits in #(
11333
11331
no | unknown) ;;
11334
@@ -18667,17 +16807,13 @@
11332
@@ -18666,17 +16806,13 @@
11335
11333
esac
11336
11334
rm -rf conftest*
11337
11335
if test $ac_cv_sys_file_offset_bits = unknown; then
11352
11350
/* end confdefs.h. */
11353
11351
#include <sys/types.h>
11354
11352
/* Check that off_t can represent 2**63 - 1 correctly.
11355
@@ -18696,38 +16832,11 @@
11353
@@ -18695,38 +16831,11 @@
11356
11354
return 0;
11357
11355
}
11358
11356
_ACEOF
11393
11391
/* end confdefs.h. */
11394
11392
#define _LARGE_FILES 1
11395
11393
#include <sys/types.h>
11396
@@ -18743,554 +16852,78 @@
11394
@@ -18742,554 +16851,78 @@
11397
11395
main ()
11398
11396
{
11399
11397
11997
11995
have_inotify="yes"
11998
11996
else
11999
11997
have_inotify="no"
12000
@@ -19303,7 +16936,7 @@
11998
@@ -19302,7 +16935,7 @@
12001
11999
12002
12000
12003
12001
# Check whether --with-inotify was given.
12006
12004
withval=$with_inotify; want_inotify=${withval}
12007
12005
else
12008
12006
want_inotify=${have_inotify}
12009
@@ -19311,236 +16944,17 @@
12007
@@ -19310,236 +16943,17 @@
12010
12008
12011
12009
if test "x$want_inotify" = "xyes" ; then
12012
12010
if test "x$have_inotify" = "xyes"; then
12249
12247
have_kqueue="yes"
12250
12248
else
12251
12249
have_kqueue="no"
12252
@@ -19553,7 +16967,7 @@
12250
@@ -19552,7 +16966,7 @@
12253
12251
12254
12252
12255
12253
# Check whether --with-kqueue was given.
12258
12256
withval=$with_kqueue; want_kqueue=${withval}
12259
12257
else
12260
12258
want_kqueue=${have_kqueue}
12261
@@ -19561,162 +16975,19 @@
12259
@@ -19560,162 +16974,19 @@
12262
12260
12263
12261
if test "x$want_kqueue" = "xyes" ; then
12264
12262
if test "x$have_kqueue" = "xyes"; then
12427
12425
_ACEOF
12428
12426
12429
12427
fi
12430
@@ -19726,13 +16997,9 @@
12428
@@ -19725,13 +16996,9 @@
12431
12429
12432
12430
12433
12431
12443
12441
/* end confdefs.h. */
12444
12442
#include <stdarg.h>
12445
12443
int
12446
@@ -19743,40 +17010,12 @@
12444
@@ -19742,40 +17009,12 @@
12447
12445
return 0;
12448
12446
}
12449
12447
_ACEOF
12487
12485
/* end confdefs.h. */
12488
12486
#include <stdarg.h>
12489
12487
int
12490
@@ -19787,69 +17026,34 @@
12488
@@ -19786,69 +17025,34 @@
12491
12489
return 0;
12492
12490
}
12493
12491
_ACEOF
12569
12567
/* end confdefs.h. */
12570
12568
12571
12569
/* Override any GCC internal prototype to avoid an error.
12572
@@ -19867,66 +17071,34 @@
12570
@@ -19866,66 +17070,34 @@
12573
12571
return 0;
12574
12572
}
12575
12573
_ACEOF
12646
12644
/* end confdefs.h. */
12647
12645
12648
12646
/* Override any GCC internal prototype to avoid an error.
12649
@@ -19944,181 +17116,25 @@
12647
@@ -19943,181 +17115,25 @@
12650
12648
return 0;
12651
12649
}
12652
12650
_ACEOF
12836
12834
libevent_headers_found=yes
12837
12835
else
12838
12836
libevent_headers_found=no
12839
@@ -20132,9 +17148,9 @@
12837
@@ -20131,9 +17147,9 @@
12840
12838
fi
12841
12839
fi
12842
12840
if test "x$libevent_source" = "xbundled"; then
12848
12846
$as_echo "$as_me: WARNING: if you are cross-compiling this is probably NOT what you want." >&2;}
12849
12847
LIBEVENT_CFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
12850
12848
LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/libevent.la"
12851
@@ -20155,7 +17171,7 @@
12849
@@ -20154,7 +17170,7 @@
12852
12850
12853
12851
12854
12852
pkg_failed=no
12857
12855
$as_echo_n "checking for GTK... " >&6; }
12858
12856
12859
12857
if test -n "$PKG_CONFIG"; then
12860
@@ -20163,17 +17179,17 @@
12858
@@ -20162,17 +17178,17 @@
12861
12859
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
12862
12860
else
12863
12861
if test -n "$PKG_CONFIG" && \
12879
12877
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_MINIMUM
12880
12878
glib-2.0 >= $GLIB_MINIMUM
12881
12879
gmodule-2.0 >= $GLIB_MINIMUM
12882
@@ -20190,17 +17206,17 @@
12880
@@ -20189,17 +17205,17 @@
12883
12881
pkg_cv_GTK_LIBS="$GTK_LIBS"
12884
12882
else
12885
12883
if test -n "$PKG_CONFIG" && \
12901
12899
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_MINIMUM
12902
12900
glib-2.0 >= $GLIB_MINIMUM
12903
12901
gmodule-2.0 >= $GLIB_MINIMUM
12904
@@ -20236,7 +17252,7 @@
12902
@@ -20235,7 +17251,7 @@
12905
12903
# Put the nasty error message in config.log where it belongs
12906
12904
echo "$GTK_PKG_ERRORS" >&5
12907
12905
12910
12908
$as_echo "no" >&6; }
12911
12909
have_gtk=no
12912
12910
elif test $pkg_failed = untried; then
12913
@@ -20244,12 +17260,12 @@
12911
@@ -20243,12 +17259,12 @@
12914
12912
else
12915
12913
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
12916
12914
GTK_LIBS=$pkg_cv_GTK_LIBS
12925
12923
enableval=$enable_gtk; want_gtk=${enableval}
12926
12924
else
12927
12925
want_gtk=${have_gtk}
12928
@@ -20266,9 +17282,7 @@
12926
@@ -20265,9 +17281,7 @@
12929
12927
if test "x$have_gtk" = "xyes"; then
12930
12928
build_gtk=yes
12931
12929
else
12936
12934
fi
12937
12935
fi
12938
12936
if test "x$build_gtk" = "xyes"; then
12939
@@ -20284,7 +17298,83 @@
12937
@@ -20283,7 +17297,83 @@
12940
12938
12941
12939
12942
12940
pkg_failed=no
13021
13019
$as_echo_n "checking for GIO... " >&6; }
13022
13020
13023
13021
if test -n "$PKG_CONFIG"; then
13024
@@ -20292,11 +17382,11 @@
13022
@@ -20291,11 +17381,11 @@
13025
13023
pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
13026
13024
else
13027
13025
if test -n "$PKG_CONFIG" && \
13036
13034
pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_MINIMUM" 2>/dev/null`
13037
13035
else
13038
13036
pkg_failed=yes
13039
@@ -20310,11 +17400,11 @@
13037
@@ -20309,11 +17399,11 @@
13040
13038
pkg_cv_GIO_LIBS="$GIO_LIBS"
13041
13039
else
13042
13040
if test -n "$PKG_CONFIG" && \
13051
13049
pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_MINIMUM" 2>/dev/null`
13052
13050
else
13053
13051
pkg_failed=yes
13054
@@ -20341,7 +17431,7 @@
13052
@@ -20340,7 +17430,7 @@
13055
13053
# Put the nasty error message in config.log where it belongs
13056
13054
echo "$GIO_PKG_ERRORS" >&5
13057
13055
13060
13058
$as_echo "no" >&6; }
13061
13059
use_gio=no
13062
13060
elif test $pkg_failed = untried; then
13063
@@ -20349,20 +17439,18 @@
13061
@@ -20348,20 +17438,18 @@
13064
13062
else
13065
13063
GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
13066
13064
GIO_LIBS=$pkg_cv_GIO_LIBS
13084
13082
$as_echo_n "checking for LIBNOTIFY... " >&6; }
13085
13083
13086
13084
if test -n "$PKG_CONFIG"; then
13087
@@ -20370,11 +17458,11 @@
13085
@@ -20369,11 +17457,11 @@
13088
13086
pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
13089
13087
else
13090
13088
if test -n "$PKG_CONFIG" && \
13099
13097
pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_MINIMUM" 2>/dev/null`
13100
13098
else
13101
13099
pkg_failed=yes
13102
@@ -20388,11 +17476,11 @@
13100
@@ -20387,11 +17475,11 @@
13103
13101
pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
13104
13102
else
13105
13103
if test -n "$PKG_CONFIG" && \
13114
13112
pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_MINIMUM" 2>/dev/null`
13115
13113
else
13116
13114
pkg_failed=yes
13117
@@ -20419,7 +17507,7 @@
13115
@@ -20418,7 +17506,7 @@
13118
13116
# Put the nasty error message in config.log where it belongs
13119
13117
echo "$LIBNOTIFY_PKG_ERRORS" >&5
13120
13118
13123
13121
$as_echo "no" >&6; }
13124
13122
have_libnotify=no
13125
13123
elif test $pkg_failed = untried; then
13126
@@ -20427,12 +17515,12 @@
13124
@@ -20426,12 +17514,12 @@
13127
13125
else
13128
13126
LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
13129
13127
LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
13138
13136
enableval=$enable_libnotify;
13139
13137
else
13140
13138
enable_libnotify=yes
13141
@@ -20442,16 +17530,14 @@
13142
if test "x$enable_libnotify" = "xyes" ; then
13143
if test "x$have_libnotify" = "xyes"; then
13139
@@ -20441,9 +17529,7 @@
13140
if test "x$have_libnotify" = "xyes"; then
13141
if test "x$enable_libnotify" = "xyes" ; then
13144
13142
use_libnotify=yes
13145
13143
- cat >>confdefs.h <<\_ACEOF
13146
13144
-#define HAVE_LIBNOTIFY 1
13147
13145
-_ACEOF
13148
13146
+ $as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
13149
13147
13150
fi
13151
fi
13148
else
13149
LIBNOTIFY_CFLAGS=
13150
@@ -20453,7 +17539,7 @@
13152
13151
13153
13152
13154
13153
pkg_failed=no
13157
13156
$as_echo_n "checking for LIBAPPINDICATOR... " >&6; }
13158
13157
13159
13158
if test -n "$PKG_CONFIG"; then
13160
@@ -20459,11 +17545,11 @@
13159
@@ -20461,11 +17547,11 @@
13161
13160
pkg_cv_LIBAPPINDICATOR_CFLAGS="$LIBAPPINDICATOR_CFLAGS"
13162
13161
else
13163
13162
if test -n "$PKG_CONFIG" && \
13172
13171
pkg_cv_LIBAPPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 >= $LIBAPPINDICATOR_MINIMUM" 2>/dev/null`
13173
13172
else
13174
13173
pkg_failed=yes
13175
@@ -20477,11 +17563,11 @@
13174
@@ -20479,11 +17565,11 @@
13176
13175
pkg_cv_LIBAPPINDICATOR_LIBS="$LIBAPPINDICATOR_LIBS"
13177
13176
else
13178
13177
if test -n "$PKG_CONFIG" && \
13187
13186
pkg_cv_LIBAPPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 >= $LIBAPPINDICATOR_MINIMUM" 2>/dev/null`
13188
13187
else
13189
13188
pkg_failed=yes
13190
@@ -20508,7 +17594,7 @@
13189
@@ -20510,7 +17596,7 @@
13191
13190
# Put the nasty error message in config.log where it belongs
13192
13191
echo "$LIBAPPINDICATOR_PKG_ERRORS" >&5
13193
13192
13196
13195
$as_echo "no" >&6; }
13197
13196
have_libappindicator=no
13198
13197
elif test $pkg_failed = untried; then
13199
@@ -20516,13 +17602,13 @@
13198
@@ -20518,13 +17604,13 @@
13200
13199
else
13201
13200
LIBAPPINDICATOR_CFLAGS=$pkg_cv_LIBAPPINDICATOR_CFLAGS
13202
13201
LIBAPPINDICATOR_LIBS=$pkg_cv_LIBAPPINDICATOR_LIBS
13212
13211
enableval=$enable_libappindicator;
13213
13212
else
13214
13213
enable_libappindicator=yes
13215
@@ -20534,16 +17620,14 @@
13214
@@ -20534,9 +17620,7 @@
13215
if test "x$have_libappindicator" = "xyes"; then
13216
if test "x$enable_libappindicator" = "xyes" ; then
13216
13217
use_libappindicator=yes
13217
13218
13219
13218
- cat >>confdefs.h <<\_ACEOF
13220
13219
-#define HAVE_LIBAPPINDICATOR 1
13221
13220
-_ACEOF
13222
13221
+ $as_echo "#define HAVE_LIBAPPINDICATOR 1" >>confdefs.h
13223
13222
13224
fi
13225
fi
13223
else
13224
LIBAPPINDICATOR_CFLAGS=
13225
@@ -20546,7 +17630,7 @@
13226
13226
13227
13227
13228
13228
pkg_failed=no
13231
13231
$as_echo_n "checking for LIBCANBERRA... " >&6; }
13232
13232
13233
13233
if test -n "$PKG_CONFIG"; then
13234
@@ -20551,11 +17635,11 @@
13234
@@ -20554,11 +17638,11 @@
13235
13235
pkg_cv_LIBCANBERRA_CFLAGS="$LIBCANBERRA_CFLAGS"
13236
13236
else
13237
13237
if test -n "$PKG_CONFIG" && \
13246
13246
pkg_cv_LIBCANBERRA_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $CANBERRA_MINIMUM" 2>/dev/null`
13247
13247
else
13248
13248
pkg_failed=yes
13249
@@ -20569,11 +17653,11 @@
13249
@@ -20572,11 +17656,11 @@
13250
13250
pkg_cv_LIBCANBERRA_LIBS="$LIBCANBERRA_LIBS"
13251
13251
else
13252
13252
if test -n "$PKG_CONFIG" && \
13261
13261
pkg_cv_LIBCANBERRA_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $CANBERRA_MINIMUM" 2>/dev/null`
13262
13262
else
13263
13263
pkg_failed=yes
13264
@@ -20600,7 +17684,7 @@
13264
@@ -20603,7 +17687,7 @@
13265
13265
# Put the nasty error message in config.log where it belongs
13266
13266
echo "$LIBCANBERRA_PKG_ERRORS" >&5
13267
13267
13270
13270
$as_echo "no" >&6; }
13271
13271
have_libcanberra=no
13272
13272
elif test $pkg_failed = untried; then
13273
@@ -20608,12 +17692,12 @@
13273
@@ -20611,12 +17695,12 @@
13274
13274
else
13275
13275
LIBCANBERRA_CFLAGS=$pkg_cv_LIBCANBERRA_CFLAGS
13276
13276
LIBCANBERRA_LIBS=$pkg_cv_LIBCANBERRA_LIBS
13285
13285
enableval=$enable_libcanberra;
13286
13286
else
13287
13287
enable_libcanberra=yes
13288
@@ -20622,16 +17706,14 @@
13289
if test "x$enable_libcanberra" = "xyes" ; then
13290
if test "x$have_libcanberra" = "xyes"; then
13288
@@ -20625,9 +17709,7 @@
13289
if test "x$have_libcanberra" = "xyes"; then
13290
if test "x$enable_libcanberra" = "xyes" ; then
13291
13291
use_canberra=yes
13292
13292
- cat >>confdefs.h <<\_ACEOF
13293
13293
-#define HAVE_LIBCANBERRA 1
13294
13294
-_ACEOF
13295
13295
+ $as_echo "#define HAVE_LIBCANBERRA 1" >>confdefs.h
13296
13296
13297
fi
13298
fi
13297
else
13298
LIBCANBERRA_CFLAGS=
13299
@@ -20637,7 +17719,7 @@
13299
13300
13300
13301
13301
13302
pkg_failed=no
13302
-{ $as_echo "$as_me:$LINENO: checking for LIBGCONF" >&5
13303
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCONF" >&5
13304
$as_echo_n "checking for LIBGCONF... " >&6; }
13303
-{ $as_echo "$as_me:$LINENO: checking for GCONF2" >&5
13304
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF2" >&5
13305
$as_echo_n "checking for GCONF2... " >&6; }
13305
13306
13306
13307
if test -n "$PKG_CONFIG"; then
13307
@@ -20639,11 +17721,11 @@
13308
pkg_cv_LIBGCONF_CFLAGS="$LIBGCONF_CFLAGS"
13309
else
13310
if test -n "$PKG_CONFIG" && \
13311
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\"") >&5
13312
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\""; } >&5
13313
($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF2_MINIMUM") 2>&5
13314
ac_status=$?
13315
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13316
- (exit $ac_status); }; then
13317
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13318
+ test $ac_status = 0; }; then
13319
pkg_cv_LIBGCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF2_MINIMUM" 2>/dev/null`
13320
else
13321
pkg_failed=yes
13322
@@ -20657,11 +17739,11 @@
13323
pkg_cv_LIBGCONF_LIBS="$LIBGCONF_LIBS"
13324
else
13325
if test -n "$PKG_CONFIG" && \
13326
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\"") >&5
13327
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\""; } >&5
13328
($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF2_MINIMUM") 2>&5
13329
ac_status=$?
13330
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13331
- (exit $ac_status); }; then
13332
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13333
+ test $ac_status = 0; }; then
13334
pkg_cv_LIBGCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF2_MINIMUM" 2>/dev/null`
13335
else
13336
pkg_failed=yes
13337
@@ -20688,7 +17770,7 @@
13308
@@ -20645,11 +17727,11 @@
13309
pkg_cv_GCONF2_CFLAGS="$GCONF2_CFLAGS"
13310
else
13311
if test -n "$PKG_CONFIG" && \
13312
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\"") >&5
13313
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\""; } >&5
13314
($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF2_MINIMUM") 2>&5
13315
ac_status=$?
13316
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13317
- (exit $ac_status); }; then
13318
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13319
+ test $ac_status = 0; }; then
13320
pkg_cv_GCONF2_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF2_MINIMUM" 2>/dev/null`
13321
else
13322
pkg_failed=yes
13323
@@ -20663,11 +17745,11 @@
13324
pkg_cv_GCONF2_LIBS="$GCONF2_LIBS"
13325
else
13326
if test -n "$PKG_CONFIG" && \
13327
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\"") >&5
13328
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF2_MINIMUM\""; } >&5
13329
($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF2_MINIMUM") 2>&5
13330
ac_status=$?
13331
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13332
- (exit $ac_status); }; then
13333
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13334
+ test $ac_status = 0; }; then
13335
pkg_cv_GCONF2_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF2_MINIMUM" 2>/dev/null`
13336
else
13337
pkg_failed=yes
13338
@@ -20694,7 +17776,7 @@
13338
13339
# Put the nasty error message in config.log where it belongs
13339
echo "$LIBGCONF_PKG_ERRORS" >&5
13340
echo "$GCONF2_PKG_ERRORS" >&5
13340
13341
13341
13342
- { $as_echo "$as_me:$LINENO: result: no" >&5
13342
13343
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13343
13344
$as_echo "no" >&6; }
13344
have_libgconf=no
13345
have_gconf2=no
13345
13346
elif test $pkg_failed = untried; then
13346
@@ -20696,12 +17778,12 @@
13347
@@ -20702,12 +17784,12 @@
13347
13348
else
13348
LIBGCONF_CFLAGS=$pkg_cv_LIBGCONF_CFLAGS
13349
LIBGCONF_LIBS=$pkg_cv_LIBGCONF_LIBS
13349
GCONF2_CFLAGS=$pkg_cv_GCONF2_CFLAGS
13350
GCONF2_LIBS=$pkg_cv_GCONF2_LIBS
13350
13351
- { $as_echo "$as_me:$LINENO: result: yes" >&5
13351
13352
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13352
13353
$as_echo "yes" >&6; }
13353
have_libgconf=yes
13354
have_gconf2=yes
13354
13355
fi
13355
13356
# Check whether --enable-gconf2 was given.
13356
13357
-if test "${enable_gconf2+set}" = set; then
13357
13358
+if test "${enable_gconf2+set}" = set; then :
13358
13359
enableval=$enable_gconf2;
13359
13360
else
13360
enable_libgconf=yes
13361
@@ -20710,16 +17792,14 @@
13362
if test "x$enable_libgconf" = "xyes" ; then
13363
if test "x$have_libgconf" = "xyes"; then
13364
use_libgconf=yes
13361
enable_gconf2=yes
13362
@@ -20716,9 +17798,7 @@
13363
if test "x$have_gconf2" = "xyes" ; then
13364
if test "x$enable_gconf2" = "xyes"; then
13365
use_gconf2=yes
13365
13366
- cat >>confdefs.h <<\_ACEOF
13366
-#define HAVE_LIBGCONF 1
13367
-#define HAVE_GCONF2 1
13367
13368
-_ACEOF
13368
+ $as_echo "#define HAVE_LIBGCONF 1" >>confdefs.h
13369
+ $as_echo "#define HAVE_GCONF2 1" >>confdefs.h
13369
13370
13370
fi
13371
fi
13371
else
13372
GCONF2_CFLAGS=
13373
@@ -20728,7 +17808,7 @@
13372
13374
13373
13375
13374
13376
pkg_failed=no
13377
13379
$as_echo_n "checking for DBUS_GLIB... " >&6; }
13378
13380
13379
13381
if test -n "$PKG_CONFIG"; then
13380
@@ -20727,11 +17807,11 @@
13382
@@ -20736,11 +17816,11 @@
13381
13383
pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS"
13382
13384
else
13383
13385
if test -n "$PKG_CONFIG" && \
13392
13394
pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_MINIMUM" 2>/dev/null`
13393
13395
else
13394
13396
pkg_failed=yes
13395
@@ -20745,11 +17825,11 @@
13397
@@ -20754,11 +17834,11 @@
13396
13398
pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS"
13397
13399
else
13398
13400
if test -n "$PKG_CONFIG" && \
13407
13409
pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_MINIMUM" 2>/dev/null`
13408
13410
else
13409
13411
pkg_failed=yes
13410
@@ -20776,7 +17856,7 @@
13412
@@ -20785,7 +17865,7 @@
13411
13413
# Put the nasty error message in config.log where it belongs
13412
13414
echo "$DBUS_GLIB_PKG_ERRORS" >&5
13413
13415
13416
13418
$as_echo "no" >&6; }
13417
13419
use_dbus_glib=no
13418
13420
elif test $pkg_failed = untried; then
13419
@@ -20784,22 +17864,20 @@
13421
@@ -20793,22 +17873,20 @@
13420
13422
else
13421
13423
DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
13422
13424
DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
13443
13445
$as_echo_n "(cached) " >&6
13444
13446
else
13445
13447
case $DBUS_BINDING_TOOL in
13446
@@ -20812,14 +17890,14 @@
13448
@@ -20821,14 +17899,14 @@
13447
13449
do
13448
13450
IFS=$as_save_IFS
13449
13451
test -z "$as_dir" && as_dir=.
13461
13463
IFS=$as_save_IFS
13462
13464
13463
13465
test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no"
13464
@@ -20828,16 +17906,16 @@
13466
@@ -20837,16 +17915,16 @@
13465
13467
fi
13466
13468
DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL
13467
13469
if test -n "$DBUS_BINDING_TOOL"; then
13481
13483
$as_echo "$as_me: WARNING: Cannot find dbus-binding-tool" >&2;}
13482
13484
use_dbus_glib="no (dbus-binding-tool not found)"
13483
13485
fi
13484
@@ -20845,7 +17923,7 @@
13486
@@ -20854,7 +17932,7 @@
13485
13487
fi
13486
13488
13487
13489
# Check whether --enable-nls was given.
13490
13492
enableval=$enable_nls;
13491
13493
else
13492
13494
enable_nls=yes
13493
@@ -20853,9 +17931,7 @@
13495
@@ -20862,9 +17940,7 @@
13494
13496
13495
13497
13496
13498
if test "x$build_gtk" = "xyes" -a "x$enable_nls" = "xno" ; then
13501
13503
fi
13502
13504
13503
13505
13504
@@ -20863,16 +17939,16 @@
13506
@@ -20872,16 +17948,16 @@
13505
13507
if test "x$enable_nls" = "xyes" ; then
13506
13508
use_nls=yes
13507
13509
13521
13523
$as_echo "$USE_NLS" >&6; }
13522
13524
13523
13525
13524
@@ -20880,35 +17956,31 @@
13526
@@ -20889,35 +17965,31 @@
13525
13527
13526
13528
case "$am__api_version" in
13527
13529
1.01234)
13563
13565
$as_echo_n "(cached) " >&6
13564
13566
else
13565
13567
case $INTLTOOL_UPDATE in
13566
@@ -20921,14 +17993,14 @@
13568
@@ -20930,14 +18002,14 @@
13567
13569
do
13568
13570
IFS=$as_save_IFS
13569
13571
test -z "$as_dir" && as_dir=.
13581
13583
IFS=$as_save_IFS
13582
13584
13583
13585
;;
13584
@@ -20936,19 +18008,19 @@
13586
@@ -20945,19 +18017,19 @@
13585
13587
fi
13586
13588
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
13587
13589
if test -n "$INTLTOOL_UPDATE"; then
13605
13607
$as_echo_n "(cached) " >&6
13606
13608
else
13607
13609
case $INTLTOOL_MERGE in
13608
@@ -20961,14 +18033,14 @@
13610
@@ -20970,14 +18042,14 @@
13609
13611
do
13610
13612
IFS=$as_save_IFS
13611
13613
test -z "$as_dir" && as_dir=.
13623
13625
IFS=$as_save_IFS
13624
13626
13625
13627
;;
13626
@@ -20976,19 +18048,19 @@
13628
@@ -20985,19 +18057,19 @@
13627
13629
fi
13628
13630
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
13629
13631
if test -n "$INTLTOOL_MERGE"; then
13647
13649
$as_echo_n "(cached) " >&6
13648
13650
else
13649
13651
case $INTLTOOL_EXTRACT in
13650
@@ -21001,14 +18073,14 @@
13652
@@ -21010,14 +18082,14 @@
13651
13653
do
13652
13654
IFS=$as_save_IFS
13653
13655
test -z "$as_dir" && as_dir=.
13665
13667
IFS=$as_save_IFS
13666
13668
13667
13669
;;
13668
@@ -21016,18 +18088,16 @@
13670
@@ -21025,18 +18097,16 @@
13669
13671
fi
13670
13672
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
13671
13673
if test -n "$INTLTOOL_EXTRACT"; then
13687
13689
fi
13688
13690
13689
13691
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
13690
@@ -21149,9 +18219,9 @@
13692
@@ -21158,9 +18228,9 @@
13691
13693
# Check the gettext tools to make sure they are GNU
13692
13694
# Extract the first word of "xgettext", so it can be a program name with args.
13693
13695
set dummy xgettext; ac_word=$2
13699
13701
$as_echo_n "(cached) " >&6
13700
13702
else
13701
13703
case $XGETTEXT in
13702
@@ -21164,14 +18234,14 @@
13704
@@ -21173,14 +18243,14 @@
13703
13705
do
13704
13706
IFS=$as_save_IFS
13705
13707
test -z "$as_dir" && as_dir=.
13717
13719
IFS=$as_save_IFS
13718
13720
13719
13721
;;
13720
@@ -21179,19 +18249,19 @@
13722
@@ -21188,19 +18258,19 @@
13721
13723
fi
13722
13724
XGETTEXT=$ac_cv_path_XGETTEXT
13723
13725
if test -n "$XGETTEXT"; then
13741
13743
$as_echo_n "(cached) " >&6
13742
13744
else
13743
13745
case $MSGMERGE in
13744
@@ -21204,14 +18274,14 @@
13746
@@ -21213,14 +18283,14 @@
13745
13747
do
13746
13748
IFS=$as_save_IFS
13747
13749
test -z "$as_dir" && as_dir=.
13759
13761
IFS=$as_save_IFS
13760
13762
13761
13763
;;
13762
@@ -21219,19 +18289,19 @@
13764
@@ -21228,19 +18298,19 @@
13763
13765
fi
13764
13766
MSGMERGE=$ac_cv_path_MSGMERGE
13765
13767
if test -n "$MSGMERGE"; then
13783
13785
$as_echo_n "(cached) " >&6
13784
13786
else
13785
13787
case $MSGFMT in
13786
@@ -21244,14 +18314,14 @@
13788
@@ -21253,14 +18323,14 @@
13787
13789
do
13788
13790
IFS=$as_save_IFS
13789
13791
test -z "$as_dir" && as_dir=.
13801
13803
IFS=$as_save_IFS
13802
13804
13803
13805
;;
13804
@@ -21259,19 +18329,19 @@
13806
@@ -21268,19 +18338,19 @@
13805
13807
fi
13806
13808
MSGFMT=$ac_cv_path_MSGFMT
13807
13809
if test -n "$MSGFMT"; then
13825
13827
$as_echo_n "(cached) " >&6
13826
13828
else
13827
13829
case $GMSGFMT in
13828
@@ -21284,803 +18354,236 @@
13830
@@ -21293,803 +18363,236 @@
13829
13831
do
13830
13832
IFS=$as_save_IFS
13831
13833
test -z "$as_dir" && as_dir=.
14790
14792
/* end confdefs.h. */
14791
14793
14792
14794
#include <libintl.h>
14793
@@ -22093,54 +18596,25 @@
14795
@@ -22102,54 +18605,25 @@
14794
14796
return 0;
14795
14797
}
14796
14798
_ACEOF
14853
14855
/* end confdefs.h. */
14854
14856
14855
14857
#include <libintl.h>
14856
@@ -22153,141 +18627,26 @@
14858
@@ -22162,141 +18636,26 @@
14857
14859
return 0;
14858
14860
}
14859
14861
_ACEOF
15005
15007
_ACEOF
15006
15008
15007
15009
fi
15008
@@ -22302,18 +18661,14 @@
15010
@@ -22311,18 +18670,14 @@
15009
15011
|| test "$gt_cv_func_ngettext_libc" != "yes" \
15010
15012
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
15011
15013
15027
15029
/* end confdefs.h. */
15028
15030
15029
15031
/* Override any GCC internal prototype to avoid an error.
15030
@@ -22331,55 +18686,26 @@
15032
@@ -22340,55 +18695,26 @@
15031
15033
return 0;
15032
15034
}
15033
15035
_ACEOF
15092
15094
/* end confdefs.h. */
15093
15095
15094
15096
/* Override any GCC internal prototype to avoid an error.
15095
@@ -22397,55 +18723,26 @@
15097
@@ -22406,55 +18732,26 @@
15096
15098
return 0;
15097
15099
}
15098
15100
_ACEOF
15157
15159
/* end confdefs.h. */
15158
15160
15159
15161
/* Override any GCC internal prototype to avoid an error.
15160
@@ -22463,43 +18760,18 @@
15162
@@ -22472,43 +18769,18 @@
15161
15163
return 0;
15162
15164
}
15163
15165
_ACEOF
15207
15209
gt_cv_func_dgettext_libintl=yes
15208
15210
fi
15209
15211
15210
@@ -22509,22 +18781,18 @@
15212
@@ -22518,22 +18790,18 @@
15211
15213
15212
15214
15213
15215
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
15235
15237
/* end confdefs.h. */
15236
15238
15237
15239
/* Override any GCC internal prototype to avoid an error.
15238
@@ -22542,55 +18810,26 @@
15240
@@ -22551,55 +18819,26 @@
15239
15241
return 0;
15240
15242
}
15241
15243
_ACEOF
15300
15302
/* end confdefs.h. */
15301
15303
15302
15304
/* Override any GCC internal prototype to avoid an error.
15303
@@ -22608,43 +18847,18 @@
15305
@@ -22617,43 +18856,18 @@
15304
15306
return 0;
15305
15307
}
15306
15308
_ACEOF
15350
15352
gt_cv_func_dgettext_libintl=yes
15351
15353
libintl_extra_libs=-liconv
15352
15354
else
15353
@@ -22666,102 +18880,12 @@
15355
@@ -22675,102 +18889,12 @@
15354
15356
glib_save_LIBS="$LIBS"
15355
15357
LIBS="$LIBS -lintl $libintl_extra_libs"
15356
15358
unset ac_cv_func_bind_textdomain_codeset
15458
15460
_ACEOF
15459
15461
15460
15462
fi
15461
@@ -22791,15 +18915,13 @@
15463
@@ -22800,15 +18924,13 @@
15462
15464
15463
15465
if test "$gt_cv_have_gettext" = "yes"; then
15464
15466
15477
15479
$as_echo_n "(cached) " >&6
15478
15480
else
15479
15481
case "$MSGFMT" in
15480
@@ -22824,111 +18946,21 @@
15482
@@ -22833,111 +18955,21 @@
15481
15483
fi
15482
15484
MSGFMT="$ac_cv_path_MSGFMT"
15483
15485
if test "$MSGFMT" != "no"; then
15596
15598
_ACEOF
15597
15599
15598
15600
fi
15599
@@ -22936,9 +18968,9 @@
15601
@@ -22945,9 +18977,9 @@
15600
15602
15601
15603
# Extract the first word of "gmsgfmt", so it can be a program name with args.
15602
15604
set dummy gmsgfmt; ac_word=$2
15608
15610
$as_echo_n "(cached) " >&6
15609
15611
else
15610
15612
case $GMSGFMT in
15611
@@ -22951,14 +18983,14 @@
15613
@@ -22960,14 +18992,14 @@
15612
15614
do
15613
15615
IFS=$as_save_IFS
15614
15616
test -z "$as_dir" && as_dir=.
15626
15628
IFS=$as_save_IFS
15627
15629
15628
15630
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
15629
@@ -22967,19 +18999,19 @@
15631
@@ -22976,19 +19008,19 @@
15630
15632
fi
15631
15633
GMSGFMT=$ac_cv_path_GMSGFMT
15632
15634
if test -n "$GMSGFMT"; then
15650
15652
$as_echo_n "(cached) " >&6
15651
15653
else
15652
15654
case "$XGETTEXT" in
15653
@@ -23004,18 +19036,14 @@
15655
@@ -23013,18 +19045,14 @@
15654
15656
fi
15655
15657
XGETTEXT="$ac_cv_path_XGETTEXT"
15656
15658
if test "$XGETTEXT" != ":"; then
15672
15674
/* end confdefs.h. */
15673
15675
15674
15676
int
15675
@@ -23027,121 +19055,14 @@
15677
@@ -23036,121 +19064,14 @@
15676
15678
return 0;
15677
15679
}
15678
15680
_ACEOF
15798
15800
CATOBJEXT=.gmo
15799
15801
DATADIRNAME=share
15800
15802
else
15801
@@ -23156,10 +19077,8 @@
15803
@@ -23165,10 +19086,8 @@
15802
15804
;;
15803
15805
esac
15804
15806
fi
15811
15813
LIBS="$glib_save_LIBS"
15812
15814
INSTOBJEXT=.mo
15813
15815
else
15814
@@ -23173,9 +19092,7 @@
15816
@@ -23182,9 +19101,7 @@
15815
15817
15816
15818
if test "$gt_cv_have_gettext" = "yes" ; then
15817
15819
15822
15824
15823
15825
fi
15824
15826
15825
@@ -23183,7 +19100,7 @@
15827
@@ -23192,7 +19109,7 @@
15826
15828
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
15827
15829
: ;
15828
15830
else
15831
15833
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
15832
15834
XGETTEXT=":"
15833
15835
fi
15834
@@ -23216,7 +19133,7 @@
15836
@@ -23225,7 +19142,7 @@
15835
15837
if test "x$ALL_LINGUAS" = "x"; then
15836
15838
LINGUAS=
15837
15839
else
15840
15842
$as_echo_n "checking for catalogs to be installed... " >&6; }
15841
15843
NEW_LINGUAS=
15842
15844
for presentlang in $ALL_LINGUAS; do
15843
@@ -23241,7 +19158,7 @@
15845
@@ -23250,7 +19167,7 @@
15844
15846
fi
15845
15847
done
15846
15848
LINGUAS=$NEW_LINGUAS
15849
15851
$as_echo "$LINGUAS" >&6; }
15850
15852
fi
15851
15853
15852
@@ -23280,42 +19197,6 @@
15854
@@ -23289,42 +19206,6 @@
15853
15855
15854
15856
15855
15857
15892
15894
15893
15895
have_darwin="no"
15894
15896
have_msw="no"
15895
@@ -23335,9 +19216,9 @@
15897
@@ -23344,9 +19225,9 @@
15896
15898
if test -n "$ac_tool_prefix"; then
15897
15899
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
15898
15900
set dummy ${ac_tool_prefix}windres; ac_word=$2
15904
15906
$as_echo_n "(cached) " >&6
15905
15907
else
15906
15908
if test -n "$WINDRES"; then
15907
@@ -23348,24 +19229,24 @@
15909
@@ -23357,24 +19238,24 @@
15908
15910
do
15909
15911
IFS=$as_save_IFS
15910
15912
test -z "$as_dir" && as_dir=.
15934
15936
$as_echo "no" >&6; }
15935
15937
fi
15936
15938
15937
@@ -23375,9 +19256,9 @@
15939
@@ -23384,9 +19265,9 @@
15938
15940
ac_ct_WINDRES=$WINDRES
15939
15941
# Extract the first word of "windres", so it can be a program name with args.
15940
15942
set dummy windres; ac_word=$2
15946
15948
$as_echo_n "(cached) " >&6
15947
15949
else
15948
15950
if test -n "$ac_ct_WINDRES"; then
15949
@@ -23388,24 +19269,24 @@
15951
@@ -23397,24 +19278,24 @@
15950
15952
do
15951
15953
IFS=$as_save_IFS
15952
15954
test -z "$as_dir" && as_dir=.
15976
15978
$as_echo "no" >&6; }
15977
15979
fi
15978
15980
15979
@@ -23414,7 +19295,7 @@
15981
@@ -23423,7 +19304,7 @@
15980
15982
else
15981
15983
case $cross_compiling:$ac_tool_warned in
15982
15984
yes:)
15985
15987
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15986
15988
ac_tool_warned=yes ;;
15987
15989
esac
15988
@@ -23434,7 +19315,7 @@
15990
@@ -23443,7 +19324,7 @@
15989
15991
esac
15990
15992
15991
15993
# Check whether --enable-cli was given.
15994
15996
enableval=$enable_cli; build_cli=${enableval}
15995
15997
else
15996
15998
build_cli="yes"
15997
@@ -23450,7 +19331,7 @@
15999
@@ -23459,7 +19340,7 @@
15998
16000
15999
16001
16000
16002
# Check whether --enable-mac was given.
16003
16005
enableval=$enable_mac; build_mac=${enableval}
16004
16006
else
16005
16007
build_mac=${have_darwin}
16006
@@ -23466,7 +19347,7 @@
16008
@@ -23475,7 +19356,7 @@
16007
16009
16008
16010
16009
16011
# Check whether --enable-daemon was given.
16012
16014
enableval=$enable_daemon; build_daemon=${enableval}
16013
16015
else
16014
16016
build_daemon="yes"
16015
@@ -23498,15 +19379,11 @@
16017
@@ -23507,15 +19388,11 @@
16016
16018
fi
16017
16019
fi
16018
16020
if test "x$have_darwin" = "xyes"; then
16030
16032
16031
16033
fi
16032
16034
if test "x$have_msw" = "xyes"; then
16033
@@ -23550,13 +19427,13 @@
16035
@@ -23559,13 +19436,13 @@
16034
16036
case $ac_val in #(
16035
16037
*${as_nl}*)
16036
16038
case $ac_var in #(
16046
16048
esac ;;
16047
16049
esac
16048
16050
done
16049
@@ -23564,8 +19441,8 @@
16051
@@ -23573,8 +19450,8 @@
16050
16052
(set) 2>&1 |
16051
16053
case $as_nl`(ac_space=' '; set) 2>&1` in #(
16052
16054
*${as_nl}ac_space=\ *)
16057
16059
sed -n \
16058
16060
"s/'/'\\\\''/g;
16059
16061
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
16060
@@ -23588,11 +19465,11 @@
16062
@@ -23597,11 +19474,11 @@
16061
16063
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
16062
16064
if test -w "$cache_file"; then
16063
16065
test "x$cache_file" != "x/dev/null" &&
16071
16073
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
16072
16074
fi
16073
16075
fi
16074
@@ -23648,8 +19525,8 @@
16076
@@ -23657,8 +19534,8 @@
16075
16077
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
16076
16078
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
16077
16079
# will be set to the directory where LIBOBJS objects are built.
16082
16084
done
16083
16085
LIBOBJS=$ac_libobjs
16084
16086
16085
@@ -23665,94 +19542,62 @@
16087
@@ -23674,94 +19551,62 @@
16086
16088
fi
16087
16089
16088
16090
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
16202
16204
#! $SHELL
16203
16205
# Generated by $as_me.
16204
16206
# Run this file to recreate the current configuration.
16205
@@ -23762,17 +19607,18 @@
16207
@@ -23771,17 +19616,18 @@
16206
16208
debug=false
16207
16209
ac_cs_recheck=false
16208
16210
ac_cs_silent=false
16228
16230
emulate sh
16229
16231
NULLCMD=:
16230
16232
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
16231
@@ -23780,23 +19626,15 @@
16233
@@ -23789,23 +19635,15 @@
16232
16234
alias -g '${1+"$@"}'='"$@"'
16233
16235
setopt NO_GLOB_SUBST
16234
16236
else
16257
16259
as_nl='
16258
16260
'
16259
16261
export as_nl
16260
@@ -23804,7 +19642,13 @@
16262
@@ -23813,7 +19651,13 @@
16261
16263
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
16262
16264
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
16263
16265
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
16272
16274
as_echo='printf %s\n'
16273
16275
as_echo_n='printf %s'
16274
16276
else
16275
@@ -23815,7 +19659,7 @@
16277
@@ -23824,7 +19668,7 @@
16276
16278
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
16277
16279
as_echo_n_body='eval
16278
16280
arg=$1;
16281
16283
*"$as_nl"*)
16282
16284
expr "X$arg" : "X\\(.*\\)$as_nl";
16283
16285
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
16284
@@ -23838,13 +19682,6 @@
16286
@@ -23847,13 +19691,6 @@
16285
16287
}
16286
16288
fi
16287
16289
16295
16297
16296
16298
# IFS
16297
16299
# We need space, tab and new line, in precisely that order. Quoting is
16298
@@ -23854,15 +19691,15 @@
16300
@@ -23863,15 +19700,15 @@
16299
16301
IFS=" "" $as_nl"
16300
16302
16301
16303
# Find who we are. Look in the path if we contain no directory separator.
16314
16316
IFS=$as_save_IFS
16315
16317
16316
16318
;;
16317
@@ -23874,12 +19711,16 @@
16319
@@ -23883,12 +19720,16 @@
16318
16320
fi
16319
16321
if test ! -f "$as_myself"; then
16320
16322
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
16335
16337
done
16336
16338
PS1='$ '
16337
16339
PS2='> '
16338
@@ -23891,7 +19732,89 @@
16340
@@ -23900,7 +19741,89 @@
16339
16341
LANGUAGE=C
16340
16342
export LANGUAGE
16341
16343
16426
16428
if expr a : '\(a\)' >/dev/null 2>&1 &&
16427
16429
test "X`expr 00001 : '.*\(...\)'`" = X001; then
16428
16430
as_expr=expr
16429
@@ -23905,97 +19828,50 @@
16431
@@ -23914,97 +19837,50 @@
16430
16432
as_basename=false
16431
16433
fi
16432
16434
16552
16554
16553
16555
rm -f conf$$ conf$$.exe conf$$.file
16554
16556
if test -d conf$$.dir; then
16555
@@ -24024,8 +19900,56 @@
16557
@@ -24033,8 +19909,56 @@
16556
16558
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
16557
16559
rmdir conf$$.dir 2>/dev/null
16558
16560
16610
16612
else
16611
16613
test -d ./-p && rmdir ./-p
16612
16614
as_mkdir_p=false
16613
@@ -24044,10 +19968,10 @@
16615
@@ -24053,10 +19977,10 @@
16614
16616
if test -d "$1"; then
16615
16617
test -d "$1/.";
16616
16618
else
16623
16625
???[sx]*):;;*)false;;esac;fi
16624
16626
'\'' sh
16625
16627
'
16626
@@ -24062,13 +19986,19 @@
16628
@@ -24071,13 +19995,19 @@
16627
16629
16628
16630
16629
16631
exec 6>&1
16639
16641
# report actual input values of CONFIG_FILES etc. instead of their
16640
16642
# values after options handling.
16641
16643
ac_log="
16642
This file was extended by transmission $as_me 1.92, which was
16644
This file was extended by transmission $as_me 1.93, which was
16643
16645
-generated by GNU Autoconf 2.63. Invocation command line was
16644
16646
+generated by GNU Autoconf 2.65. Invocation command line was
16645
16647
16646
16648
CONFIG_FILES = $CONFIG_FILES
16647
16649
CONFIG_HEADERS = $CONFIG_HEADERS
16648
@@ -24096,13 +20026,15 @@
16650
@@ -24105,13 +20035,15 @@
16649
16651
16650
16652
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16651
16653
ac_cs_usage="\
16664
16666
-q, --quiet, --silent
16665
16667
do not print progress messages
16666
16668
-d, --debug don't remove temporary files
16667
@@ -24116,16 +20048,17 @@
16669
@@ -24125,16 +20057,17 @@
16668
16670
Configuration commands:
16669
16671
$config_commands
16670
16672
16675
16677
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16676
16678
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
16677
16679
ac_cs_version="\\
16678
transmission config.status 1.92
16680
transmission config.status 1.93
16679
16681
-configured by $0, generated by GNU Autoconf 2.63,
16680
16682
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
16681
16683
+configured by $0, generated by GNU Autoconf 2.65,
16686
16688
This config.status script is free software; the Free Software Foundation
16687
16689
gives unlimited permission to copy, distribute and modify it."
16688
16690
16689
@@ -24161,6 +20094,8 @@
16691
@@ -24170,6 +20103,8 @@
16690
16692
ac_cs_recheck=: ;;
16691
16693
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
16692
16694
$as_echo "$ac_cs_version"; exit ;;
16695
16697
--debug | --debu | --deb | --de | --d | -d )
16696
16698
debug=: ;;
16697
16699
--file | --fil | --fi | --f )
16698
@@ -24168,7 +20103,7 @@
16700
@@ -24177,7 +20112,7 @@
16699
16701
case $ac_optarg in
16700
16702
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
16701
16703
esac
16704
16706
ac_need_defaults=false;;
16705
16707
--he | --h | --help | --hel | -h )
16706
16708
$as_echo "$ac_cs_usage"; exit ;;
16707
@@ -24177,11 +20112,10 @@
16709
@@ -24186,11 +20121,10 @@
16708
16710
ac_cs_silent=: ;;
16709
16711
16710
16712
# This is an error.
16719
16721
ac_need_defaults=false ;;
16720
16722
16721
16723
esac
16722
@@ -24611,9 +20545,7 @@
16724
@@ -24620,9 +20554,7 @@
16723
16725
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
16724
16726
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
16725
16727
16730
16732
esac
16731
16733
done
16732
16734
16733
@@ -24639,7 +20571,7 @@
16735
@@ -24648,7 +20580,7 @@
16734
16736
trap 'exit_status=$?
16735
16737
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
16736
16738
' 0
16739
16741
}
16740
16742
# Create a (secure) tmp directory for tmp files.
16741
16743
16742
@@ -24650,11 +20582,7 @@
16744
@@ -24659,11 +20591,7 @@
16743
16745
{
16744
16746
tmp=./conf$$-$RANDOM
16745
16747
(umask 077 && mkdir "$tmp")
16752
16754
16753
16755
# Set up the scripts for CONFIG_FILES section.
16754
16756
# No need to generate them if there are no CONFIG_FILES.
16755
@@ -24662,10 +20590,16 @@
16757
@@ -24671,10 +20599,16 @@
16756
16758
if test -n "$CONFIG_FILES"; then
16757
16759
16758
16760
16771
16773
else
16772
16774
ac_cs_awk_cr=$ac_cr
16773
16775
fi
16774
@@ -24679,24 +20613,18 @@
16776
@@ -24688,24 +20622,18 @@
16775
16777
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
16776
16778
echo "_ACEOF"
16777
16779
} >conf$$subs.sh ||
16799
16801
else
16800
16802
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
16801
16803
fi
16802
@@ -24718,7 +20646,7 @@
16804
@@ -24727,7 +20655,7 @@
16803
16805
t delim
16804
16806
:nl
16805
16807
h
16808
16810
t more1
16809
16811
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
16810
16812
p
16811
@@ -24732,7 +20660,7 @@
16813
@@ -24741,7 +20669,7 @@
16812
16814
t nl
16813
16815
:delim
16814
16816
h
16817
16819
t more2
16818
16820
s/["\\]/\\&/g; s/^/"/; s/$/"/
16819
16821
p
16820
@@ -24785,9 +20713,7 @@
16822
@@ -24794,9 +20722,7 @@
16821
16823
else
16822
16824
cat
16823
16825
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
16828
16830
_ACEOF
16829
16831
16830
16832
# VPATH may cause trouble with some makes, so we remove $(srcdir),
16831
@@ -24818,9 +20744,7 @@
16833
@@ -24827,9 +20753,7 @@
16832
16834
esac
16833
16835
case $ac_mode$ac_tag in
16834
16836
:[FHL]*:*);;
16839
16841
:[FH]-) ac_tag=-:-;;
16840
16842
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
16841
16843
esac
16842
@@ -24848,12 +20772,10 @@
16844
@@ -24857,12 +20781,10 @@
16843
16845
[\\/$]*) false;;
16844
16846
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
16845
16847
esac ||
16854
16856
done
16855
16857
16856
16858
# Let's still pretend it is `configure' which instantiates (i.e., don't
16857
@@ -24864,7 +20786,7 @@
16859
@@ -24873,7 +20795,7 @@
16858
16860
`' by configure.'
16859
16861
if test x"$ac_file" != x-; then
16860
16862
configure_input="$ac_file. $configure_input"
16863
16865
$as_echo "$as_me: creating $ac_file" >&6;}
16864
16866
fi
16865
16867
# Neutralize special characters interpreted by sed in replacement strings.
16866
@@ -24877,9 +20799,7 @@
16868
@@ -24886,9 +20808,7 @@
16867
16869
16868
16870
case $ac_tag in
16869
16871
*:-:* | *:-) cat >"$tmp/stdin" \
16874
16876
esac
16875
16877
;;
16876
16878
esac
16877
@@ -24907,47 +20827,7 @@
16879
@@ -24916,47 +20836,7 @@
16878
16880
q
16879
16881
}
16880
16882
s/.*/./; q'`
16923
16925
ac_builddir=.
16924
16926
16925
16927
case "$ac_dir" in
16926
@@ -25004,7 +20884,6 @@
16928
@@ -25013,7 +20893,6 @@
16927
16929
# If the template does not know about datarootdir, expand it.
16928
16930
# FIXME: This hack should be removed a few years after 2.60.
16929
16931
ac_datarootdir_hack=; ac_datarootdir_seen=
16931
16933
ac_sed_dataroot='
16932
16934
/datarootdir/ {
16933
16935
p
16934
@@ -25014,12 +20893,11 @@
16936
@@ -25023,12 +20902,11 @@
16935
16937
/@docdir@/p
16936
16938
/@infodir@/p
16937
16939
/@localedir@/p
16946
16948
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
16947
16949
_ACEOF
16948
16950
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16949
@@ -25029,7 +20907,7 @@
16951
@@ -25038,7 +20916,7 @@
16950
16952
s&@infodir@&$infodir&g
16951
16953
s&@localedir@&$localedir&g
16952
16954
s&@mandir@&$mandir&g
16955
16957
esac
16956
16958
_ACEOF
16957
16959
16958
@@ -25058,14 +20936,12 @@
16960
@@ -25067,14 +20945,12 @@
16959
16961
$ac_datarootdir_hack
16960
16962
"
16961
16963
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
16972
16974
which seems to be undefined. Please make sure it is defined." >&5
16973
16975
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
16974
16976
which seems to be undefined. Please make sure it is defined." >&2;}
16975
@@ -25075,13 +20951,11 @@
16977
@@ -25084,13 +20960,11 @@
16976
16978
-) cat "$tmp/out" && rm -f "$tmp/out";;
16977
16979
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
16978
16980
esac \
16988
16990
$as_echo "$as_me: executing $ac_file commands" >&6;}
16989
16991
;;
16990
16992
esac
16991
@@ -25176,47 +21050,7 @@
16993
@@ -25185,47 +21059,7 @@
16992
16994
q
16993
16995
}
16994
16996
s/.*/./; q'`
17037
17039
# echo "creating $dirpart/$file"
17038
17040
echo '# dummy' > "$dirpart/$file"
17039
17041
done
17040
@@ -26030,9 +21864,7 @@
17042
@@ -26039,9 +21873,7 @@
17041
17043
esac ;;
17042
17044
"po/stamp-it":C)
17043
17045
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
17048
17050
fi
17049
17051
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
17050
17052
>"po/stamp-it.tmp"
17051
@@ -26055,15 +21887,12 @@
17053
@@ -26064,15 +21896,12 @@
17052
17054
done # for ac_tag
17053
17055
17054
17056
17066
17068
17067
17069
17068
17070
# configure is writing to config.log, and then calls config.status.
17069
@@ -26084,197 +21913,10 @@
17071
@@ -26093,197 +21922,10 @@
17070
17072
exec 5>>config.log
17071
17073
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
17072
17074
# would make configure fail if this is the last instruction.
17266
17268
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
17267
17269
fi
17268
17270
17269
diff -uNr transmission-1.92.pristine/daemon/Makefile.in transmission-1.92/daemon/Makefile.in
17270
--- transmission-1.92.pristine/daemon/Makefile.in 2010-03-12 13:21:40.161736492 +0100
17271
+++ transmission-1.92/daemon/Makefile.in 2010-03-12 13:21:53.989744174 +0100
17271
Index: transmission-1.93/daemon/Makefile.in
17272
===================================================================
17273
--- transmission-1.93.orig/daemon/Makefile.in 2010-05-03 21:56:03.598118012 +0200
17274
+++ transmission-1.93/daemon/Makefile.in 2010-05-03 21:56:48.000000000 +0200
17272
17275
@@ -214,6 +214,8 @@
17273
17276
LIBTOOL = @LIBTOOL@
17274
17277
LIPO = @LIPO@
17294
17297
sysconfdir = @sysconfdir@
17295
17298
target_alias = @target_alias@
17296
17299
top_build_prefix = @top_build_prefix@
17297
diff -uNr transmission-1.92.pristine/doc/Makefile.in transmission-1.92/doc/Makefile.in
17298
--- transmission-1.92.pristine/doc/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17299
+++ transmission-1.92/doc/Makefile.in 2010-03-12 13:21:54.037754678 +0100
17300
Index: transmission-1.93/doc/Makefile.in
17301
===================================================================
17302
--- transmission-1.93.orig/doc/Makefile.in 2010-05-03 21:56:04.950119688 +0200
17303
+++ transmission-1.93/doc/Makefile.in 2010-05-03 21:56:48.000000000 +0200
17300
17304
@@ -141,6 +141,8 @@
17301
17305
LIBTOOL = @LIBTOOL@
17302
17306
LIPO = @LIPO@
17322
17326
sysconfdir = @sysconfdir@
17323
17327
target_alias = @target_alias@
17324
17328
top_build_prefix = @top_build_prefix@
17325
diff -uNr transmission-1.92.pristine/gtk/icons/Makefile.in transmission-1.92/gtk/icons/Makefile.in
17326
--- transmission-1.92.pristine/gtk/icons/Makefile.in 2010-03-12 13:21:40.165736861 +0100
17327
+++ transmission-1.92/gtk/icons/Makefile.in 2010-03-12 13:21:54.169765235 +0100
17328
@@ -143,6 +143,8 @@
17329
LIBTOOL = @LIBTOOL@
17330
LIPO = @LIPO@
17331
LN_S = @LN_S@
17332
+LPI_CFLAGS = @LPI_CFLAGS@
17333
+LPI_LIBS = @LPI_LIBS@
17334
LTLIBOBJS = @LTLIBOBJS@
17335
MAKEINFO = @MAKEINFO@
17336
MKDIR_P = @MKDIR_P@
17337
@@ -163,6 +165,7 @@
17338
PACKAGE_NAME = @PACKAGE_NAME@
17339
PACKAGE_STRING = @PACKAGE_STRING@
17340
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17341
+PACKAGE_URL = @PACKAGE_URL@
17342
PACKAGE_VERSION = @PACKAGE_VERSION@
17343
PATH_SEPARATOR = @PATH_SEPARATOR@
17344
PEERID_PREFIX = @PEERID_PREFIX@
17345
@@ -236,7 +239,6 @@
17346
sbindir = @sbindir@
17347
sharedstatedir = @sharedstatedir@
17348
srcdir = @srcdir@
17349
-subdirs = @subdirs@
17350
sysconfdir = @sysconfdir@
17351
target_alias = @target_alias@
17352
top_build_prefix = @top_build_prefix@
17353
diff -uNr transmission-1.92.pristine/gtk/Makefile.in transmission-1.92/gtk/Makefile.in
17354
--- transmission-1.92.pristine/gtk/Makefile.in 2010-03-12 13:21:40.165736861 +0100
17355
+++ transmission-1.92/gtk/Makefile.in 2010-03-12 13:21:54.117754719 +0100
17329
Index: transmission-1.93/gtk/Makefile.in
17330
===================================================================
17331
--- transmission-1.93.orig/gtk/Makefile.in 2010-05-03 21:56:05.618122202 +0200
17332
+++ transmission-1.93/gtk/Makefile.in 2010-05-03 21:56:48.000000000 +0200
17356
17333
@@ -264,6 +264,8 @@
17357
17334
LIBTOOL = @LIBTOOL@
17358
17335
LIPO = @LIPO@
17378
17355
sysconfdir = @sysconfdir@
17379
17356
target_alias = @target_alias@
17380
17357
top_build_prefix = @top_build_prefix@
17381
@@ -449,7 +451,7 @@
17358
@@ -450,7 +452,7 @@
17382
17359
$(dbus_generated_sources)
17383
17360
17384
17361
dist_man_MANS = transmission.1
17387
17364
$(top_builddir)/libtransmission/libtransmission.a \
17388
17365
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
17389
17366
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
17390
diff -uNr transmission-1.92.pristine/libtransmission/Makefile.in transmission-1.92/libtransmission/Makefile.in
17391
--- transmission-1.92.pristine/libtransmission/Makefile.in 2010-03-12 13:21:40.193740695 +0100
17392
+++ transmission-1.92/libtransmission/Makefile.in 2010-03-12 13:21:54.333758561 +0100
17367
Index: transmission-1.93/libtransmission/Makefile.in
17368
===================================================================
17369
--- transmission-1.93.orig/libtransmission/Makefile.in 2010-05-03 21:56:08.054120804 +0200
17370
+++ transmission-1.93/libtransmission/Makefile.in 2010-05-03 21:56:48.000000000 +0200
17393
17371
@@ -275,6 +275,8 @@
17394
17372
LIBTOOL = @LIBTOOL@
17395
17373
LIPO = @LIPO@
17415
17393
sysconfdir = @sysconfdir@
17416
17394
target_alias = @target_alias@
17417
17395
top_build_prefix = @top_build_prefix@
17418
diff -uNr transmission-1.92.pristine/macosx/Makefile.in transmission-1.92/macosx/Makefile.in
17419
--- transmission-1.92.pristine/macosx/Makefile.in 2010-03-12 13:21:40.245742134 +0100
17420
+++ transmission-1.92/macosx/Makefile.in 2010-03-12 13:21:54.381757819 +0100
17396
Index: transmission-1.93/macosx/Makefile.in
17397
===================================================================
17398
--- transmission-1.93.orig/macosx/Makefile.in 2010-05-03 21:56:12.186119966 +0200
17399
+++ transmission-1.93/macosx/Makefile.in 2010-05-03 21:56:49.000000000 +0200
17421
17400
@@ -141,6 +141,8 @@
17422
17401
LIBTOOL = @LIBTOOL@
17423
17402
LIPO = @LIPO@
17443
17422
sysconfdir = @sysconfdir@
17444
17423
target_alias = @target_alias@
17445
17424
top_build_prefix = @top_build_prefix@
17446
diff -uNr transmission-1.92.pristine/Makefile.in transmission-1.92/Makefile.in
17447
--- transmission-1.92.pristine/Makefile.in 2010-03-12 13:21:40.177737128 +0100
17448
+++ transmission-1.92/Makefile.in 2010-03-12 13:21:55.065758936 +0100
17425
Index: transmission-1.93/Makefile.in
17426
===================================================================
17427
--- transmission-1.93.orig/Makefile.in 2010-05-03 21:56:03.170119688 +0200
17428
+++ transmission-1.93/Makefile.in 2010-05-03 21:56:50.000000000 +0200
17449
17429
@@ -197,6 +197,8 @@
17450
17430
LIBTOOL = @LIBTOOL@
17451
17431
LIPO = @LIPO@
17471
17451
sysconfdir = @sysconfdir@
17472
17452
target_alias = @target_alias@
17473
17453
top_build_prefix = @top_build_prefix@
17474
diff -uNr transmission-1.92.pristine/third-party/dht/Makefile.in transmission-1.92/third-party/dht/Makefile.in
17475
--- transmission-1.92.pristine/third-party/dht/Makefile.in 2010-03-12 13:21:40.205746760 +0100
17476
+++ transmission-1.92/third-party/dht/Makefile.in 2010-03-12 13:21:54.489757934 +0100
17477
@@ -179,6 +179,8 @@
17478
LIBTOOL = @LIBTOOL@
17479
LIPO = @LIPO@
17480
LN_S = @LN_S@
17481
+LPI_CFLAGS = @LPI_CFLAGS@
17482
+LPI_LIBS = @LPI_LIBS@
17483
LTLIBOBJS = @LTLIBOBJS@
17484
MAKEINFO = @MAKEINFO@
17485
MKDIR_P = @MKDIR_P@
17486
@@ -199,6 +201,7 @@
17487
PACKAGE_NAME = @PACKAGE_NAME@
17488
PACKAGE_STRING = @PACKAGE_STRING@
17489
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17490
+PACKAGE_URL = @PACKAGE_URL@
17491
PACKAGE_VERSION = @PACKAGE_VERSION@
17492
PATH_SEPARATOR = @PATH_SEPARATOR@
17493
PEERID_PREFIX = @PEERID_PREFIX@
17494
@@ -272,7 +275,6 @@
17495
sbindir = @sbindir@
17496
sharedstatedir = @sharedstatedir@
17497
srcdir = @srcdir@
17498
-subdirs = @subdirs@
17499
sysconfdir = @sysconfdir@
17500
target_alias = @target_alias@
17501
top_build_prefix = @top_build_prefix@
17502
diff -uNr transmission-1.92.pristine/third-party/libnatpmp/Makefile.in transmission-1.92/third-party/libnatpmp/Makefile.in
17503
--- transmission-1.92.pristine/third-party/libnatpmp/Makefile.in 2010-03-12 13:21:40.205746760 +0100
17504
+++ transmission-1.92/third-party/libnatpmp/Makefile.in 2010-03-12 13:21:54.549757950 +0100
17505
@@ -180,6 +180,8 @@
17506
LIBTOOL = @LIBTOOL@
17507
LIPO = @LIPO@
17508
LN_S = @LN_S@
17509
+LPI_CFLAGS = @LPI_CFLAGS@
17510
+LPI_LIBS = @LPI_LIBS@
17511
LTLIBOBJS = @LTLIBOBJS@
17512
MAKEINFO = @MAKEINFO@
17513
MKDIR_P = @MKDIR_P@
17514
@@ -200,6 +202,7 @@
17515
PACKAGE_NAME = @PACKAGE_NAME@
17516
PACKAGE_STRING = @PACKAGE_STRING@
17517
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17518
+PACKAGE_URL = @PACKAGE_URL@
17519
PACKAGE_VERSION = @PACKAGE_VERSION@
17520
PATH_SEPARATOR = @PATH_SEPARATOR@
17521
PEERID_PREFIX = @PEERID_PREFIX@
17522
@@ -273,7 +276,6 @@
17523
sbindir = @sbindir@
17524
sharedstatedir = @sharedstatedir@
17525
srcdir = @srcdir@
17526
-subdirs = @subdirs@
17527
sysconfdir = @sysconfdir@
17528
target_alias = @target_alias@
17529
top_build_prefix = @top_build_prefix@
17530
diff -uNr transmission-1.92.pristine/third-party/Makefile.in transmission-1.92/third-party/Makefile.in
17531
--- transmission-1.92.pristine/third-party/Makefile.in 2010-03-12 13:21:40.205746760 +0100
17532
+++ transmission-1.92/third-party/Makefile.in 2010-03-12 13:21:54.429759800 +0100
17454
Index: transmission-1.93/third-party/Makefile.in
17455
===================================================================
17456
--- transmission-1.93.orig/third-party/Makefile.in 2010-05-03 21:56:17.898121362 +0200
17457
+++ transmission-1.93/third-party/Makefile.in 2010-05-03 21:56:49.000000000 +0200
17533
17458
@@ -181,6 +181,8 @@
17534
17459
LIBTOOL = @LIBTOOL@
17535
17460
LIPO = @LIPO@
17555
17480
sysconfdir = @sysconfdir@
17556
17481
target_alias = @target_alias@
17557
17482
top_build_prefix = @top_build_prefix@
17558
diff -uNr transmission-1.92.pristine/third-party/miniupnp/Makefile.in transmission-1.92/third-party/miniupnp/Makefile.in
17559
--- transmission-1.92.pristine/third-party/miniupnp/Makefile.in 2010-03-12 13:21:40.205746760 +0100
17560
+++ transmission-1.92/third-party/miniupnp/Makefile.in 2010-03-12 13:21:54.613734795 +0100
17561
@@ -182,6 +182,8 @@
17562
LIBTOOL = @LIBTOOL@
17563
LIPO = @LIPO@
17564
LN_S = @LN_S@
17565
+LPI_CFLAGS = @LPI_CFLAGS@
17566
+LPI_LIBS = @LPI_LIBS@
17567
LTLIBOBJS = @LTLIBOBJS@
17568
MAKEINFO = @MAKEINFO@
17569
MKDIR_P = @MKDIR_P@
17570
@@ -202,6 +204,7 @@
17571
PACKAGE_NAME = @PACKAGE_NAME@
17572
PACKAGE_STRING = @PACKAGE_STRING@
17573
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17574
+PACKAGE_URL = @PACKAGE_URL@
17575
PACKAGE_VERSION = @PACKAGE_VERSION@
17576
PATH_SEPARATOR = @PATH_SEPARATOR@
17577
PEERID_PREFIX = @PEERID_PREFIX@
17578
@@ -275,7 +278,6 @@
17579
sbindir = @sbindir@
17580
sharedstatedir = @sharedstatedir@
17581
srcdir = @srcdir@
17582
-subdirs = @subdirs@
17583
sysconfdir = @sysconfdir@
17584
target_alias = @target_alias@
17585
top_build_prefix = @top_build_prefix@
17586
diff -uNr transmission-1.92.pristine/web/images/buttons/Makefile.in transmission-1.92/web/images/buttons/Makefile.in
17587
--- transmission-1.92.pristine/web/images/buttons/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17588
+++ transmission-1.92/web/images/buttons/Makefile.in 2010-03-12 13:21:54.765758783 +0100
17589
@@ -166,6 +166,8 @@
17590
LIBTOOL = @LIBTOOL@
17591
LIPO = @LIPO@
17592
LN_S = @LN_S@
17593
+LPI_CFLAGS = @LPI_CFLAGS@
17594
+LPI_LIBS = @LPI_LIBS@
17595
LTLIBOBJS = @LTLIBOBJS@
17596
MAKEINFO = @MAKEINFO@
17597
MKDIR_P = @MKDIR_P@
17598
@@ -186,6 +188,7 @@
17599
PACKAGE_NAME = @PACKAGE_NAME@
17600
PACKAGE_STRING = @PACKAGE_STRING@
17601
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17602
+PACKAGE_URL = @PACKAGE_URL@
17603
PACKAGE_VERSION = @PACKAGE_VERSION@
17604
PATH_SEPARATOR = @PATH_SEPARATOR@
17605
PEERID_PREFIX = @PEERID_PREFIX@
17606
@@ -259,7 +262,6 @@
17607
sbindir = @sbindir@
17608
sharedstatedir = @sharedstatedir@
17609
srcdir = @srcdir@
17610
-subdirs = @subdirs@
17611
sysconfdir = @sysconfdir@
17612
target_alias = @target_alias@
17613
top_build_prefix = @top_build_prefix@
17614
diff -uNr transmission-1.92.pristine/web/images/graphics/Makefile.in transmission-1.92/web/images/graphics/Makefile.in
17615
--- transmission-1.92.pristine/web/images/graphics/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17616
+++ transmission-1.92/web/images/graphics/Makefile.in 2010-03-12 13:21:54.813758321 +0100
17617
@@ -166,6 +166,8 @@
17618
LIBTOOL = @LIBTOOL@
17619
LIPO = @LIPO@
17620
LN_S = @LN_S@
17621
+LPI_CFLAGS = @LPI_CFLAGS@
17622
+LPI_LIBS = @LPI_LIBS@
17623
LTLIBOBJS = @LTLIBOBJS@
17624
MAKEINFO = @MAKEINFO@
17625
MKDIR_P = @MKDIR_P@
17626
@@ -186,6 +188,7 @@
17627
PACKAGE_NAME = @PACKAGE_NAME@
17628
PACKAGE_STRING = @PACKAGE_STRING@
17629
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17630
+PACKAGE_URL = @PACKAGE_URL@
17631
PACKAGE_VERSION = @PACKAGE_VERSION@
17632
PATH_SEPARATOR = @PATH_SEPARATOR@
17633
PEERID_PREFIX = @PEERID_PREFIX@
17634
@@ -259,7 +262,6 @@
17635
sbindir = @sbindir@
17636
sharedstatedir = @sharedstatedir@
17637
srcdir = @srcdir@
17638
-subdirs = @subdirs@
17639
sysconfdir = @sysconfdir@
17640
target_alias = @target_alias@
17641
top_build_prefix = @top_build_prefix@
17642
diff -uNr transmission-1.92.pristine/web/images/Makefile.in transmission-1.92/web/images/Makefile.in
17643
--- transmission-1.92.pristine/web/images/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17644
+++ transmission-1.92/web/images/Makefile.in 2010-03-12 13:21:54.717757992 +0100
17645
@@ -206,6 +206,8 @@
17646
LIBTOOL = @LIBTOOL@
17647
LIPO = @LIPO@
17648
LN_S = @LN_S@
17649
+LPI_CFLAGS = @LPI_CFLAGS@
17650
+LPI_LIBS = @LPI_LIBS@
17651
LTLIBOBJS = @LTLIBOBJS@
17652
MAKEINFO = @MAKEINFO@
17653
MKDIR_P = @MKDIR_P@
17654
@@ -226,6 +228,7 @@
17655
PACKAGE_NAME = @PACKAGE_NAME@
17656
PACKAGE_STRING = @PACKAGE_STRING@
17657
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17658
+PACKAGE_URL = @PACKAGE_URL@
17659
PACKAGE_VERSION = @PACKAGE_VERSION@
17660
PATH_SEPARATOR = @PATH_SEPARATOR@
17661
PEERID_PREFIX = @PEERID_PREFIX@
17662
@@ -299,7 +302,6 @@
17663
sbindir = @sbindir@
17664
sharedstatedir = @sharedstatedir@
17665
srcdir = @srcdir@
17666
-subdirs = @subdirs@
17667
sysconfdir = @sysconfdir@
17668
target_alias = @target_alias@
17669
top_build_prefix = @top_build_prefix@
17670
diff -uNr transmission-1.92.pristine/web/images/progress/Makefile.in transmission-1.92/web/images/progress/Makefile.in
17671
--- transmission-1.92.pristine/web/images/progress/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17672
+++ transmission-1.92/web/images/progress/Makefile.in 2010-03-12 13:21:54.861758138 +0100
17673
@@ -166,6 +166,8 @@
17674
LIBTOOL = @LIBTOOL@
17675
LIPO = @LIPO@
17676
LN_S = @LN_S@
17677
+LPI_CFLAGS = @LPI_CFLAGS@
17678
+LPI_LIBS = @LPI_LIBS@
17679
LTLIBOBJS = @LTLIBOBJS@
17680
MAKEINFO = @MAKEINFO@
17681
MKDIR_P = @MKDIR_P@
17682
@@ -186,6 +188,7 @@
17683
PACKAGE_NAME = @PACKAGE_NAME@
17684
PACKAGE_STRING = @PACKAGE_STRING@
17685
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17686
+PACKAGE_URL = @PACKAGE_URL@
17687
PACKAGE_VERSION = @PACKAGE_VERSION@
17688
PATH_SEPARATOR = @PATH_SEPARATOR@
17689
PEERID_PREFIX = @PEERID_PREFIX@
17690
@@ -259,7 +262,6 @@
17691
sbindir = @sbindir@
17692
sharedstatedir = @sharedstatedir@
17693
srcdir = @srcdir@
17694
-subdirs = @subdirs@
17695
sysconfdir = @sysconfdir@
17696
target_alias = @target_alias@
17697
top_build_prefix = @top_build_prefix@
17698
diff -uNr transmission-1.92.pristine/web/javascript/jquery/Makefile.in transmission-1.92/web/javascript/jquery/Makefile.in
17699
--- transmission-1.92.pristine/web/javascript/jquery/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17700
+++ transmission-1.92/web/javascript/jquery/Makefile.in 2010-03-12 13:21:54.961758632 +0100
17701
@@ -166,6 +166,8 @@
17702
LIBTOOL = @LIBTOOL@
17703
LIPO = @LIPO@
17704
LN_S = @LN_S@
17705
+LPI_CFLAGS = @LPI_CFLAGS@
17706
+LPI_LIBS = @LPI_LIBS@
17707
LTLIBOBJS = @LTLIBOBJS@
17708
MAKEINFO = @MAKEINFO@
17709
MKDIR_P = @MKDIR_P@
17710
@@ -186,6 +188,7 @@
17711
PACKAGE_NAME = @PACKAGE_NAME@
17712
PACKAGE_STRING = @PACKAGE_STRING@
17713
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17714
+PACKAGE_URL = @PACKAGE_URL@
17715
PACKAGE_VERSION = @PACKAGE_VERSION@
17716
PATH_SEPARATOR = @PATH_SEPARATOR@
17717
PEERID_PREFIX = @PEERID_PREFIX@
17718
@@ -259,7 +262,6 @@
17719
sbindir = @sbindir@
17720
sharedstatedir = @sharedstatedir@
17721
srcdir = @srcdir@
17722
-subdirs = @subdirs@
17723
sysconfdir = @sysconfdir@
17724
target_alias = @target_alias@
17725
top_build_prefix = @top_build_prefix@
17726
diff -uNr transmission-1.92.pristine/web/javascript/Makefile.in transmission-1.92/web/javascript/Makefile.in
17727
--- transmission-1.92.pristine/web/javascript/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17728
+++ transmission-1.92/web/javascript/Makefile.in 2010-03-12 13:21:54.913759092 +0100
17729
@@ -206,6 +206,8 @@
17730
LIBTOOL = @LIBTOOL@
17731
LIPO = @LIPO@
17732
LN_S = @LN_S@
17733
+LPI_CFLAGS = @LPI_CFLAGS@
17734
+LPI_LIBS = @LPI_LIBS@
17735
LTLIBOBJS = @LTLIBOBJS@
17736
MAKEINFO = @MAKEINFO@
17737
MKDIR_P = @MKDIR_P@
17738
@@ -226,6 +228,7 @@
17739
PACKAGE_NAME = @PACKAGE_NAME@
17740
PACKAGE_STRING = @PACKAGE_STRING@
17741
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17742
+PACKAGE_URL = @PACKAGE_URL@
17743
PACKAGE_VERSION = @PACKAGE_VERSION@
17744
PATH_SEPARATOR = @PATH_SEPARATOR@
17745
PEERID_PREFIX = @PEERID_PREFIX@
17746
@@ -299,7 +302,6 @@
17747
sbindir = @sbindir@
17748
sharedstatedir = @sharedstatedir@
17749
srcdir = @srcdir@
17750
-subdirs = @subdirs@
17751
sysconfdir = @sysconfdir@
17752
target_alias = @target_alias@
17753
top_build_prefix = @top_build_prefix@
17754
diff -uNr transmission-1.92.pristine/web/Makefile.in transmission-1.92/web/Makefile.in
17755
--- transmission-1.92.pristine/web/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17756
+++ transmission-1.92/web/Makefile.in 2010-03-12 13:21:54.669759159 +0100
17757
@@ -206,6 +206,8 @@
17758
LIBTOOL = @LIBTOOL@
17759
LIPO = @LIPO@
17760
LN_S = @LN_S@
17761
+LPI_CFLAGS = @LPI_CFLAGS@
17762
+LPI_LIBS = @LPI_LIBS@
17763
LTLIBOBJS = @LTLIBOBJS@
17764
MAKEINFO = @MAKEINFO@
17765
MKDIR_P = @MKDIR_P@
17766
@@ -226,6 +228,7 @@
17767
PACKAGE_NAME = @PACKAGE_NAME@
17768
PACKAGE_STRING = @PACKAGE_STRING@
17769
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17770
+PACKAGE_URL = @PACKAGE_URL@
17771
PACKAGE_VERSION = @PACKAGE_VERSION@
17772
PATH_SEPARATOR = @PATH_SEPARATOR@
17773
PEERID_PREFIX = @PEERID_PREFIX@
17774
@@ -299,7 +302,6 @@
17775
sbindir = @sbindir@
17776
sharedstatedir = @sharedstatedir@
17777
srcdir = @srcdir@
17778
-subdirs = @subdirs@
17779
sysconfdir = @sysconfdir@
17780
target_alias = @target_alias@
17781
top_build_prefix = @top_build_prefix@
17782
diff -uNr transmission-1.92.pristine/web/stylesheets/Makefile.in transmission-1.92/web/stylesheets/Makefile.in
17783
--- transmission-1.92.pristine/web/stylesheets/Makefile.in 2010-03-12 13:21:40.209756765 +0100
17784
+++ transmission-1.92/web/stylesheets/Makefile.in 2010-03-12 13:21:55.009758591 +0100
17785
@@ -166,6 +166,8 @@
17786
LIBTOOL = @LIBTOOL@
17787
LIPO = @LIPO@
17788
LN_S = @LN_S@
17789
+LPI_CFLAGS = @LPI_CFLAGS@
17790
+LPI_LIBS = @LPI_LIBS@
17791
LTLIBOBJS = @LTLIBOBJS@
17792
MAKEINFO = @MAKEINFO@
17793
MKDIR_P = @MKDIR_P@
17794
@@ -186,6 +188,7 @@
17795
PACKAGE_NAME = @PACKAGE_NAME@
17796
PACKAGE_STRING = @PACKAGE_STRING@
17797
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17798
+PACKAGE_URL = @PACKAGE_URL@
17799
PACKAGE_VERSION = @PACKAGE_VERSION@
17800
PATH_SEPARATOR = @PATH_SEPARATOR@
17801
PEERID_PREFIX = @PEERID_PREFIX@
17802
@@ -259,7 +262,6 @@
17483
Index: transmission-1.93/web/Makefile.in
17484
===================================================================
17485
--- transmission-1.93.orig/web/Makefile.in 2010-05-03 21:56:18.114118848 +0200
17486
+++ transmission-1.93/web/Makefile.in 2010-05-03 21:56:49.000000000 +0200
17487
@@ -206,6 +206,8 @@
17488
LIBTOOL = @LIBTOOL@
17489
LIPO = @LIPO@
17490
LN_S = @LN_S@
17491
+LPI_CFLAGS = @LPI_CFLAGS@
17492
+LPI_LIBS = @LPI_LIBS@
17493
LTLIBOBJS = @LTLIBOBJS@
17494
MAKEINFO = @MAKEINFO@
17495
MKDIR_P = @MKDIR_P@
17496
@@ -226,6 +228,7 @@
17497
PACKAGE_NAME = @PACKAGE_NAME@
17498
PACKAGE_STRING = @PACKAGE_STRING@
17499
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17500
+PACKAGE_URL = @PACKAGE_URL@
17501
PACKAGE_VERSION = @PACKAGE_VERSION@
17502
PATH_SEPARATOR = @PATH_SEPARATOR@
17503
PEERID_PREFIX = @PEERID_PREFIX@
17504
@@ -299,7 +302,6 @@
17803
17505
sbindir = @sbindir@
17804
17506
sharedstatedir = @sharedstatedir@
17805
17507
srcdir = @srcdir@
Loggerhead is a web-based interface for Breezy
Version: 2.0.1