evdispatch 0.1.5 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +9 -6
- data/ext/revdispatch/libdispatch-0.1/Changelog +11 -0
- data/ext/revdispatch/libdispatch-0.1/Makefile.in +61 -76
- data/ext/revdispatch/libdispatch-0.1/aclocal.m4 +260 -463
- data/ext/revdispatch/libdispatch-0.1/configure +3953 -4668
- data/ext/revdispatch/libdispatch-0.1/src/Makefile.in +59 -73
- data/ext/revdispatch/libdispatch-0.1/src/ev_dispatch.cc +35 -0
- data/ext/revdispatch/libdispatch-0.1/src/ev_dispatch.h +16 -20
- data/ext/revdispatch/libdispatch-0.1/src/ev_http.cc +104 -23
- data/ext/revdispatch/libdispatch-0.1/src/ev_http.h +21 -7
- data/ext/revdispatch/libdispatch-0.1/test/Makefile.am +6 -1
- data/ext/revdispatch/libdispatch-0.1/test/Makefile.in +98 -93
- data/ext/revdispatch/libdispatch-0.1/test/next_test.cc +8 -6
- data/ext/revdispatch/revdispatch.cc +51 -5
- data/ext/revdispatch/server.rb +13 -2
- data/ext/revdispatch/test.rb +1 -0
- data/lib/evdispatch/version.rb +2 -2
- data/test/test_evdispatch.rb +16 -8
- data/website/index.html +2 -2
- data/website/index.txt +1 -2
- metadata +2 -2
@@ -1,7 +1,7 @@
|
|
1
|
-
# generated automatically by aclocal 1.
|
1
|
+
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
2
2
|
|
3
3
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
4
|
-
# 2005
|
4
|
+
# 2005 Free Software Foundation, Inc.
|
5
5
|
# This file is free software; the Free Software Foundation
|
6
6
|
# gives unlimited permission to copy and/or distribute it,
|
7
7
|
# with or without modifications, as long as this notice is preserved.
|
@@ -11,14 +11,9 @@
|
|
11
11
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
12
12
|
# PARTICULAR PURPOSE.
|
13
13
|
|
14
|
-
m4_if(m4_PACKAGE_VERSION, [2.61],,
|
15
|
-
[m4_fatal([this file was generated for autoconf 2.61.
|
16
|
-
You have another version of autoconf. If you want to use that,
|
17
|
-
you should regenerate the build system entirely.], [63])])
|
18
|
-
|
19
14
|
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
20
15
|
|
21
|
-
# serial
|
16
|
+
# serial 48 AC_PROG_LIBTOOL
|
22
17
|
|
23
18
|
|
24
19
|
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
@@ -181,7 +176,7 @@ test -z "$STRIP" && STRIP=:
|
|
181
176
|
test -z "$ac_objext" && ac_objext=o
|
182
177
|
|
183
178
|
# Determine commands to create old-style static archives.
|
184
|
-
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
|
179
|
+
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
|
185
180
|
old_postinstall_cmds='chmod 644 $oldlib'
|
186
181
|
old_postuninstall_cmds=
|
187
182
|
|
@@ -268,9 +263,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
|
|
268
263
|
# Check for compiler boilerplate output or warnings with
|
269
264
|
# the simple compiler test code.
|
270
265
|
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
|
271
|
-
[
|
272
|
-
|
273
|
-
echo "$lt_simple_compile_test_code" >conftest.$ac_ext
|
266
|
+
[ac_outfile=conftest.$ac_objext
|
267
|
+
printf "$lt_simple_compile_test_code" >conftest.$ac_ext
|
274
268
|
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
|
275
269
|
_lt_compiler_boilerplate=`cat conftest.err`
|
276
270
|
$rm conftest*
|
@@ -282,9 +276,8 @@ $rm conftest*
|
|
282
276
|
# Check for linker boilerplate output or warnings with
|
283
277
|
# the simple link test code.
|
284
278
|
AC_DEFUN([_LT_LINKER_BOILERPLATE],
|
285
|
-
[
|
286
|
-
|
287
|
-
echo "$lt_simple_link_test_code" >conftest.$ac_ext
|
279
|
+
[ac_outfile=conftest.$ac_objext
|
280
|
+
printf "$lt_simple_link_test_code" >conftest.$ac_ext
|
288
281
|
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
|
289
282
|
_lt_linker_boilerplate=`cat conftest.err`
|
290
283
|
$rm conftest*
|
@@ -300,20 +293,12 @@ $rm conftest*
|
|
300
293
|
# If we don't find anything, use the default library path according
|
301
294
|
# to the aix ld manual.
|
302
295
|
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
|
303
|
-
[
|
304
|
-
|
305
|
-
|
306
|
-
/Import File Strings/,/^$/ {
|
307
|
-
/^0/ {
|
308
|
-
s/^0 *\(.*\)$/\1/
|
309
|
-
p
|
310
|
-
}
|
311
|
-
}'
|
312
|
-
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
296
|
+
[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
|
297
|
+
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
|
298
|
+
}'`
|
313
299
|
# Check for a 64-bit object if we didn't find anything.
|
314
|
-
if test -z "$aix_libpath"; then
|
315
|
-
|
316
|
-
fi],[])
|
300
|
+
if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
|
301
|
+
}'`; fi],[])
|
317
302
|
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
318
303
|
])# _LT_AC_SYS_LIBPATH_AIX
|
319
304
|
|
@@ -544,17 +529,13 @@ ia64-*-hpux*)
|
|
544
529
|
rm -rf conftest*
|
545
530
|
;;
|
546
531
|
|
547
|
-
x86_64-*
|
548
|
-
s390*-*linux*|sparc*-*linux*)
|
532
|
+
x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
|
549
533
|
# Find out which ABI we are using.
|
550
534
|
echo 'int i;' > conftest.$ac_ext
|
551
535
|
if AC_TRY_EVAL(ac_compile); then
|
552
536
|
case `/usr/bin/file conftest.o` in
|
553
537
|
*32-bit*)
|
554
538
|
case $host in
|
555
|
-
x86_64-*kfreebsd*-gnu)
|
556
|
-
LD="${LD-ld} -m elf_i386_fbsd"
|
557
|
-
;;
|
558
539
|
x86_64-*linux*)
|
559
540
|
LD="${LD-ld} -m elf_i386"
|
560
541
|
;;
|
@@ -570,11 +551,7 @@ s390*-*linux*|sparc*-*linux*)
|
|
570
551
|
esac
|
571
552
|
;;
|
572
553
|
*64-bit*)
|
573
|
-
libsuff=64
|
574
554
|
case $host in
|
575
|
-
x86_64-*kfreebsd*-gnu)
|
576
|
-
LD="${LD-ld} -m elf_x86_64_fbsd"
|
577
|
-
;;
|
578
555
|
x86_64-*linux*)
|
579
556
|
LD="${LD-ld} -m elf_x86_64"
|
580
557
|
;;
|
@@ -646,7 +623,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
|
|
646
623
|
AC_CACHE_CHECK([$1], [$2],
|
647
624
|
[$2=no
|
648
625
|
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
|
649
|
-
|
626
|
+
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
650
627
|
lt_compiler_flag="$3"
|
651
628
|
# Insert the option either (1) after the last *FLAGS variable, or
|
652
629
|
# (2) before a word containing "conftest.", or (3) at the end.
|
@@ -687,12 +664,11 @@ fi
|
|
687
664
|
# ------------------------------------------------------------
|
688
665
|
# Check whether the given compiler option works
|
689
666
|
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
|
690
|
-
[
|
691
|
-
AC_CACHE_CHECK([$1], [$2],
|
667
|
+
[AC_CACHE_CHECK([$1], [$2],
|
692
668
|
[$2=no
|
693
669
|
save_LDFLAGS="$LDFLAGS"
|
694
670
|
LDFLAGS="$LDFLAGS $3"
|
695
|
-
|
671
|
+
printf "$lt_simple_link_test_code" > conftest.$ac_ext
|
696
672
|
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
|
697
673
|
# The linker can only warn and ignore the option if not recognized
|
698
674
|
# So say no if there are warnings
|
@@ -806,27 +782,24 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|
806
782
|
fi
|
807
783
|
;;
|
808
784
|
*)
|
809
|
-
|
810
|
-
|
811
|
-
|
812
|
-
|
813
|
-
|
814
|
-
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
|
815
|
-
while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
|
785
|
+
# If test is not a shell built-in, we'll probably end up computing a
|
786
|
+
# maximum length that is only half of the actual maximum length, but
|
787
|
+
# we can't tell.
|
788
|
+
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
|
789
|
+
while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
|
816
790
|
= "XX$teststring") >/dev/null 2>&1 &&
|
817
|
-
|
818
|
-
|
819
|
-
|
820
|
-
|
821
|
-
|
822
|
-
|
823
|
-
|
824
|
-
|
825
|
-
|
826
|
-
|
827
|
-
|
828
|
-
|
829
|
-
fi
|
791
|
+
new_result=`expr "X$teststring" : ".*" 2>&1` &&
|
792
|
+
lt_cv_sys_max_cmd_len=$new_result &&
|
793
|
+
test $i != 17 # 1/2 MB should be enough
|
794
|
+
do
|
795
|
+
i=`expr $i + 1`
|
796
|
+
teststring=$teststring$teststring
|
797
|
+
done
|
798
|
+
teststring=
|
799
|
+
# Add a significant safety factor because C++ compilers can tack on massive
|
800
|
+
# amounts of additional arguments before passing them to the linker.
|
801
|
+
# It appears as though 1/2 is a usable value.
|
802
|
+
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
|
830
803
|
;;
|
831
804
|
esac
|
832
805
|
])
|
@@ -1053,8 +1026,7 @@ fi
|
|
1053
1026
|
# ---------------------------------
|
1054
1027
|
# Check to see if options -c and -o are simultaneously supported by compiler
|
1055
1028
|
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
|
1056
|
-
[AC_REQUIRE([
|
1057
|
-
AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
|
1029
|
+
[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
|
1058
1030
|
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
|
1059
1031
|
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
|
1060
1032
|
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
|
@@ -1062,7 +1034,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
|
|
1062
1034
|
mkdir conftest
|
1063
1035
|
cd conftest
|
1064
1036
|
mkdir out
|
1065
|
-
|
1037
|
+
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
1066
1038
|
|
1067
1039
|
lt_compiler_flag="-o out/conftest2.$ac_objext"
|
1068
1040
|
# Insert the option either (1) after the last *FLAGS variable, or
|
@@ -1202,7 +1174,6 @@ else
|
|
1202
1174
|
darwin*)
|
1203
1175
|
if test -n "$STRIP" ; then
|
1204
1176
|
striplib="$STRIP -x"
|
1205
|
-
old_striplib="$STRIP -S"
|
1206
1177
|
AC_MSG_RESULT([yes])
|
1207
1178
|
else
|
1208
1179
|
AC_MSG_RESULT([no])
|
@@ -1220,8 +1191,7 @@ fi
|
|
1220
1191
|
# -----------------------------
|
1221
1192
|
# PORTME Fill in your ld.so characteristics
|
1222
1193
|
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
|
1223
|
-
[
|
1224
|
-
AC_MSG_CHECKING([dynamic linker characteristics])
|
1194
|
+
[AC_MSG_CHECKING([dynamic linker characteristics])
|
1225
1195
|
library_names_spec=
|
1226
1196
|
libname_spec='lib$name'
|
1227
1197
|
soname_spec=
|
@@ -1235,58 +1205,20 @@ shlibpath_overrides_runpath=unknown
|
|
1235
1205
|
version_type=none
|
1236
1206
|
dynamic_linker="$host_os ld.so"
|
1237
1207
|
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
1238
|
-
m4_if($1,[],[
|
1239
1208
|
if test "$GCC" = yes; then
|
1240
|
-
|
1241
|
-
|
1242
|
-
*) lt_awk_arg="/^libraries:/" ;;
|
1243
|
-
esac
|
1244
|
-
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
1245
|
-
if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
1209
|
+
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
1210
|
+
if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
1246
1211
|
# if the path contains ";" then we assume it to be the separator
|
1247
1212
|
# otherwise default to the standard path separator (i.e. ":") - it is
|
1248
1213
|
# assumed that no part of a normal pathname contains ";" but that should
|
1249
1214
|
# okay in the real world where ";" in dirpaths is itself problematic.
|
1250
|
-
|
1215
|
+
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
1251
1216
|
else
|
1252
|
-
|
1217
|
+
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
1253
1218
|
fi
|
1254
|
-
# Ok, now we have the path, separated by spaces, we can step through it
|
1255
|
-
# and add multilib dir if necessary.
|
1256
|
-
lt_tmp_lt_search_path_spec=
|
1257
|
-
lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
1258
|
-
for lt_sys_path in $lt_search_path_spec; do
|
1259
|
-
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
1260
|
-
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
1261
|
-
else
|
1262
|
-
test -d "$lt_sys_path" && \
|
1263
|
-
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
1264
|
-
fi
|
1265
|
-
done
|
1266
|
-
lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
1267
|
-
BEGIN {RS=" "; FS="/|\n";} {
|
1268
|
-
lt_foo="";
|
1269
|
-
lt_count=0;
|
1270
|
-
for (lt_i = NF; lt_i > 0; lt_i--) {
|
1271
|
-
if ($lt_i != "" && $lt_i != ".") {
|
1272
|
-
if ($lt_i == "..") {
|
1273
|
-
lt_count++;
|
1274
|
-
} else {
|
1275
|
-
if (lt_count == 0) {
|
1276
|
-
lt_foo="/" $lt_i lt_foo;
|
1277
|
-
} else {
|
1278
|
-
lt_count--;
|
1279
|
-
}
|
1280
|
-
}
|
1281
|
-
}
|
1282
|
-
}
|
1283
|
-
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
1284
|
-
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
1285
|
-
}'`
|
1286
|
-
sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
1287
1219
|
else
|
1288
1220
|
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
1289
|
-
fi
|
1221
|
+
fi
|
1290
1222
|
need_lib_prefix=unknown
|
1291
1223
|
hardcode_into_libs=no
|
1292
1224
|
|
@@ -1443,8 +1375,12 @@ darwin* | rhapsody*)
|
|
1443
1375
|
shlibpath_overrides_runpath=yes
|
1444
1376
|
shlibpath_var=DYLD_LIBRARY_PATH
|
1445
1377
|
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
1446
|
-
|
1447
|
-
|
1378
|
+
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
1379
|
+
if test "$GCC" = yes; then
|
1380
|
+
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
1381
|
+
else
|
1382
|
+
sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
|
1383
|
+
fi
|
1448
1384
|
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
1449
1385
|
;;
|
1450
1386
|
|
@@ -1461,6 +1397,18 @@ freebsd1*)
|
|
1461
1397
|
dynamic_linker=no
|
1462
1398
|
;;
|
1463
1399
|
|
1400
|
+
kfreebsd*-gnu)
|
1401
|
+
version_type=linux
|
1402
|
+
need_lib_prefix=no
|
1403
|
+
need_version=no
|
1404
|
+
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
1405
|
+
soname_spec='${libname}${release}${shared_ext}$major'
|
1406
|
+
shlibpath_var=LD_LIBRARY_PATH
|
1407
|
+
shlibpath_overrides_runpath=no
|
1408
|
+
hardcode_into_libs=yes
|
1409
|
+
dynamic_linker='GNU ld.so'
|
1410
|
+
;;
|
1411
|
+
|
1464
1412
|
freebsd* | dragonfly*)
|
1465
1413
|
# DragonFly does not have aout. When/if they implement a new
|
1466
1414
|
# versioning mechanism, adjust this.
|
@@ -1498,7 +1446,7 @@ freebsd* | dragonfly*)
|
|
1498
1446
|
shlibpath_overrides_runpath=no
|
1499
1447
|
hardcode_into_libs=yes
|
1500
1448
|
;;
|
1501
|
-
*) # from 4.6 on
|
1449
|
+
freebsd*) # from 4.6 on
|
1502
1450
|
shlibpath_overrides_runpath=yes
|
1503
1451
|
hardcode_into_libs=yes
|
1504
1452
|
;;
|
@@ -1561,7 +1509,7 @@ hpux9* | hpux10* | hpux11*)
|
|
1561
1509
|
postinstall_cmds='chmod 555 $lib'
|
1562
1510
|
;;
|
1563
1511
|
|
1564
|
-
|
1512
|
+
interix3*)
|
1565
1513
|
version_type=linux
|
1566
1514
|
need_lib_prefix=no
|
1567
1515
|
need_version=no
|
@@ -1616,7 +1564,7 @@ linux*oldld* | linux*aout* | linux*coff*)
|
|
1616
1564
|
;;
|
1617
1565
|
|
1618
1566
|
# This must be Linux ELF.
|
1619
|
-
linux*
|
1567
|
+
linux*)
|
1620
1568
|
version_type=linux
|
1621
1569
|
need_lib_prefix=no
|
1622
1570
|
need_version=no
|
@@ -1629,13 +1577,11 @@ linux* | k*bsd*-gnu)
|
|
1629
1577
|
# Some rework will be needed to allow for fast_install
|
1630
1578
|
# before this can be enabled.
|
1631
1579
|
hardcode_into_libs=yes
|
1632
|
-
sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
|
1633
|
-
sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
|
1634
1580
|
|
1635
1581
|
# Append ld.so.conf contents to the search path
|
1636
1582
|
if test -f /etc/ld.so.conf; then
|
1637
|
-
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
|
1638
|
-
sys_lib_dlsearch_path_spec="
|
1583
|
+
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
1584
|
+
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
1639
1585
|
fi
|
1640
1586
|
|
1641
1587
|
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
@@ -1647,6 +1593,18 @@ linux* | k*bsd*-gnu)
|
|
1647
1593
|
dynamic_linker='GNU/Linux ld.so'
|
1648
1594
|
;;
|
1649
1595
|
|
1596
|
+
knetbsd*-gnu)
|
1597
|
+
version_type=linux
|
1598
|
+
need_lib_prefix=no
|
1599
|
+
need_version=no
|
1600
|
+
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
1601
|
+
soname_spec='${libname}${release}${shared_ext}$major'
|
1602
|
+
shlibpath_var=LD_LIBRARY_PATH
|
1603
|
+
shlibpath_overrides_runpath=no
|
1604
|
+
hardcode_into_libs=yes
|
1605
|
+
dynamic_linker='GNU ld.so'
|
1606
|
+
;;
|
1607
|
+
|
1650
1608
|
netbsd*)
|
1651
1609
|
version_type=sunos
|
1652
1610
|
need_lib_prefix=no
|
@@ -1728,10 +1686,6 @@ osf3* | osf4* | osf5*)
|
|
1728
1686
|
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
|
1729
1687
|
;;
|
1730
1688
|
|
1731
|
-
rdos*)
|
1732
|
-
dynamic_linker=no
|
1733
|
-
;;
|
1734
|
-
|
1735
1689
|
solaris*)
|
1736
1690
|
version_type=linux
|
1737
1691
|
need_lib_prefix=no
|
@@ -1837,8 +1791,7 @@ fi
|
|
1837
1791
|
# _LT_AC_TAGCONFIG
|
1838
1792
|
# ----------------
|
1839
1793
|
AC_DEFUN([_LT_AC_TAGCONFIG],
|
1840
|
-
[
|
1841
|
-
AC_ARG_WITH([tags],
|
1794
|
+
[AC_ARG_WITH([tags],
|
1842
1795
|
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
|
1843
1796
|
[include additional configurations @<:@automatic@:>@])],
|
1844
1797
|
[tagnames="$withval"])
|
@@ -2099,7 +2052,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
|
|
2099
2052
|
|
2100
2053
|
# AC_PATH_TOOL_PREFIX
|
2101
2054
|
# -------------------
|
2102
|
-
# find a file program which can
|
2055
|
+
# find a file program which can recognise shared library
|
2103
2056
|
AC_DEFUN([AC_PATH_TOOL_PREFIX],
|
2104
2057
|
[AC_REQUIRE([AC_PROG_EGREP])dnl
|
2105
2058
|
AC_MSG_CHECKING([for $1])
|
@@ -2162,7 +2115,7 @@ fi
|
|
2162
2115
|
|
2163
2116
|
# AC_PATH_MAGIC
|
2164
2117
|
# -------------
|
2165
|
-
# find a file program which can
|
2118
|
+
# find a file program which can recognise a shared library
|
2166
2119
|
AC_DEFUN([AC_PATH_MAGIC],
|
2167
2120
|
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
|
2168
2121
|
if test -z "$lt_cv_path_MAGIC_CMD"; then
|
@@ -2309,7 +2262,7 @@ esac
|
|
2309
2262
|
# how to check for library dependencies
|
2310
2263
|
# -- PORTME fill in with the dynamic library characteristics
|
2311
2264
|
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
|
2312
|
-
[AC_CACHE_CHECK([how to
|
2265
|
+
[AC_CACHE_CHECK([how to recognise dependent libraries],
|
2313
2266
|
lt_cv_deplibs_check_method,
|
2314
2267
|
[lt_cv_file_magic_cmd='$MAGIC_CMD'
|
2315
2268
|
lt_cv_file_magic_test_file=
|
@@ -2348,22 +2301,16 @@ cygwin*)
|
|
2348
2301
|
|
2349
2302
|
mingw* | pw32*)
|
2350
2303
|
# Base MSYS/MinGW do not provide the 'file' command needed by
|
2351
|
-
# func_win32_libid shell function, so use a weaker test based on 'objdump'
|
2352
|
-
|
2353
|
-
|
2354
|
-
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
2355
|
-
lt_cv_file_magic_cmd='func_win32_libid'
|
2356
|
-
else
|
2357
|
-
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
2358
|
-
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
2359
|
-
fi
|
2304
|
+
# func_win32_libid shell function, so use a weaker test based on 'objdump'.
|
2305
|
+
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
2306
|
+
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
2360
2307
|
;;
|
2361
2308
|
|
2362
2309
|
darwin* | rhapsody*)
|
2363
2310
|
lt_cv_deplibs_check_method=pass_all
|
2364
2311
|
;;
|
2365
2312
|
|
2366
|
-
freebsd* | dragonfly*)
|
2313
|
+
freebsd* | kfreebsd*-gnu | dragonfly*)
|
2367
2314
|
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
2368
2315
|
case $host_cpu in
|
2369
2316
|
i*86 )
|
@@ -2401,7 +2348,7 @@ hpux10.20* | hpux11*)
|
|
2401
2348
|
esac
|
2402
2349
|
;;
|
2403
2350
|
|
2404
|
-
|
2351
|
+
interix3*)
|
2405
2352
|
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
|
2406
2353
|
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
|
2407
2354
|
;;
|
@@ -2417,7 +2364,7 @@ irix5* | irix6* | nonstopux*)
|
|
2417
2364
|
;;
|
2418
2365
|
|
2419
2366
|
# This must be Linux ELF.
|
2420
|
-
linux*
|
2367
|
+
linux*)
|
2421
2368
|
lt_cv_deplibs_check_method=pass_all
|
2422
2369
|
;;
|
2423
2370
|
|
@@ -2451,10 +2398,6 @@ osf3* | osf4* | osf5*)
|
|
2451
2398
|
lt_cv_deplibs_check_method=pass_all
|
2452
2399
|
;;
|
2453
2400
|
|
2454
|
-
rdos*)
|
2455
|
-
lt_cv_deplibs_check_method=pass_all
|
2456
|
-
;;
|
2457
|
-
|
2458
2401
|
solaris*)
|
2459
2402
|
lt_cv_deplibs_check_method=pass_all
|
2460
2403
|
;;
|
@@ -2507,7 +2450,7 @@ AC_DEFUN([AC_PROG_NM],
|
|
2507
2450
|
lt_cv_path_NM="$NM"
|
2508
2451
|
else
|
2509
2452
|
lt_nm_to_check="${ac_tool_prefix}nm"
|
2510
|
-
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
|
2453
|
+
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
|
2511
2454
|
lt_nm_to_check="$lt_nm_to_check nm"
|
2512
2455
|
fi
|
2513
2456
|
for lt_tmp_nm in $lt_nm_to_check; do
|
@@ -2723,10 +2666,10 @@ objext=o
|
|
2723
2666
|
_LT_AC_TAGVAR(objext, $1)=$objext
|
2724
2667
|
|
2725
2668
|
# Code to be used in simple compile tests
|
2726
|
-
lt_simple_compile_test_code="int some_variable = 0
|
2669
|
+
lt_simple_compile_test_code="int some_variable = 0;\n"
|
2727
2670
|
|
2728
2671
|
# Code to be used in simple link tests
|
2729
|
-
lt_simple_link_test_code='int main(){return(0);}'
|
2672
|
+
lt_simple_link_test_code='int main(){return(0);}\n'
|
2730
2673
|
|
2731
2674
|
_LT_AC_SYS_COMPILER
|
2732
2675
|
|
@@ -2828,10 +2771,10 @@ objext=o
|
|
2828
2771
|
_LT_AC_TAGVAR(objext, $1)=$objext
|
2829
2772
|
|
2830
2773
|
# Code to be used in simple compile tests
|
2831
|
-
lt_simple_compile_test_code="int some_variable = 0
|
2774
|
+
lt_simple_compile_test_code="int some_variable = 0;\n"
|
2832
2775
|
|
2833
2776
|
# Code to be used in simple link tests
|
2834
|
-
lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
|
2777
|
+
lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
|
2835
2778
|
|
2836
2779
|
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
|
2837
2780
|
_LT_AC_SYS_COMPILER
|
@@ -2977,7 +2920,7 @@ case $host_os in
|
|
2977
2920
|
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
2978
2921
|
then
|
2979
2922
|
# We have reworked collect2
|
2980
|
-
|
2923
|
+
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
2981
2924
|
else
|
2982
2925
|
# We have old collect2
|
2983
2926
|
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
|
@@ -3136,10 +3079,10 @@ case $host_os in
|
|
3136
3079
|
case $cc_basename in
|
3137
3080
|
xlc*)
|
3138
3081
|
output_verbose_link_cmd='echo'
|
3139
|
-
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $
|
3082
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
|
3140
3083
|
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
3141
3084
|
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
|
3142
|
-
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $
|
3085
|
+
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
3143
3086
|
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
3144
3087
|
;;
|
3145
3088
|
*)
|
@@ -3173,7 +3116,7 @@ case $host_os in
|
|
3173
3116
|
freebsd-elf*)
|
3174
3117
|
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
3175
3118
|
;;
|
3176
|
-
freebsd* | dragonfly*)
|
3119
|
+
freebsd* | kfreebsd*-gnu | dragonfly*)
|
3177
3120
|
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
|
3178
3121
|
# conventions
|
3179
3122
|
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
|
@@ -3222,7 +3165,9 @@ case $host_os in
|
|
3222
3165
|
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
3223
3166
|
|
3224
3167
|
case $host_cpu in
|
3225
|
-
hppa*64*|ia64*)
|
3168
|
+
hppa*64*|ia64*)
|
3169
|
+
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
|
3170
|
+
;;
|
3226
3171
|
*)
|
3227
3172
|
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
3228
3173
|
;;
|
@@ -3290,7 +3235,7 @@ case $host_os in
|
|
3290
3235
|
;;
|
3291
3236
|
esac
|
3292
3237
|
;;
|
3293
|
-
|
3238
|
+
interix3*)
|
3294
3239
|
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
3295
3240
|
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
3296
3241
|
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
@@ -3330,7 +3275,7 @@ case $host_os in
|
|
3330
3275
|
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
3331
3276
|
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
3332
3277
|
;;
|
3333
|
-
linux*
|
3278
|
+
linux*)
|
3334
3279
|
case $cc_basename in
|
3335
3280
|
KCC*)
|
3336
3281
|
# Kuck and Associates, Inc. (KAI) C++ Compiler
|
@@ -3410,29 +3355,6 @@ case $host_os in
|
|
3410
3355
|
# dependencies.
|
3411
3356
|
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
3412
3357
|
;;
|
3413
|
-
*)
|
3414
|
-
case `$CC -V 2>&1 | sed 5q` in
|
3415
|
-
*Sun\ C*)
|
3416
|
-
# Sun C++ 5.9
|
3417
|
-
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
|
3418
|
-
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
3419
|
-
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
|
3420
|
-
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
3421
|
-
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
|
3422
|
-
|
3423
|
-
# Not sure whether something based on
|
3424
|
-
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
|
3425
|
-
# would be better.
|
3426
|
-
output_verbose_link_cmd='echo'
|
3427
|
-
|
3428
|
-
# Archives containing C++ object files must be created using
|
3429
|
-
# "CC -xar", where "CC" is the Sun C++ compiler. This is
|
3430
|
-
# necessary to make sure instantiated templates are included
|
3431
|
-
# in the archive.
|
3432
|
-
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
|
3433
|
-
;;
|
3434
|
-
esac
|
3435
|
-
;;
|
3436
3358
|
esac
|
3437
3359
|
;;
|
3438
3360
|
lynxos*)
|
@@ -3471,20 +3393,16 @@ case $host_os in
|
|
3471
3393
|
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
3472
3394
|
;;
|
3473
3395
|
openbsd*)
|
3474
|
-
|
3475
|
-
|
3476
|
-
|
3477
|
-
|
3478
|
-
|
3479
|
-
|
3480
|
-
|
3481
|
-
|
3482
|
-
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
3483
|
-
fi
|
3484
|
-
output_verbose_link_cmd='echo'
|
3485
|
-
else
|
3486
|
-
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
3396
|
+
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
3397
|
+
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
3398
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
3399
|
+
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
3400
|
+
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
3401
|
+
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
|
3402
|
+
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
3403
|
+
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
3487
3404
|
fi
|
3405
|
+
output_verbose_link_cmd='echo'
|
3488
3406
|
;;
|
3489
3407
|
osf3*)
|
3490
3408
|
case $cc_basename in
|
@@ -3646,10 +3564,15 @@ case $host_os in
|
|
3646
3564
|
case $host_os in
|
3647
3565
|
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
|
3648
3566
|
*)
|
3649
|
-
# The compiler
|
3650
|
-
#
|
3567
|
+
# The C++ compiler is used as linker so we must use $wl
|
3568
|
+
# flag to pass the commands to the underlying system
|
3569
|
+
# linker. We must also pass each convience library through
|
3570
|
+
# to the system linker between allextract/defaultextract.
|
3571
|
+
# The C++ compiler will combine linker options so we
|
3572
|
+
# cannot just pass the convience library names through
|
3573
|
+
# without $wl.
|
3651
3574
|
# Supported since Solaris 2.6 (maybe 2.5.1?)
|
3652
|
-
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
|
3575
|
+
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
|
3653
3576
|
;;
|
3654
3577
|
esac
|
3655
3578
|
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
@@ -3696,12 +3619,6 @@ case $host_os in
|
|
3696
3619
|
fi
|
3697
3620
|
|
3698
3621
|
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
|
3699
|
-
case $host_os in
|
3700
|
-
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
|
3701
|
-
*)
|
3702
|
-
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
|
3703
|
-
;;
|
3704
|
-
esac
|
3705
3622
|
fi
|
3706
3623
|
;;
|
3707
3624
|
esac
|
@@ -3945,7 +3862,7 @@ $rm -f confest.$objext
|
|
3945
3862
|
# PORTME: override above test on systems where it is broken
|
3946
3863
|
ifelse([$1],[CXX],
|
3947
3864
|
[case $host_os in
|
3948
|
-
|
3865
|
+
interix3*)
|
3949
3866
|
# Interix 3.5 installs completely hosed .la files for C++, so rather than
|
3950
3867
|
# hack all around it, let's just trust "g++" to DTRT.
|
3951
3868
|
_LT_AC_TAGVAR(predep_objects,$1)=
|
@@ -3953,46 +3870,13 @@ interix[[3-9]]*)
|
|
3953
3870
|
_LT_AC_TAGVAR(postdeps,$1)=
|
3954
3871
|
;;
|
3955
3872
|
|
3956
|
-
linux*)
|
3957
|
-
case `$CC -V 2>&1 | sed 5q` in
|
3958
|
-
*Sun\ C*)
|
3959
|
-
# Sun C++ 5.9
|
3960
|
-
#
|
3961
|
-
# The more standards-conforming stlport4 library is
|
3962
|
-
# incompatible with the Cstd library. Avoid specifying
|
3963
|
-
# it if it's in CXXFLAGS. Ignore libCrun as
|
3964
|
-
# -library=stlport4 depends on it.
|
3965
|
-
case " $CXX $CXXFLAGS " in
|
3966
|
-
*" -library=stlport4 "*)
|
3967
|
-
solaris_use_stlport4=yes
|
3968
|
-
;;
|
3969
|
-
esac
|
3970
|
-
if test "$solaris_use_stlport4" != yes; then
|
3971
|
-
_LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
|
3972
|
-
fi
|
3973
|
-
;;
|
3974
|
-
esac
|
3975
|
-
;;
|
3976
|
-
|
3977
3873
|
solaris*)
|
3978
3874
|
case $cc_basename in
|
3979
3875
|
CC*)
|
3980
|
-
# The more standards-conforming stlport4 library is
|
3981
|
-
# incompatible with the Cstd library. Avoid specifying
|
3982
|
-
# it if it's in CXXFLAGS. Ignore libCrun as
|
3983
|
-
# -library=stlport4 depends on it.
|
3984
|
-
case " $CXX $CXXFLAGS " in
|
3985
|
-
*" -library=stlport4 "*)
|
3986
|
-
solaris_use_stlport4=yes
|
3987
|
-
;;
|
3988
|
-
esac
|
3989
|
-
|
3990
3876
|
# Adding this requires a known-good setup of shared libraries for
|
3991
3877
|
# Sun compiler versions before 5.6, else PIC objects from an old
|
3992
3878
|
# archive will be linked into the output, leading to subtle bugs.
|
3993
|
-
|
3994
|
-
_LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
|
3995
|
-
fi
|
3879
|
+
_LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
|
3996
3880
|
;;
|
3997
3881
|
esac
|
3998
3882
|
;;
|
@@ -4041,17 +3925,10 @@ objext=o
|
|
4041
3925
|
_LT_AC_TAGVAR(objext, $1)=$objext
|
4042
3926
|
|
4043
3927
|
# Code to be used in simple compile tests
|
4044
|
-
lt_simple_compile_test_code="\
|
4045
|
-
subroutine t
|
4046
|
-
return
|
4047
|
-
end
|
4048
|
-
"
|
3928
|
+
lt_simple_compile_test_code=" subroutine t\n return\n end\n"
|
4049
3929
|
|
4050
3930
|
# Code to be used in simple link tests
|
4051
|
-
lt_simple_link_test_code="\
|
4052
|
-
program t
|
4053
|
-
end
|
4054
|
-
"
|
3931
|
+
lt_simple_link_test_code=" program t\n end\n"
|
4055
3932
|
|
4056
3933
|
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
|
4057
3934
|
_LT_AC_SYS_COMPILER
|
@@ -4130,10 +4007,10 @@ objext=o
|
|
4130
4007
|
_LT_AC_TAGVAR(objext, $1)=$objext
|
4131
4008
|
|
4132
4009
|
# Code to be used in simple compile tests
|
4133
|
-
lt_simple_compile_test_code="class foo {}"
|
4010
|
+
lt_simple_compile_test_code="class foo {}\n"
|
4134
4011
|
|
4135
4012
|
# Code to be used in simple link tests
|
4136
|
-
lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
|
4013
|
+
lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
|
4137
4014
|
|
4138
4015
|
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
|
4139
4016
|
_LT_AC_SYS_COMPILER
|
@@ -4186,7 +4063,7 @@ objext=o
|
|
4186
4063
|
_LT_AC_TAGVAR(objext, $1)=$objext
|
4187
4064
|
|
4188
4065
|
# Code to be used in simple compile tests
|
4189
|
-
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
|
4066
|
+
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
|
4190
4067
|
|
4191
4068
|
# Code to be used in simple link tests
|
4192
4069
|
lt_simple_link_test_code="$lt_simple_compile_test_code"
|
@@ -4275,7 +4152,6 @@ if test -f "$ltmain"; then
|
|
4275
4152
|
_LT_AC_TAGVAR(module_cmds, $1) \
|
4276
4153
|
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
|
4277
4154
|
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
|
4278
|
-
_LT_AC_TAGVAR(fix_srcfile_path, $1) \
|
4279
4155
|
_LT_AC_TAGVAR(exclude_expsyms, $1) \
|
4280
4156
|
_LT_AC_TAGVAR(include_expsyms, $1); do
|
4281
4157
|
|
@@ -4322,7 +4198,7 @@ ifelse([$1], [],
|
|
4322
4198
|
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
|
4323
4199
|
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
4324
4200
|
#
|
4325
|
-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
|
4201
|
+
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
|
4326
4202
|
# Free Software Foundation, Inc.
|
4327
4203
|
#
|
4328
4204
|
# This file is part of GNU Libtool:
|
@@ -4647,7 +4523,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
|
|
4647
4523
|
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
|
4648
4524
|
|
4649
4525
|
# Fix the shell variable \$srcfile for the compiler.
|
4650
|
-
fix_srcfile_path
|
4526
|
+
fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
|
4651
4527
|
|
4652
4528
|
# Set to yes if exported symbols are required.
|
4653
4529
|
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
|
@@ -4730,7 +4606,6 @@ fi
|
|
4730
4606
|
# ---------------------------------
|
4731
4607
|
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
|
4732
4608
|
[AC_REQUIRE([AC_CANONICAL_HOST])
|
4733
|
-
AC_REQUIRE([LT_AC_PROG_SED])
|
4734
4609
|
AC_REQUIRE([AC_PROG_NM])
|
4735
4610
|
AC_REQUIRE([AC_OBJEXT])
|
4736
4611
|
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
@@ -4767,7 +4642,7 @@ hpux*) # Its linker distinguishes data from code symbols
|
|
4767
4642
|
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
|
4768
4643
|
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
|
4769
4644
|
;;
|
4770
|
-
linux*
|
4645
|
+
linux*)
|
4771
4646
|
if test "$host_cpu" = ia64; then
|
4772
4647
|
symcode='[[ABCDGIRSTW]]'
|
4773
4648
|
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
|
@@ -4957,14 +4832,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
4957
4832
|
# like `-m68040'.
|
4958
4833
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
4959
4834
|
;;
|
4960
|
-
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
4835
|
+
beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
4961
4836
|
# PIC is the default for these OSes.
|
4962
4837
|
;;
|
4963
|
-
mingw* |
|
4838
|
+
mingw* | os2* | pw32*)
|
4964
4839
|
# This hack is so that the source file can tell whether it is being
|
4965
4840
|
# built for inclusion in a dll (and should export symbols for example).
|
4966
|
-
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
4967
|
-
# (--disable-auto-import) libraries
|
4968
4841
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
4969
4842
|
;;
|
4970
4843
|
darwin* | rhapsody*)
|
@@ -4976,7 +4849,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
4976
4849
|
# DJGPP does not support shared libraries at all
|
4977
4850
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
|
4978
4851
|
;;
|
4979
|
-
|
4852
|
+
interix3*)
|
4980
4853
|
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
|
4981
4854
|
# Instead, we relocate shared libraries at runtime.
|
4982
4855
|
;;
|
@@ -5042,7 +4915,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5042
4915
|
;;
|
5043
4916
|
esac
|
5044
4917
|
;;
|
5045
|
-
freebsd* | dragonfly*)
|
4918
|
+
freebsd* | kfreebsd*-gnu | dragonfly*)
|
5046
4919
|
# FreeBSD uses GNU C++
|
5047
4920
|
;;
|
5048
4921
|
hpux9* | hpux10* | hpux11*)
|
@@ -5085,7 +4958,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5085
4958
|
;;
|
5086
4959
|
esac
|
5087
4960
|
;;
|
5088
|
-
linux*
|
4961
|
+
linux*)
|
5089
4962
|
case $cc_basename in
|
5090
4963
|
KCC*)
|
5091
4964
|
# KAI C++ Compiler
|
@@ -5112,14 +4985,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5112
4985
|
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
5113
4986
|
;;
|
5114
4987
|
*)
|
5115
|
-
case `$CC -V 2>&1 | sed 5q` in
|
5116
|
-
*Sun\ C*)
|
5117
|
-
# Sun C++ 5.9
|
5118
|
-
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
5119
|
-
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
5120
|
-
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
|
5121
|
-
;;
|
5122
|
-
esac
|
5123
4988
|
;;
|
5124
4989
|
esac
|
5125
4990
|
;;
|
@@ -5240,15 +5105,13 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5240
5105
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
5241
5106
|
;;
|
5242
5107
|
|
5243
|
-
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
5108
|
+
beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
5244
5109
|
# PIC is the default for these OSes.
|
5245
5110
|
;;
|
5246
5111
|
|
5247
|
-
mingw* |
|
5112
|
+
mingw* | pw32* | os2*)
|
5248
5113
|
# This hack is so that the source file can tell whether it is being
|
5249
5114
|
# built for inclusion in a dll (and should export symbols for example).
|
5250
|
-
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
5251
|
-
# (--disable-auto-import) libraries
|
5252
5115
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
5253
5116
|
;;
|
5254
5117
|
|
@@ -5258,7 +5121,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5258
5121
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
|
5259
5122
|
;;
|
5260
5123
|
|
5261
|
-
|
5124
|
+
interix3*)
|
5262
5125
|
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
|
5263
5126
|
# Instead, we relocate shared libraries at runtime.
|
5264
5127
|
;;
|
@@ -5316,7 +5179,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5316
5179
|
esac
|
5317
5180
|
;;
|
5318
5181
|
|
5319
|
-
mingw* |
|
5182
|
+
mingw* | pw32* | os2*)
|
5320
5183
|
# This hack is so that the source file can tell whether it is being
|
5321
5184
|
# built for inclusion in a dll (and should export symbols for example).
|
5322
5185
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
@@ -5349,7 +5212,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5349
5212
|
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
5350
5213
|
;;
|
5351
5214
|
|
5352
|
-
linux*
|
5215
|
+
linux*)
|
5353
5216
|
case $cc_basename in
|
5354
5217
|
icc* | ecc*)
|
5355
5218
|
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
@@ -5368,22 +5231,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5368
5231
|
# All Alpha code is PIC.
|
5369
5232
|
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
5370
5233
|
;;
|
5371
|
-
*)
|
5372
|
-
case `$CC -V 2>&1 | sed 5q` in
|
5373
|
-
*Sun\ C*)
|
5374
|
-
# Sun C 5.9
|
5375
|
-
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
5376
|
-
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
5377
|
-
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
5378
|
-
;;
|
5379
|
-
*Sun\ F*)
|
5380
|
-
# Sun Fortran 8.3 passes all unrecognized flags to the linker
|
5381
|
-
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
5382
|
-
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
5383
|
-
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
|
5384
|
-
;;
|
5385
|
-
esac
|
5386
|
-
;;
|
5387
5234
|
esac
|
5388
5235
|
;;
|
5389
5236
|
|
@@ -5393,10 +5240,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|
5393
5240
|
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
5394
5241
|
;;
|
5395
5242
|
|
5396
|
-
rdos*)
|
5397
|
-
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
5398
|
-
;;
|
5399
|
-
|
5400
5243
|
solaris*)
|
5401
5244
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
5402
5245
|
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
@@ -5491,8 +5334,7 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
|
|
5491
5334
|
# ------------------------------------
|
5492
5335
|
# See if the linker supports building shared libraries.
|
5493
5336
|
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
|
5494
|
-
[
|
5495
|
-
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
5337
|
+
[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
5496
5338
|
ifelse([$1],[CXX],[
|
5497
5339
|
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
5498
5340
|
case $host_os in
|
@@ -5509,7 +5351,7 @@ ifelse([$1],[CXX],[
|
|
5509
5351
|
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
5510
5352
|
;;
|
5511
5353
|
cygwin* | mingw*)
|
5512
|
-
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]]
|
5354
|
+
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
|
5513
5355
|
;;
|
5514
5356
|
*)
|
5515
5357
|
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
@@ -5648,7 +5490,7 @@ EOF
|
|
5648
5490
|
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
|
5649
5491
|
_LT_AC_TAGVAR(always_export_symbols, $1)=no
|
5650
5492
|
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
5651
|
-
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]]
|
5493
|
+
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
|
5652
5494
|
|
5653
5495
|
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
5654
5496
|
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
@@ -5666,7 +5508,7 @@ EOF
|
|
5666
5508
|
fi
|
5667
5509
|
;;
|
5668
5510
|
|
5669
|
-
|
5511
|
+
interix3*)
|
5670
5512
|
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
5671
5513
|
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
5672
5514
|
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
@@ -5681,7 +5523,7 @@ EOF
|
|
5681
5523
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
5682
5524
|
;;
|
5683
5525
|
|
5684
|
-
|
5526
|
+
linux*)
|
5685
5527
|
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
5686
5528
|
tmp_addflag=
|
5687
5529
|
case $cc_basename,$host_cpu in
|
@@ -5699,22 +5541,13 @@ EOF
|
|
5699
5541
|
ifc* | ifort*) # Intel Fortran compiler
|
5700
5542
|
tmp_addflag=' -nofor_main' ;;
|
5701
5543
|
esac
|
5702
|
-
|
5703
|
-
*Sun\ C*) # Sun C 5.9
|
5704
|
-
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
|
5705
|
-
tmp_sharedflag='-G' ;;
|
5706
|
-
*Sun\ F*) # Sun Fortran 8.3
|
5707
|
-
tmp_sharedflag='-G' ;;
|
5708
|
-
*)
|
5709
|
-
tmp_sharedflag='-shared' ;;
|
5710
|
-
esac
|
5711
|
-
_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
5544
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
5712
5545
|
|
5713
5546
|
if test $supports_anon_versioning = yes; then
|
5714
5547
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
|
5715
5548
|
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
5716
5549
|
$echo "local: *; };" >> $output_objdir/$libname.ver~
|
5717
|
-
$CC '"$
|
5550
|
+
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
|
5718
5551
|
fi
|
5719
5552
|
else
|
5720
5553
|
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
@@ -5754,7 +5587,7 @@ EOF
|
|
5754
5587
|
|
5755
5588
|
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
|
5756
5589
|
case `$LD -v 2>&1` in
|
5757
|
-
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
|
5590
|
+
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
|
5758
5591
|
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
5759
5592
|
cat <<_LT_EOF 1>&2
|
5760
5593
|
|
@@ -5873,7 +5706,7 @@ _LT_EOF
|
|
5873
5706
|
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
5874
5707
|
then
|
5875
5708
|
# We have reworked collect2
|
5876
|
-
|
5709
|
+
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
5877
5710
|
else
|
5878
5711
|
# We have old collect2
|
5879
5712
|
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
|
@@ -5966,7 +5799,7 @@ _LT_EOF
|
|
5966
5799
|
# The linker will automatically build a .lib file if we build a DLL.
|
5967
5800
|
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
|
5968
5801
|
# FIXME: Should let the user specify the lib program.
|
5969
|
-
_LT_AC_TAGVAR(old_archive_cmds, $1)='lib
|
5802
|
+
_LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
|
5970
5803
|
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
|
5971
5804
|
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
5972
5805
|
;;
|
@@ -6008,10 +5841,10 @@ _LT_EOF
|
|
6008
5841
|
case $cc_basename in
|
6009
5842
|
xlc*)
|
6010
5843
|
output_verbose_link_cmd='echo'
|
6011
|
-
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $
|
5844
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
|
6012
5845
|
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
6013
5846
|
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
|
6014
|
-
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $
|
5847
|
+
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
6015
5848
|
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
6016
5849
|
;;
|
6017
5850
|
*)
|
@@ -6051,7 +5884,7 @@ _LT_EOF
|
|
6051
5884
|
;;
|
6052
5885
|
|
6053
5886
|
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
6054
|
-
freebsd* | dragonfly*)
|
5887
|
+
freebsd* | kfreebsd*-gnu | dragonfly*)
|
6055
5888
|
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
|
6056
5889
|
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
6057
5890
|
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
@@ -6173,28 +6006,24 @@ _LT_EOF
|
|
6173
6006
|
;;
|
6174
6007
|
|
6175
6008
|
openbsd*)
|
6176
|
-
|
6177
|
-
|
6178
|
-
|
6179
|
-
|
6180
|
-
|
6181
|
-
|
6182
|
-
|
6183
|
-
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
6184
|
-
else
|
6185
|
-
case $host_os in
|
6186
|
-
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
6187
|
-
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
6188
|
-
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
6189
|
-
;;
|
6190
|
-
*)
|
6191
|
-
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
6192
|
-
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
6193
|
-
;;
|
6194
|
-
esac
|
6195
|
-
fi
|
6009
|
+
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
6010
|
+
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
6011
|
+
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
6012
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
6013
|
+
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
|
6014
|
+
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
6015
|
+
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
6196
6016
|
else
|
6197
|
-
|
6017
|
+
case $host_os in
|
6018
|
+
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
6019
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
6020
|
+
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
6021
|
+
;;
|
6022
|
+
*)
|
6023
|
+
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
6024
|
+
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
6025
|
+
;;
|
6026
|
+
esac
|
6198
6027
|
fi
|
6199
6028
|
;;
|
6200
6029
|
|
@@ -6253,16 +6082,17 @@ _LT_EOF
|
|
6253
6082
|
case $host_os in
|
6254
6083
|
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
|
6255
6084
|
*)
|
6256
|
-
|
6257
|
-
|
6258
|
-
|
6085
|
+
# The compiler driver will combine linker options so we
|
6086
|
+
# cannot just pass the convience library names through
|
6087
|
+
# without $wl, iff we do not link with $LD.
|
6088
|
+
# Luckily, gcc supports the same syntax we need for Sun Studio.
|
6259
6089
|
# Supported since Solaris 2.6 (maybe 2.5.1?)
|
6260
|
-
|
6261
|
-
|
6262
|
-
|
6263
|
-
|
6264
|
-
|
6265
|
-
|
6090
|
+
case $wlarc in
|
6091
|
+
'')
|
6092
|
+
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
|
6093
|
+
*)
|
6094
|
+
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
|
6095
|
+
esac ;;
|
6266
6096
|
esac
|
6267
6097
|
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
6268
6098
|
;;
|
@@ -6319,7 +6149,7 @@ _LT_EOF
|
|
6319
6149
|
fi
|
6320
6150
|
;;
|
6321
6151
|
|
6322
|
-
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*
|
6152
|
+
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
|
6323
6153
|
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
|
6324
6154
|
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
6325
6155
|
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
@@ -6394,7 +6224,7 @@ x|xyes)
|
|
6394
6224
|
# to ld, don't add -lc before -lgcc.
|
6395
6225
|
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
|
6396
6226
|
$rm conftest*
|
6397
|
-
|
6227
|
+
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
6398
6228
|
|
6399
6229
|
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
|
6400
6230
|
soname=conftest
|
@@ -6497,30 +6327,6 @@ AC_DEFUN([LT_AC_PROG_RC],
|
|
6497
6327
|
[AC_CHECK_TOOL(RC, windres, no)
|
6498
6328
|
])
|
6499
6329
|
|
6500
|
-
|
6501
|
-
# Cheap backport of AS_EXECUTABLE_P and required macros
|
6502
|
-
# from Autoconf 2.59; we should not use $as_executable_p directly.
|
6503
|
-
|
6504
|
-
# _AS_TEST_PREPARE
|
6505
|
-
# ----------------
|
6506
|
-
m4_ifndef([_AS_TEST_PREPARE],
|
6507
|
-
[m4_defun([_AS_TEST_PREPARE],
|
6508
|
-
[if test -x / >/dev/null 2>&1; then
|
6509
|
-
as_executable_p='test -x'
|
6510
|
-
else
|
6511
|
-
as_executable_p='test -f'
|
6512
|
-
fi
|
6513
|
-
])])# _AS_TEST_PREPARE
|
6514
|
-
|
6515
|
-
# AS_EXECUTABLE_P
|
6516
|
-
# ---------------
|
6517
|
-
# Check whether a file is executable.
|
6518
|
-
m4_ifndef([AS_EXECUTABLE_P],
|
6519
|
-
[m4_defun([AS_EXECUTABLE_P],
|
6520
|
-
[AS_REQUIRE([_AS_TEST_PREPARE])dnl
|
6521
|
-
$as_executable_p $1[]dnl
|
6522
|
-
])])# AS_EXECUTABLE_P
|
6523
|
-
|
6524
6330
|
# NOTE: This macro has been submitted for inclusion into #
|
6525
6331
|
# GNU Autoconf as AC_PROG_SED. When it is available in #
|
6526
6332
|
# a released version of Autoconf we should remove this #
|
@@ -6541,13 +6347,12 @@ do
|
|
6541
6347
|
test -z "$as_dir" && as_dir=.
|
6542
6348
|
for lt_ac_prog in sed gsed; do
|
6543
6349
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
6544
|
-
if
|
6350
|
+
if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
|
6545
6351
|
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
|
6546
6352
|
fi
|
6547
6353
|
done
|
6548
6354
|
done
|
6549
6355
|
done
|
6550
|
-
IFS=$as_save_IFS
|
6551
6356
|
lt_ac_max=0
|
6552
6357
|
lt_ac_count=0
|
6553
6358
|
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
|
@@ -6580,11 +6385,10 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
|
|
6580
6385
|
done
|
6581
6386
|
])
|
6582
6387
|
SED=$lt_cv_path_SED
|
6583
|
-
AC_SUBST([SED])
|
6584
6388
|
AC_MSG_RESULT([$SED])
|
6585
6389
|
])
|
6586
6390
|
|
6587
|
-
# Copyright (C) 2002, 2003, 2005
|
6391
|
+
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
6588
6392
|
#
|
6589
6393
|
# This file is free software; the Free Software Foundation
|
6590
6394
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -6594,29 +6398,14 @@ AC_MSG_RESULT([$SED])
|
|
6594
6398
|
# ----------------------------
|
6595
6399
|
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
6596
6400
|
# generated from the m4 files accompanying Automake X.Y.
|
6597
|
-
|
6598
|
-
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
6599
|
-
[am__api_version='1.10'
|
6600
|
-
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
6601
|
-
dnl require some minimum version. Point them to the right macro.
|
6602
|
-
m4_if([$1], [1.10], [],
|
6603
|
-
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
6604
|
-
])
|
6605
|
-
|
6606
|
-
# _AM_AUTOCONF_VERSION(VERSION)
|
6607
|
-
# -----------------------------
|
6608
|
-
# aclocal traces this macro to find the Autoconf version.
|
6609
|
-
# This is a private macro too. Using m4_define simplifies
|
6610
|
-
# the logic in aclocal, which can simply ignore this definition.
|
6611
|
-
m4_define([_AM_AUTOCONF_VERSION], [])
|
6401
|
+
AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
6612
6402
|
|
6613
6403
|
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
6614
6404
|
# -------------------------------
|
6615
|
-
# Call AM_AUTOMAKE_VERSION
|
6405
|
+
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
6616
6406
|
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
6617
6407
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
6618
|
-
[AM_AUTOMAKE_VERSION([1.
|
6619
|
-
_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
|
6408
|
+
[AM_AUTOMAKE_VERSION([1.9.6])])
|
6620
6409
|
|
6621
6410
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
6622
6411
|
|
@@ -6673,14 +6462,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
6673
6462
|
|
6674
6463
|
# AM_CONDITIONAL -*- Autoconf -*-
|
6675
6464
|
|
6676
|
-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
6465
|
+
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
6677
6466
|
# Free Software Foundation, Inc.
|
6678
6467
|
#
|
6679
6468
|
# This file is free software; the Free Software Foundation
|
6680
6469
|
# gives unlimited permission to copy and/or distribute it,
|
6681
6470
|
# with or without modifications, as long as this notice is preserved.
|
6682
6471
|
|
6683
|
-
# serial
|
6472
|
+
# serial 7
|
6684
6473
|
|
6685
6474
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
6686
6475
|
# -------------------------------------
|
@@ -6689,10 +6478,8 @@ AC_DEFUN([AM_CONDITIONAL],
|
|
6689
6478
|
[AC_PREREQ(2.52)dnl
|
6690
6479
|
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
6691
6480
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
6692
|
-
AC_SUBST([$1_TRUE])
|
6693
|
-
AC_SUBST([$1_FALSE])
|
6694
|
-
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
6695
|
-
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
6481
|
+
AC_SUBST([$1_TRUE])
|
6482
|
+
AC_SUBST([$1_FALSE])
|
6696
6483
|
if $2; then
|
6697
6484
|
$1_TRUE=
|
6698
6485
|
$1_FALSE='#'
|
@@ -6706,14 +6493,15 @@ AC_CONFIG_COMMANDS_PRE(
|
|
6706
6493
|
Usually this means the macro was only invoked conditionally.]])
|
6707
6494
|
fi])])
|
6708
6495
|
|
6709
|
-
|
6496
|
+
|
6497
|
+
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
6710
6498
|
# Free Software Foundation, Inc.
|
6711
6499
|
#
|
6712
6500
|
# This file is free software; the Free Software Foundation
|
6713
6501
|
# gives unlimited permission to copy and/or distribute it,
|
6714
6502
|
# with or without modifications, as long as this notice is preserved.
|
6715
6503
|
|
6716
|
-
# serial
|
6504
|
+
# serial 8
|
6717
6505
|
|
6718
6506
|
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
6719
6507
|
# written in clear, in which case automake, when reading aclocal.m4,
|
@@ -6741,7 +6529,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
|
|
6741
6529
|
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
|
6742
6530
|
[$1], CXX, [depcc="$CXX" am_compiler_list=],
|
6743
6531
|
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
|
6744
|
-
[$1], UPC, [depcc="$UPC" am_compiler_list=],
|
6745
6532
|
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
|
6746
6533
|
[depcc="$$1" am_compiler_list=])
|
6747
6534
|
|
@@ -6807,7 +6594,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
6807
6594
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
6808
6595
|
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
6809
6596
|
>/dev/null 2>conftest.err &&
|
6810
|
-
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
6811
6597
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
6812
6598
|
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
6813
6599
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
@@ -6860,8 +6646,7 @@ if test "x$enable_dependency_tracking" != xno; then
|
|
6860
6646
|
AMDEPBACKSLASH='\'
|
6861
6647
|
fi
|
6862
6648
|
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
6863
|
-
AC_SUBST([AMDEPBACKSLASH])
|
6864
|
-
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
6649
|
+
AC_SUBST([AMDEPBACKSLASH])
|
6865
6650
|
])
|
6866
6651
|
|
6867
6652
|
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
@@ -6886,9 +6671,8 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
6886
6671
|
# some people rename them; so instead we look at the file content.
|
6887
6672
|
# Grep'ing the first line is not enough: some people post-process
|
6888
6673
|
# each Makefile.in and add a new line on top of each file to say so.
|
6889
|
-
#
|
6890
|
-
|
6891
|
-
if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
|
6674
|
+
# So let's grep whole file.
|
6675
|
+
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
6892
6676
|
dirpart=`AS_DIRNAME("$mf")`
|
6893
6677
|
else
|
6894
6678
|
continue
|
@@ -6935,8 +6719,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
6935
6719
|
|
6936
6720
|
# Do all the work for Automake. -*- Autoconf -*-
|
6937
6721
|
|
6938
|
-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
6939
|
-
#
|
6722
|
+
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
6723
|
+
# Free Software Foundation, Inc.
|
6940
6724
|
#
|
6941
6725
|
# This file is free software; the Free Software Foundation
|
6942
6726
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -6959,20 +6743,16 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
6959
6743
|
# arguments mandatory, and then we can depend on a new Autoconf
|
6960
6744
|
# release and drop the old call support.
|
6961
6745
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
6962
|
-
[AC_PREREQ([2.
|
6746
|
+
[AC_PREREQ([2.58])dnl
|
6963
6747
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
6964
6748
|
dnl the ones we care about.
|
6965
6749
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
6966
6750
|
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
6967
6751
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
6968
|
-
|
6969
|
-
|
6970
|
-
|
6971
|
-
|
6972
|
-
# test to see if srcdir already configured
|
6973
|
-
if test -f $srcdir/config.status; then
|
6974
|
-
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
6975
|
-
fi
|
6752
|
+
# test to see if srcdir already configured
|
6753
|
+
if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
6754
|
+
test -f $srcdir/config.status; then
|
6755
|
+
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
6976
6756
|
fi
|
6977
6757
|
|
6978
6758
|
# test whether we have cygpath
|
@@ -6992,9 +6772,6 @@ m4_ifval([$2],
|
|
6992
6772
|
AC_SUBST([PACKAGE], [$1])dnl
|
6993
6773
|
AC_SUBST([VERSION], [$2])],
|
6994
6774
|
[_AM_SET_OPTIONS([$1])dnl
|
6995
|
-
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
|
6996
|
-
m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
|
6997
|
-
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
|
6998
6775
|
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
6999
6776
|
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
7000
6777
|
|
@@ -7030,10 +6807,6 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
7030
6807
|
[_AM_DEPENDENCIES(CXX)],
|
7031
6808
|
[define([AC_PROG_CXX],
|
7032
6809
|
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
7033
|
-
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
7034
|
-
[_AM_DEPENDENCIES(OBJC)],
|
7035
|
-
[define([AC_PROG_OBJC],
|
7036
|
-
defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
7037
6810
|
])
|
7038
6811
|
])
|
7039
6812
|
|
@@ -7069,7 +6842,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
|
7069
6842
|
# Define $install_sh.
|
7070
6843
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
7071
6844
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
7072
|
-
install_sh=${install_sh-"
|
6845
|
+
install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
7073
6846
|
AC_SUBST(install_sh)])
|
7074
6847
|
|
7075
6848
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
@@ -7176,14 +6949,14 @@ rm -f confinc confmf
|
|
7176
6949
|
|
7177
6950
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
7178
6951
|
|
7179
|
-
# Copyright (C) 1997, 1999, 2000, 2001, 2003,
|
6952
|
+
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
7180
6953
|
# Free Software Foundation, Inc.
|
7181
6954
|
#
|
7182
6955
|
# This file is free software; the Free Software Foundation
|
7183
6956
|
# gives unlimited permission to copy and/or distribute it,
|
7184
6957
|
# with or without modifications, as long as this notice is preserved.
|
7185
6958
|
|
7186
|
-
# serial
|
6959
|
+
# serial 4
|
7187
6960
|
|
7188
6961
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
7189
6962
|
# ------------------------------
|
@@ -7199,7 +6972,6 @@ AC_SUBST($1)])
|
|
7199
6972
|
# If it does, set am_missing_run to use it, otherwise, to nothing.
|
7200
6973
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
7201
6974
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
7202
|
-
AC_REQUIRE_AUX_FILE([missing])dnl
|
7203
6975
|
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
7204
6976
|
# Use eval to expand $SHELL
|
7205
6977
|
if eval "$MISSING --run true"; then
|
@@ -7210,7 +6982,7 @@ else
|
|
7210
6982
|
fi
|
7211
6983
|
])
|
7212
6984
|
|
7213
|
-
# Copyright (C) 2003, 2004, 2005
|
6985
|
+
# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
7214
6986
|
#
|
7215
6987
|
# This file is free software; the Free Software Foundation
|
7216
6988
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -7218,23 +6990,60 @@ fi
|
|
7218
6990
|
|
7219
6991
|
# AM_PROG_MKDIR_P
|
7220
6992
|
# ---------------
|
7221
|
-
# Check
|
6993
|
+
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
|
6994
|
+
#
|
6995
|
+
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
|
6996
|
+
# created by `make install' are always world readable, even if the
|
6997
|
+
# installer happens to have an overly restrictive umask (e.g. 077).
|
6998
|
+
# This was a mistake. There are at least two reasons why we must not
|
6999
|
+
# use `-m 0755':
|
7000
|
+
# - it causes special bits like SGID to be ignored,
|
7001
|
+
# - it may be too restrictive (some setups expect 775 directories).
|
7002
|
+
#
|
7003
|
+
# Do not use -m 0755 and let people choose whatever they expect by
|
7004
|
+
# setting umask.
|
7005
|
+
#
|
7006
|
+
# We cannot accept any implementation of `mkdir' that recognizes `-p'.
|
7007
|
+
# Some implementations (such as Solaris 8's) are not thread-safe: if a
|
7008
|
+
# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
|
7009
|
+
# concurrently, both version can detect that a/ is missing, but only
|
7010
|
+
# one can create it and the other will error out. Consequently we
|
7011
|
+
# restrict ourselves to GNU make (using the --version option ensures
|
7012
|
+
# this.)
|
7222
7013
|
AC_DEFUN([AM_PROG_MKDIR_P],
|
7223
|
-
[
|
7224
|
-
|
7225
|
-
|
7226
|
-
|
7227
|
-
|
7228
|
-
|
7229
|
-
|
7230
|
-
|
7231
|
-
|
7232
|
-
|
7233
|
-
|
7234
|
-
|
7235
|
-
|
7236
|
-
|
7237
|
-
|
7014
|
+
[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
7015
|
+
# We used to keeping the `.' as first argument, in order to
|
7016
|
+
# allow $(mkdir_p) to be used without argument. As in
|
7017
|
+
# $(mkdir_p) $(somedir)
|
7018
|
+
# where $(somedir) is conditionally defined. However this is wrong
|
7019
|
+
# for two reasons:
|
7020
|
+
# 1. if the package is installed by a user who cannot write `.'
|
7021
|
+
# make install will fail,
|
7022
|
+
# 2. the above comment should most certainly read
|
7023
|
+
# $(mkdir_p) $(DESTDIR)$(somedir)
|
7024
|
+
# so it does not work when $(somedir) is undefined and
|
7025
|
+
# $(DESTDIR) is not.
|
7026
|
+
# To support the latter case, we have to write
|
7027
|
+
# test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
|
7028
|
+
# so the `.' trick is pointless.
|
7029
|
+
mkdir_p='mkdir -p --'
|
7030
|
+
else
|
7031
|
+
# On NextStep and OpenStep, the `mkdir' command does not
|
7032
|
+
# recognize any option. It will interpret all options as
|
7033
|
+
# directories to create, and then abort because `.' already
|
7034
|
+
# exists.
|
7035
|
+
for d in ./-p ./--version;
|
7036
|
+
do
|
7037
|
+
test -d $d && rmdir $d
|
7038
|
+
done
|
7039
|
+
# $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
|
7040
|
+
if test -f "$ac_aux_dir/mkinstalldirs"; then
|
7041
|
+
mkdir_p='$(mkinstalldirs)'
|
7042
|
+
else
|
7043
|
+
mkdir_p='$(install_sh) -d'
|
7044
|
+
fi
|
7045
|
+
fi
|
7046
|
+
AC_SUBST([mkdir_p])])
|
7238
7047
|
|
7239
7048
|
# Helper functions for option handling. -*- Autoconf -*-
|
7240
7049
|
|
@@ -7346,21 +7155,9 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
|
7346
7155
|
if test "$cross_compiling" != no; then
|
7347
7156
|
AC_CHECK_TOOL([STRIP], [strip], :)
|
7348
7157
|
fi
|
7349
|
-
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
7158
|
+
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
7350
7159
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
7351
7160
|
|
7352
|
-
# Copyright (C) 2006 Free Software Foundation, Inc.
|
7353
|
-
#
|
7354
|
-
# This file is free software; the Free Software Foundation
|
7355
|
-
# gives unlimited permission to copy and/or distribute it,
|
7356
|
-
# with or without modifications, as long as this notice is preserved.
|
7357
|
-
|
7358
|
-
# _AM_SUBST_NOTMAKE(VARIABLE)
|
7359
|
-
# ---------------------------
|
7360
|
-
# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
|
7361
|
-
# This macro is traced by Automake.
|
7362
|
-
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
7363
|
-
|
7364
7161
|
# Check how to create a tarball. -*- Autoconf -*-
|
7365
7162
|
|
7366
7163
|
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|