aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libltdl/aclocal.m4951
-rwxr-xr-xlibltdl/config.guess525
-rwxr-xr-xlibltdl/config.sub50
-rwxr-xr-xlibltdl/configure1764
-rw-r--r--libltdl/ltmain.sh716
-rw-r--r--ltmain.sh716
-rw-r--r--po/Makefile.in2
-rw-r--r--src/plugins/fs/namespace.c4
-rw-r--r--src/plugins/fs/search.c2
9 files changed, 2891 insertions, 1839 deletions
diff --git a/libltdl/aclocal.m4 b/libltdl/aclocal.m4
index f83c9b74..2c8d3ea4 100644
--- a/libltdl/aclocal.m4
+++ b/libltdl/aclocal.m4
@@ -13,8 +13,7 @@
13 13
14# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 14# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
15 15
16# serial 47 AC_PROG_LIBTOOL 16# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
17# Debian $Rev: 214 $
18 17
19 18
20# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) 19# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -124,7 +123,7 @@ esac
124 123
125# Sed substitution that helps us do robust quoting. It backslashifies 124# Sed substitution that helps us do robust quoting. It backslashifies
126# metacharacters that are still active within double-quoted strings. 125# metacharacters that are still active within double-quoted strings.
127Xsed='sed -e s/^X//' 126Xsed='sed -e 1s/^X//'
128[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] 127[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
129 128
130# Same as above, but do not quote variable references. 129# Same as above, but do not quote variable references.
@@ -144,7 +143,7 @@ rm="rm -f"
144default_ofile=libtool 143default_ofile=libtool
145can_build_shared=yes 144can_build_shared=yes
146 145
147# All known linkers require a `.a' archive for static linking (except M$VC, 146# All known linkers require a `.a' archive for static linking (except MSVC,
148# which needs '.lib'). 147# which needs '.lib').
149libext=a 148libext=a
150ltmain="$ac_aux_dir/ltmain.sh" 149ltmain="$ac_aux_dir/ltmain.sh"
@@ -192,6 +191,8 @@ if test -n "$RANLIB"; then
192 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" 191 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
193fi 192fi
194 193
194_LT_CC_BASENAME([$compiler])
195
195# Only perform the check for file, if the check method requires it 196# Only perform the check for file, if the check method requires it
196case $deplibs_check_method in 197case $deplibs_check_method in
197file_magic*) 198file_magic*)
@@ -237,6 +238,48 @@ compiler=$CC
237])# _LT_AC_SYS_COMPILER 238])# _LT_AC_SYS_COMPILER
238 239
239 240
241# _LT_CC_BASENAME(CC)
242# -------------------
243# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
244AC_DEFUN([_LT_CC_BASENAME],
245[for cc_temp in $1""; do
246 case $cc_temp in
247 compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
248 distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
249 \-*) ;;
250 *) break;;
251 esac
252done
253cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
254])
255
256
257# _LT_COMPILER_BOILERPLATE
258# ------------------------
259# Check for compiler boilerplate output or warnings with
260# the simple compiler test code.
261AC_DEFUN([_LT_COMPILER_BOILERPLATE],
262[ac_outfile=conftest.$ac_objext
263printf "$lt_simple_compile_test_code" >conftest.$ac_ext
264eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
265_lt_compiler_boilerplate=`cat conftest.err`
266$rm conftest*
267])# _LT_COMPILER_BOILERPLATE
268
269
270# _LT_LINKER_BOILERPLATE
271# ----------------------
272# Check for linker boilerplate output or warnings with
273# the simple link test code.
274AC_DEFUN([_LT_LINKER_BOILERPLATE],
275[ac_outfile=conftest.$ac_objext
276printf "$lt_simple_link_test_code" >conftest.$ac_ext
277eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
278_lt_linker_boilerplate=`cat conftest.err`
279$rm conftest*
280])# _LT_LINKER_BOILERPLATE
281
282
240# _LT_AC_SYS_LIBPATH_AIX 283# _LT_AC_SYS_LIBPATH_AIX
241# ---------------------- 284# ----------------------
242# Links a minimal program and checks the executable 285# Links a minimal program and checks the executable
@@ -309,15 +352,15 @@ fi
309 352
310# The HP-UX ksh and POSIX shell print the target directory to stdout 353# The HP-UX ksh and POSIX shell print the target directory to stdout
311# if CDPATH is set. 354# if CDPATH is set.
312if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi 355(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
313 356
314if test -z "$ECHO"; then 357if test -z "$ECHO"; then
315if test "X${echo_test_string+set}" != Xset; then 358if test "X${echo_test_string+set}" != Xset; then
316# find a string as large as possible, as long as the shell can cope with it 359# find a string as large as possible, as long as the shell can cope with it
317 for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do 360 for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
318 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... 361 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
319 if (echo_test_string="`eval $cmd`") 2>/dev/null && 362 if (echo_test_string=`eval $cmd`) 2>/dev/null &&
320 echo_test_string="`eval $cmd`" && 363 echo_test_string=`eval $cmd` &&
321 (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null 364 (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
322 then 365 then
323 break 366 break
@@ -486,7 +529,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
486 # Find out which ABI we are using. 529 # Find out which ABI we are using.
487 echo 'int i;' > conftest.$ac_ext 530 echo 'int i;' > conftest.$ac_ext
488 if AC_TRY_EVAL(ac_compile); then 531 if AC_TRY_EVAL(ac_compile); then
489 case "`/usr/bin/file conftest.o`" in 532 case `/usr/bin/file conftest.o` in
490 *32-bit*) 533 *32-bit*)
491 case $host in 534 case $host in
492 x86_64-*linux*) 535 x86_64-*linux*)
@@ -568,7 +611,7 @@ AC_CACHE_CHECK([$1], [$2],
568 # with a dollar sign (not a hyphen), so the echo should work correctly. 611 # with a dollar sign (not a hyphen), so the echo should work correctly.
569 # The option is referenced via a variable to avoid confusing sed. 612 # The option is referenced via a variable to avoid confusing sed.
570 lt_compile=`echo "$ac_compile" | $SED \ 613 lt_compile=`echo "$ac_compile" | $SED \
571 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 614 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
572 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ 615 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
573 -e 's:$: $lt_compiler_flag:'` 616 -e 's:$: $lt_compiler_flag:'`
574 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) 617 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -578,8 +621,10 @@ AC_CACHE_CHECK([$1], [$2],
578 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 621 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
579 if (exit $ac_status) && test -s "$ac_outfile"; then 622 if (exit $ac_status) && test -s "$ac_outfile"; then
580 # The compiler can only warn and ignore the option if not recognized 623 # The compiler can only warn and ignore the option if not recognized
581 # So say no if there are warnings 624 # So say no if there are warnings other than the usual output.
582 if test ! -s conftest.err; then 625 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
626 $SED '/^$/d' conftest.err >conftest.er2
627 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
583 $2=yes 628 $2=yes
584 fi 629 fi
585 fi 630 fi
@@ -605,11 +650,16 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
605 LDFLAGS="$LDFLAGS $3" 650 LDFLAGS="$LDFLAGS $3"
606 printf "$lt_simple_link_test_code" > conftest.$ac_ext 651 printf "$lt_simple_link_test_code" > conftest.$ac_ext
607 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then 652 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
608 # The compiler can only warn and ignore the option if not recognized 653 # The linker can only warn and ignore the option if not recognized
609 # So say no if there are warnings 654 # So say no if there are warnings
610 if test -s conftest.err; then 655 if test -s conftest.err; then
611 # Append any errors to the config.log. 656 # Append any errors to the config.log.
612 cat conftest.err 1>&AS_MESSAGE_LOG_FD 657 cat conftest.err 1>&AS_MESSAGE_LOG_FD
658 $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
659 $SED '/^$/d' conftest.err >conftest.er2
660 if diff conftest.exp conftest.er2 >/dev/null; then
661 $2=yes
662 fi
613 else 663 else
614 $2=yes 664 $2=yes
615 fi 665 fi
@@ -668,11 +718,38 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
668 lt_cv_sys_max_cmd_len=8192; 718 lt_cv_sys_max_cmd_len=8192;
669 ;; 719 ;;
670 720
671 *) 721 netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
722 # This has been around since 386BSD, at least. Likely further.
723 if test -x /sbin/sysctl; then
724 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
725 elif test -x /usr/sbin/sysctl; then
726 lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
727 else
728 lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
729 fi
730 # And add a safety zone
731 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
732 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
733 ;;
734 osf*)
735 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
736 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
737 # nice to cause kernel panics so lets avoid the loop below.
738 # First set a reasonable default.
739 lt_cv_sys_max_cmd_len=16384
740 #
741 if test -x /sbin/sysconfig; then
742 case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
743 *1*) lt_cv_sys_max_cmd_len=-1 ;;
744 esac
745 fi
746 ;;
747 *)
672 # If test is not a shell built-in, we'll probably end up computing a 748 # If test is not a shell built-in, we'll probably end up computing a
673 # maximum length that is only half of the actual maximum length, but 749 # maximum length that is only half of the actual maximum length, but
674 # we can't tell. 750 # we can't tell.
675 while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ 751 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
752 while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
676 = "XX$teststring") >/dev/null 2>&1 && 753 = "XX$teststring") >/dev/null 2>&1 &&
677 new_result=`expr "X$teststring" : ".*" 2>&1` && 754 new_result=`expr "X$teststring" : ".*" 2>&1` &&
678 lt_cv_sys_max_cmd_len=$new_result && 755 lt_cv_sys_max_cmd_len=$new_result &&
@@ -777,7 +854,7 @@ int main ()
777}] 854}]
778EOF 855EOF
779 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then 856 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
780 (./conftest; exit; ) 2>/dev/null 857 (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
781 lt_status=$? 858 lt_status=$?
782 case x$lt_status in 859 case x$lt_status in
783 x$lt_dlno_uscore) $1 ;; 860 x$lt_dlno_uscore) $1 ;;
@@ -926,7 +1003,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
926 # Note that $ac_compile itself does not contain backslashes and begins 1003 # Note that $ac_compile itself does not contain backslashes and begins
927 # with a dollar sign (not a hyphen), so the echo should work correctly. 1004 # with a dollar sign (not a hyphen), so the echo should work correctly.
928 lt_compile=`echo "$ac_compile" | $SED \ 1005 lt_compile=`echo "$ac_compile" | $SED \
929 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 1006 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
930 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ 1007 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
931 -e 's:$: $lt_compiler_flag:'` 1008 -e 's:$: $lt_compiler_flag:'`
932 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) 1009 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -938,11 +1015,13 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
938 then 1015 then
939 # The compiler can only warn and ignore the option if not recognized 1016 # The compiler can only warn and ignore the option if not recognized
940 # So say no if there are warnings 1017 # So say no if there are warnings
941 if test ! -s out/conftest.err; then 1018 $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
1019 $SED '/^$/d' out/conftest.err >out/conftest.er2
1020 if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
942 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes 1021 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
943 fi 1022 fi
944 fi 1023 fi
945 chmod u+w . 1024 chmod u+w . 2>&AS_MESSAGE_LOG_FD
946 $rm conftest* 1025 $rm conftest*
947 # SGI C++ compiler will create directory out/ii_files/ for 1026 # SGI C++ compiler will create directory out/ii_files/ for
948 # template instantiation 1027 # template instantiation
@@ -1006,8 +1085,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
1006[AC_MSG_CHECKING([how to hardcode library paths into programs]) 1085[AC_MSG_CHECKING([how to hardcode library paths into programs])
1007_LT_AC_TAGVAR(hardcode_action, $1)= 1086_LT_AC_TAGVAR(hardcode_action, $1)=
1008if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ 1087if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
1009 test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ 1088 test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
1010 test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then 1089 test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
1011 1090
1012 # We can hardcode non-existant directories. 1091 # We can hardcode non-existant directories.
1013 if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && 1092 if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -1174,7 +1253,7 @@ beos*)
1174 shlibpath_var=LIBRARY_PATH 1253 shlibpath_var=LIBRARY_PATH
1175 ;; 1254 ;;
1176 1255
1177bsdi4*) 1256bsdi[[45]]*)
1178 version_type=linux 1257 version_type=linux
1179 need_version=no 1258 need_version=no
1180 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 1259 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1202,7 +1281,8 @@ cygwin* | mingw* | pw32*)
1202 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ 1281 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
1203 dldir=$destdir/`dirname \$dlpath`~ 1282 dldir=$destdir/`dirname \$dlpath`~
1204 test -d \$dldir || mkdir -p \$dldir~ 1283 test -d \$dldir || mkdir -p \$dldir~
1205 $install_prog $dir/$dlname \$dldir/$dlname' 1284 $install_prog $dir/$dlname \$dldir/$dlname~
1285 chmod a+x \$dldir/$dlname'
1206 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 1286 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1207 dlpath=$dir/\$dldll~ 1287 dlpath=$dir/\$dldll~
1208 $rm \$dlpath' 1288 $rm \$dlpath'
@@ -1232,7 +1312,7 @@ cygwin* | mingw* | pw32*)
1232 ;; 1312 ;;
1233 pw32*) 1313 pw32*)
1234 # pw32 DLLs use 'pw' prefix rather than 'lib' 1314 # pw32 DLLs use 'pw' prefix rather than 'lib'
1235 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1315 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1236 ;; 1316 ;;
1237 esac 1317 esac
1238 ;; 1318 ;;
@@ -1255,7 +1335,7 @@ darwin* | rhapsody*)
1255 soname_spec='${libname}${release}${major}$shared_ext' 1335 soname_spec='${libname}${release}${major}$shared_ext'
1256 shlibpath_overrides_runpath=yes 1336 shlibpath_overrides_runpath=yes
1257 shlibpath_var=DYLD_LIBRARY_PATH 1337 shlibpath_var=DYLD_LIBRARY_PATH
1258 shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' 1338 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
1259 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 1339 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
1260 if test "$GCC" = yes; then 1340 if test "$GCC" = yes; then
1261 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"` 1341 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"`
@@ -1290,8 +1370,17 @@ kfreebsd*-gnu)
1290 dynamic_linker='GNU ld.so' 1370 dynamic_linker='GNU ld.so'
1291 ;; 1371 ;;
1292 1372
1293freebsd*) 1373freebsd* | dragonfly*)
1294 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 1374 # DragonFly does not have aout. When/if they implement a new
1375 # versioning mechanism, adjust this.
1376 if test -x /usr/bin/objformat; then
1377 objformat=`/usr/bin/objformat`
1378 else
1379 case $host_os in
1380 freebsd[[123]]*) objformat=aout ;;
1381 *) objformat=elf ;;
1382 esac
1383 fi
1295 version_type=freebsd-$objformat 1384 version_type=freebsd-$objformat
1296 case $version_type in 1385 case $version_type in
1297 freebsd-elf*) 1386 freebsd-elf*)
@@ -1309,7 +1398,7 @@ freebsd*)
1309 freebsd2*) 1398 freebsd2*)
1310 shlibpath_overrides_runpath=yes 1399 shlibpath_overrides_runpath=yes
1311 ;; 1400 ;;
1312 freebsd3.[01]* | freebsdelf3.[01]*) 1401 freebsd3.[[01]]* | freebsdelf3.[[01]]*)
1313 shlibpath_overrides_runpath=yes 1402 shlibpath_overrides_runpath=yes
1314 hardcode_into_libs=yes 1403 hardcode_into_libs=yes
1315 ;; 1404 ;;
@@ -1336,7 +1425,7 @@ hpux9* | hpux10* | hpux11*)
1336 version_type=sunos 1425 version_type=sunos
1337 need_lib_prefix=no 1426 need_lib_prefix=no
1338 need_version=no 1427 need_version=no
1339 case "$host_cpu" in 1428 case $host_cpu in
1340 ia64*) 1429 ia64*)
1341 shrext_cmds='.so' 1430 shrext_cmds='.so'
1342 hardcode_into_libs=yes 1431 hardcode_into_libs=yes
@@ -1435,7 +1524,7 @@ linux*)
1435 1524
1436 # Append ld.so.conf contents to the search path 1525 # Append ld.so.conf contents to the search path
1437 if test -f /etc/ld.so.conf; then 1526 if test -f /etc/ld.so.conf; then
1438 lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` 1527 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' ' '`
1439 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 1528 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1440 fi 1529 fi
1441 1530
@@ -1510,7 +1599,11 @@ nto-qnx*)
1510openbsd*) 1599openbsd*)
1511 version_type=sunos 1600 version_type=sunos
1512 need_lib_prefix=no 1601 need_lib_prefix=no
1513 need_version=yes 1602 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
1603 case $host_os in
1604 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
1605 *) need_version=no ;;
1606 esac
1514 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 1607 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
1515 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 1608 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
1516 shlibpath_var=LD_LIBRARY_PATH 1609 shlibpath_var=LD_LIBRARY_PATH
@@ -1676,7 +1769,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then
1676 1769
1677 case $tagname in 1770 case $tagname in
1678 CXX) 1771 CXX)
1679 if test -n "$CXX" && test "X$CXX" != "Xno"; then 1772 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1773 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1774 (test "X$CXX" != "Xg++"))) ; then
1680 AC_LIBTOOL_LANG_CXX_CONFIG 1775 AC_LIBTOOL_LANG_CXX_CONFIG
1681 else 1776 else
1682 tagname="" 1777 tagname=""
@@ -1738,7 +1833,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
1738 1833
1739# AC_LIBTOOL_WIN32_DLL 1834# AC_LIBTOOL_WIN32_DLL
1740# -------------------- 1835# --------------------
1741# declare package support for building win32 dll's 1836# declare package support for building win32 DLLs
1742AC_DEFUN([AC_LIBTOOL_WIN32_DLL], 1837AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
1743[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) 1838[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
1744])# AC_LIBTOOL_WIN32_DLL 1839])# AC_LIBTOOL_WIN32_DLL
@@ -1912,7 +2007,7 @@ dnl not every word. This closes a longstanding sh security hole.
1912 if test -n "$file_magic_test_file"; then 2007 if test -n "$file_magic_test_file"; then
1913 case $deplibs_check_method in 2008 case $deplibs_check_method in
1914 "file_magic "*) 2009 "file_magic "*)
1915 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" 2010 file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
1916 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 2011 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
1917 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | 2012 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
1918 $EGREP "$file_magic_regex" > /dev/null; then 2013 $EGREP "$file_magic_regex" > /dev/null; then
@@ -2022,7 +2117,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
2022 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then 2117 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
2023 lt_cv_path_LD="$ac_dir/$ac_prog" 2118 lt_cv_path_LD="$ac_dir/$ac_prog"
2024 # Check to see if the program is GNU ld. I'd rather use --version, 2119 # Check to see if the program is GNU ld. I'd rather use --version,
2025 # but apparently some GNU ld's only accept -v. 2120 # but apparently some variants of GNU ld only accept -v.
2026 # Break only if it was the GNU/non-GNU ld that we prefer. 2121 # Break only if it was the GNU/non-GNU ld that we prefer.
2027 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in 2122 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
2028 *GNU* | *'with BFD'*) 2123 *GNU* | *'with BFD'*)
@@ -2054,7 +2149,7 @@ AC_PROG_LD_GNU
2054AC_DEFUN([AC_PROG_LD_GNU], 2149AC_DEFUN([AC_PROG_LD_GNU],
2055[AC_REQUIRE([AC_PROG_EGREP])dnl 2150[AC_REQUIRE([AC_PROG_EGREP])dnl
2056AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, 2151AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
2057[# I'd rather use --version here, but apparently some GNU ld's only accept -v. 2152[# I'd rather use --version here, but apparently some GNU lds only accept -v.
2058case `$LD -v 2>&1 </dev/null` in 2153case `$LD -v 2>&1 </dev/null` in
2059*GNU* | *'with BFD'*) 2154*GNU* | *'with BFD'*)
2060 lt_cv_prog_gnu_ld=yes 2155 lt_cv_prog_gnu_ld=yes
@@ -2081,6 +2176,15 @@ case $reload_flag in
2081*) reload_flag=" $reload_flag" ;; 2176*) reload_flag=" $reload_flag" ;;
2082esac 2177esac
2083reload_cmds='$LD$reload_flag -o $output$reload_objs' 2178reload_cmds='$LD$reload_flag -o $output$reload_objs'
2179case $host_os in
2180 darwin*)
2181 if test "$GCC" = yes; then
2182 reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
2183 else
2184 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2185 fi
2186 ;;
2187esac
2084])# AC_PROG_LD_RELOAD_FLAG 2188])# AC_PROG_LD_RELOAD_FLAG
2085 2189
2086 2190
@@ -2114,7 +2218,7 @@ beos*)
2114 lt_cv_deplibs_check_method=pass_all 2218 lt_cv_deplibs_check_method=pass_all
2115 ;; 2219 ;;
2116 2220
2117bsdi4*) 2221bsdi[[45]]*)
2118 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' 2222 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
2119 lt_cv_file_magic_cmd='/usr/bin/file -L' 2223 lt_cv_file_magic_cmd='/usr/bin/file -L'
2120 lt_cv_file_magic_test_file=/shlib/libc.so 2224 lt_cv_file_magic_test_file=/shlib/libc.so
@@ -2137,13 +2241,13 @@ darwin* | rhapsody*)
2137 lt_cv_deplibs_check_method=pass_all 2241 lt_cv_deplibs_check_method=pass_all
2138 ;; 2242 ;;
2139 2243
2140freebsd* | kfreebsd*-gnu) 2244freebsd* | kfreebsd*-gnu | dragonfly*)
2141 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then 2245 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
2142 case $host_cpu in 2246 case $host_cpu in
2143 i*86 ) 2247 i*86 )
2144 # Not sure whether the presence of OpenBSD here was a mistake. 2248 # Not sure whether the presence of OpenBSD here was a mistake.
2145 # Let's accept both of them until this is cleared up. 2249 # Let's accept both of them until this is cleared up.
2146 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' 2250 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
2147 lt_cv_file_magic_cmd=/usr/bin/file 2251 lt_cv_file_magic_cmd=/usr/bin/file
2148 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` 2252 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
2149 ;; 2253 ;;
@@ -2159,7 +2263,7 @@ gnu*)
2159 2263
2160hpux10.20* | hpux11*) 2264hpux10.20* | hpux11*)
2161 lt_cv_file_magic_cmd=/usr/bin/file 2265 lt_cv_file_magic_cmd=/usr/bin/file
2162 case "$host_cpu" in 2266 case $host_cpu in
2163 ia64*) 2267 ia64*)
2164 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' 2268 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
2165 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so 2269 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -2209,12 +2313,10 @@ nto-qnx*)
2209 ;; 2313 ;;
2210 2314
2211openbsd*) 2315openbsd*)
2212 lt_cv_file_magic_cmd=/usr/bin/file
2213 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
2214 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 2316 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
2215 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' 2317 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
2216 else 2318 else
2217 lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' 2319 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
2218 fi 2320 fi
2219 ;; 2321 ;;
2220 2322
@@ -2335,13 +2437,13 @@ esac
2335# ----------------------------------- 2437# -----------------------------------
2336# sets LIBLTDL to the link flags for the libltdl convenience library and 2438# sets LIBLTDL to the link flags for the libltdl convenience library and
2337# LTDLINCL to the include flags for the libltdl header and adds 2439# LTDLINCL to the include flags for the libltdl header and adds
2338# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL 2440# --enable-ltdl-convenience to the configure arguments. Note that
2339# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If 2441# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
2340# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will 2442# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
2341# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with 2443# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
2342# '${top_srcdir}/' (note the single quotes!). If your package is not 2444# (note the single quotes!). If your package is not flat and you're not
2343# flat and you're not using automake, define top_builddir and 2445# using automake, define top_builddir and top_srcdir appropriately in
2344# top_srcdir appropriately in the Makefiles. 2446# the Makefiles.
2345AC_DEFUN([AC_LIBLTDL_CONVENIENCE], 2447AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
2346[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 2448[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
2347 case $enable_ltdl_convenience in 2449 case $enable_ltdl_convenience in
@@ -2360,13 +2462,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
2360# ----------------------------------- 2462# -----------------------------------
2361# sets LIBLTDL to the link flags for the libltdl installable library and 2463# sets LIBLTDL to the link flags for the libltdl installable library and
2362# LTDLINCL to the include flags for the libltdl header and adds 2464# LTDLINCL to the include flags for the libltdl header and adds
2363# --enable-ltdl-install to the configure arguments. Note that LIBLTDL 2465# --enable-ltdl-install to the configure arguments. Note that
2364# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If 2466# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
2365# DIRECTORY is not provided and an installed libltdl is not found, it is 2467# and an installed libltdl is not found, it is assumed to be `libltdl'.
2366# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' 2468# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
2367# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single 2469# '${top_srcdir}/' (note the single quotes!). If your package is not
2368# quotes!). If your package is not flat and you're not using automake, 2470# flat and you're not using automake, define top_builddir and top_srcdir
2369# define top_builddir and top_srcdir appropriately in the Makefiles. 2471# appropriately in the Makefiles.
2370# In the future, this macro may have to be called after AC_PROG_LIBTOOL. 2472# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
2371AC_DEFUN([AC_LIBLTDL_INSTALLABLE], 2473AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
2372[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 2474[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -2404,10 +2506,21 @@ AC_DEFUN([AC_LIBTOOL_CXX],
2404# --------------- 2506# ---------------
2405AC_DEFUN([_LT_AC_LANG_CXX], 2507AC_DEFUN([_LT_AC_LANG_CXX],
2406[AC_REQUIRE([AC_PROG_CXX]) 2508[AC_REQUIRE([AC_PROG_CXX])
2407AC_REQUIRE([AC_PROG_CXXCPP]) 2509AC_REQUIRE([_LT_AC_PROG_CXXCPP])
2408_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) 2510_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
2409])# _LT_AC_LANG_CXX 2511])# _LT_AC_LANG_CXX
2410 2512
2513# _LT_AC_PROG_CXXCPP
2514# ---------------
2515AC_DEFUN([_LT_AC_PROG_CXXCPP],
2516[
2517AC_REQUIRE([AC_PROG_CXX])
2518if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
2519 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
2520 (test "X$CXX" != "Xg++"))) ; then
2521 AC_PROG_CXXCPP
2522fi
2523])# _LT_AC_PROG_CXXCPP
2411 2524
2412# AC_LIBTOOL_F77 2525# AC_LIBTOOL_F77
2413# -------------- 2526# --------------
@@ -2480,6 +2593,10 @@ lt_simple_link_test_code='int main(){return(0);}\n'
2480 2593
2481_LT_AC_SYS_COMPILER 2594_LT_AC_SYS_COMPILER
2482 2595
2596# save warnings/boilerplate of simple test code
2597_LT_COMPILER_BOILERPLATE
2598_LT_LINKER_BOILERPLATE
2599
2483# 2600#
2484# Check for any special shared library compilation flags. 2601# Check for any special shared library compilation flags.
2485# 2602#
@@ -2530,7 +2647,7 @@ test "$can_build_shared" = "no" && enable_shared=no
2530 2647
2531# On AIX, shared libraries and static libraries use the same namespace, and 2648# On AIX, shared libraries and static libraries use the same namespace, and
2532# are all built from PIC. 2649# are all built from PIC.
2533case "$host_os" in 2650case $host_os in
2534aix3*) 2651aix3*)
2535 test "$enable_shared" = yes && enable_static=no 2652 test "$enable_shared" = yes && enable_static=no
2536 if test -n "$RANLIB"; then 2653 if test -n "$RANLIB"; then
@@ -2543,43 +2660,6 @@ aix4* | aix5*)
2543 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 2660 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2544 test "$enable_shared" = yes && enable_static=no 2661 test "$enable_shared" = yes && enable_static=no
2545 fi 2662 fi
2546 ;;
2547 darwin* | rhapsody*)
2548 if test "$GCC" = yes; then
2549 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2550 case "$host_os" in
2551 rhapsody* | darwin1.[[012]])
2552 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
2553 ;;
2554 *) # Darwin 1.3 on
2555 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2556 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2557 else
2558 case ${MACOSX_DEPLOYMENT_TARGET} in
2559 10.[[012]])
2560 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2561 ;;
2562 10.*)
2563 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
2564 ;;
2565 esac
2566 fi
2567 ;;
2568 esac
2569 output_verbose_link_cmd='echo'
2570 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
2571 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2572 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2573 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2574 _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}'
2575 _LT_AC_TAGVAR(hardcode_direct, $1)=no
2576 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2577 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2578 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
2579 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2580 else
2581 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2582 fi
2583 ;; 2663 ;;
2584esac 2664esac
2585AC_MSG_RESULT([$enable_shared]) 2665AC_MSG_RESULT([$enable_shared])
@@ -2605,7 +2685,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
2605AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], 2685AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
2606[AC_LANG_PUSH(C++) 2686[AC_LANG_PUSH(C++)
2607AC_REQUIRE([AC_PROG_CXX]) 2687AC_REQUIRE([AC_PROG_CXX])
2608AC_REQUIRE([AC_PROG_CXXCPP]) 2688AC_REQUIRE([_LT_AC_PROG_CXXCPP])
2609 2689
2610_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 2690_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2611_LT_AC_TAGVAR(allow_undefined_flag, $1)= 2691_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -2634,7 +2714,7 @@ _LT_AC_TAGVAR(postdeps, $1)=
2634_LT_AC_TAGVAR(compiler_lib_search_path, $1)= 2714_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
2635 2715
2636# Source file extension for C++ test sources. 2716# Source file extension for C++ test sources.
2637ac_ext=cc 2717ac_ext=cpp
2638 2718
2639# Object file extension for compiled C++ test sources. 2719# Object file extension for compiled C++ test sources.
2640objext=o 2720objext=o
@@ -2649,6 +2729,10 @@ lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
2649# ltmain only uses $CC for tagged configurations so make sure $CC is set. 2729# ltmain only uses $CC for tagged configurations so make sure $CC is set.
2650_LT_AC_SYS_COMPILER 2730_LT_AC_SYS_COMPILER
2651 2731
2732# save warnings/boilerplate of simple test code
2733_LT_COMPILER_BOILERPLATE
2734_LT_LINKER_BOILERPLATE
2735
2652# Allow CC to be a program name with arguments. 2736# Allow CC to be a program name with arguments.
2653lt_save_CC=$CC 2737lt_save_CC=$CC
2654lt_save_LD=$LD 2738lt_save_LD=$LD
@@ -2670,7 +2754,7 @@ test -z "${LDCXX+set}" || LD=$LDCXX
2670CC=${CXX-"c++"} 2754CC=${CXX-"c++"}
2671compiler=$CC 2755compiler=$CC
2672_LT_AC_TAGVAR(compiler, $1)=$CC 2756_LT_AC_TAGVAR(compiler, $1)=$CC
2673cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` 2757_LT_CC_BASENAME([$compiler])
2674 2758
2675# We don't want -fno-exception wen compiling C++ code, so set the 2759# We don't want -fno-exception wen compiling C++ code, so set the
2676# no_builtin_flag separately 2760# no_builtin_flag separately
@@ -2777,7 +2861,7 @@ case $host_os in
2777 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 2861 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2778 2862
2779 if test "$GXX" = yes; then 2863 if test "$GXX" = yes; then
2780 case $host_os in aix4.[012]|aix4.[012].*) 2864 case $host_os in aix4.[[012]]|aix4.[[012]].*)
2781 # We only want to do this on AIX 4.2 and lower, the check 2865 # We only want to do this on AIX 4.2 and lower, the check
2782 # below for broken collect2 doesn't work under 4.3+ 2866 # below for broken collect2 doesn't work under 4.3+
2783 collect2name=`${CC} -print-prog-name=collect2` 2867 collect2name=`${CC} -print-prog-name=collect2`
@@ -2798,6 +2882,9 @@ case $host_os in
2798 fi 2882 fi
2799 esac 2883 esac
2800 shared_flag='-shared' 2884 shared_flag='-shared'
2885 if test "$aix_use_runtimelinking" = yes; then
2886 shared_flag="$shared_flag "'${wl}-G'
2887 fi
2801 else 2888 else
2802 # not using gcc 2889 # not using gcc
2803 if test "$host_cpu" = ia64; then 2890 if test "$host_cpu" = ia64; then
@@ -2843,7 +2930,7 @@ case $host_os in
2843 # Exported symbols can be pulled into shared objects from archives 2930 # Exported symbols can be pulled into shared objects from archives
2844 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' 2931 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
2845 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes 2932 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
2846 # This is similar to how AIX traditionally builds it's shared libraries. 2933 # This is similar to how AIX traditionally builds its shared libraries.
2847 _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 2934 _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
2848 fi 2935 fi
2849 fi 2936 fi
@@ -2857,6 +2944,7 @@ case $host_os in
2857 esac 2944 esac
2858 ;; 2945 ;;
2859 2946
2947
2860 cygwin* | mingw* | pw32*) 2948 cygwin* | mingw* | pw32*)
2861 # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 2949 # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2862 # as there is no search path for DLLs. 2950 # as there is no search path for DLLs.
@@ -2880,65 +2968,76 @@ case $host_os in
2880 _LT_AC_TAGVAR(ld_shlibs, $1)=no 2968 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2881 fi 2969 fi
2882 ;; 2970 ;;
2971 darwin* | rhapsody*)
2972 case $host_os in
2973 rhapsody* | darwin1.[[012]])
2974 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
2975 ;;
2976 *) # Darwin 1.3 on
2977 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2978 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
2979 else
2980 case ${MACOSX_DEPLOYMENT_TARGET} in
2981 10.[[012]])
2982 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
2983 ;;
2984 10.*)
2985 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
2986 ;;
2987 esac
2988 fi
2989 ;;
2990 esac
2991 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2992 _LT_AC_TAGVAR(hardcode_direct, $1)=no
2993 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2994 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2995 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
2996 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2883 2997
2884 darwin* | rhapsody*) 2998 if test "$GXX" = yes ; then
2885 if test "$GXX" = yes; then 2999 lt_int_apple_cc_single_mod=no
2886 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 3000 output_verbose_link_cmd='echo'
2887 case "$host_os" in 3001 if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
2888 rhapsody* | darwin1.[[012]]) 3002 lt_int_apple_cc_single_mod=yes
2889 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' 3003 fi
2890 ;; 3004 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2891 *) # Darwin 1.3 on 3005 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2892 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2893 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2894 else 3006 else
2895 case ${MACOSX_DEPLOYMENT_TARGET} in 3007 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2896 10.[[012]]) 3008 fi
2897 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' 3009 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2898 ;; 3010 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
2899 10.*) 3011 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2900 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' 3012 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2901 ;; 3013 else
2902 esac 3014 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3015 fi
3016 _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}'
3017 else
3018 case $cc_basename in
3019 xlc*)
3020 output_verbose_link_cmd='echo'
3021 _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'
3022 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
3023 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
3024 _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}'
3025 _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}'
3026 ;;
3027 *)
3028 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3029 ;;
3030 esac
2903 fi 3031 fi
2904 ;; 3032 ;;
2905 esac
2906 lt_int_apple_cc_single_mod=no
2907 output_verbose_link_cmd='echo'
2908 if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
2909 lt_int_apple_cc_single_mod=yes
2910 fi
2911 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2912 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2913 else
2914 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2915 fi
2916 _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2917
2918 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2919 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2920 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2921 else
2922 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2923 fi
2924 _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}'
2925 _LT_AC_TAGVAR(hardcode_direct, $1)=no
2926 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2927 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2928 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
2929 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2930 else
2931 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2932 fi
2933 ;;
2934 3033
2935 dgux*) 3034 dgux*)
2936 case $cc_basename in 3035 case $cc_basename in
2937 ec++) 3036 ec++*)
2938 # FIXME: insert proper C++ library support 3037 # FIXME: insert proper C++ library support
2939 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3038 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2940 ;; 3039 ;;
2941 ghcx) 3040 ghcx*)
2942 # Green Hills C++ Compiler 3041 # Green Hills C++ Compiler
2943 # FIXME: insert proper C++ library support 3042 # FIXME: insert proper C++ library support
2944 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3043 _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -2949,14 +3048,14 @@ case $host_os in
2949 ;; 3048 ;;
2950 esac 3049 esac
2951 ;; 3050 ;;
2952 freebsd[12]*) 3051 freebsd[[12]]*)
2953 # C++ shared libraries reported to be fairly broken before switch to ELF 3052 # C++ shared libraries reported to be fairly broken before switch to ELF
2954 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3053 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2955 ;; 3054 ;;
2956 freebsd-elf*) 3055 freebsd-elf*)
2957 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 3056 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2958 ;; 3057 ;;
2959 freebsd* | kfreebsd*-gnu) 3058 freebsd* | kfreebsd*-gnu | dragonfly*)
2960 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF 3059 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
2961 # conventions 3060 # conventions
2962 _LT_AC_TAGVAR(ld_shlibs, $1)=yes 3061 _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -2973,11 +3072,11 @@ case $host_os in
2973 # location of the library. 3072 # location of the library.
2974 3073
2975 case $cc_basename in 3074 case $cc_basename in
2976 CC) 3075 CC*)
2977 # FIXME: insert proper C++ library support 3076 # FIXME: insert proper C++ library support
2978 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3077 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2979 ;; 3078 ;;
2980 aCC) 3079 aCC*)
2981 _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 3080 _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2982 # Commands to make compiler produce verbose output that lists 3081 # Commands to make compiler produce verbose output that lists
2983 # what "hidden" libraries, object files and flags are used when 3082 # what "hidden" libraries, object files and flags are used when
@@ -2987,7 +3086,7 @@ case $host_os in
2987 # explicitly linking system object files so we need to strip them 3086 # explicitly linking system object files so we need to strip them
2988 # from the output so that they don't get included in the library 3087 # from the output so that they don't get included in the library
2989 # dependencies. 3088 # dependencies.
2990 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' 3089 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
2991 ;; 3090 ;;
2992 *) 3091 *)
2993 if test "$GXX" = yes; then 3092 if test "$GXX" = yes; then
@@ -3001,7 +3100,7 @@ case $host_os in
3001 ;; 3100 ;;
3002 hpux10*|hpux11*) 3101 hpux10*|hpux11*)
3003 if test $with_gnu_ld = no; then 3102 if test $with_gnu_ld = no; then
3004 case "$host_cpu" in 3103 case $host_cpu in
3005 hppa*64*) 3104 hppa*64*)
3006 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' 3105 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
3007 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' 3106 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -3017,7 +3116,7 @@ case $host_os in
3017 ;; 3116 ;;
3018 esac 3117 esac
3019 fi 3118 fi
3020 case "$host_cpu" in 3119 case $host_cpu in
3021 hppa*64*) 3120 hppa*64*)
3022 _LT_AC_TAGVAR(hardcode_direct, $1)=no 3121 _LT_AC_TAGVAR(hardcode_direct, $1)=no
3023 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no 3122 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3038,12 +3137,12 @@ case $host_os in
3038 esac 3137 esac
3039 3138
3040 case $cc_basename in 3139 case $cc_basename in
3041 CC) 3140 CC*)
3042 # FIXME: insert proper C++ library support 3141 # FIXME: insert proper C++ library support
3043 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3142 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3044 ;; 3143 ;;
3045 aCC) 3144 aCC*)
3046 case "$host_cpu" in 3145 case $host_cpu in
3047 hppa*64*|ia64*) 3146 hppa*64*|ia64*)
3048 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' 3147 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
3049 ;; 3148 ;;
@@ -3064,7 +3163,7 @@ case $host_os in
3064 *) 3163 *)
3065 if test "$GXX" = yes; then 3164 if test "$GXX" = yes; then
3066 if test $with_gnu_ld = no; then 3165 if test $with_gnu_ld = no; then
3067 case "$host_cpu" in 3166 case $host_cpu in
3068 ia64*|hppa*64*) 3167 ia64*|hppa*64*)
3069 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' 3168 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
3070 ;; 3169 ;;
@@ -3082,9 +3181,9 @@ case $host_os in
3082 ;; 3181 ;;
3083 irix5* | irix6*) 3182 irix5* | irix6*)
3084 case $cc_basename in 3183 case $cc_basename in
3085 CC) 3184 CC*)
3086 # SGI C++ 3185 # SGI C++
3087 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' 3186 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
3088 3187
3089 # Archives containing C++ object files must be created using 3188 # Archives containing C++ object files must be created using
3090 # "CC -ar", where "CC" is the IRIX C++ compiler. This is 3189 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -3095,7 +3194,7 @@ case $host_os in
3095 *) 3194 *)
3096 if test "$GXX" = yes; then 3195 if test "$GXX" = yes; then
3097 if test "$with_gnu_ld" = no; then 3196 if test "$with_gnu_ld" = no; then
3098 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' 3197 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3099 else 3198 else
3100 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' 3199 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
3101 fi 3200 fi
@@ -3108,7 +3207,7 @@ case $host_os in
3108 ;; 3207 ;;
3109 linux*) 3208 linux*)
3110 case $cc_basename in 3209 case $cc_basename in
3111 KCC) 3210 KCC*)
3112 # Kuck and Associates, Inc. (KAI) C++ Compiler 3211 # Kuck and Associates, Inc. (KAI) C++ Compiler
3113 3212
3114 # KCC will only create a shared library if the output file 3213 # KCC will only create a shared library if the output file
@@ -3133,17 +3232,41 @@ case $host_os in
3133 # "CC -Bstatic", where "CC" is the KAI C++ compiler. 3232 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
3134 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' 3233 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
3135 ;; 3234 ;;
3136 icpc) 3235 icpc*)
3137 # Intel C++ 3236 # Intel C++
3138 with_gnu_ld=yes 3237 with_gnu_ld=yes
3238 # version 8.0 and above of icpc choke on multiply defined symbols
3239 # if we add $predep_objects and $postdep_objects, however 7.1 and
3240 # earlier do not add the objects themselves.
3241 case `$CC -V 2>&1` in
3242 *"Version 7."*)
3243 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3244 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3245 ;;
3246 *) # Version 8.0 or newer
3247 tmp_idyn=
3248 case $host_cpu in
3249 ia64*) tmp_idyn=' -i_dynamic';;
3250 esac
3251 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
3252 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3253 ;;
3254 esac
3139 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 3255 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3140 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3141 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3142 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' 3256 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3143 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 3257 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3144 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' 3258 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
3145 ;; 3259 ;;
3146 cxx) 3260 pgCC*)
3261 # Portland Group C++ compiler
3262 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
3263 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
3264
3265 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
3266 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3267 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
3268 ;;
3269 cxx*)
3147 # Compaq C++ 3270 # Compaq C++
3148 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' 3271 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3149 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' 3272 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3174,7 +3297,7 @@ case $host_os in
3174 ;; 3297 ;;
3175 mvs*) 3298 mvs*)
3176 case $cc_basename in 3299 case $cc_basename in
3177 cxx) 3300 cxx*)
3178 # FIXME: insert proper C++ library support 3301 # FIXME: insert proper C++ library support
3179 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3302 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3180 ;; 3303 ;;
@@ -3195,9 +3318,25 @@ case $host_os in
3195 # Workaround some broken pre-1.5 toolchains 3318 # Workaround some broken pre-1.5 toolchains
3196 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' 3319 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
3197 ;; 3320 ;;
3321 openbsd2*)
3322 # C++ shared libraries are fairly broken
3323 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3324 ;;
3325 openbsd*)
3326 _LT_AC_TAGVAR(hardcode_direct, $1)=yes
3327 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
3328 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
3329 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3330 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
3331 _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'
3332 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
3333 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
3334 fi
3335 output_verbose_link_cmd='echo'
3336 ;;
3198 osf3*) 3337 osf3*)
3199 case $cc_basename in 3338 case $cc_basename in
3200 KCC) 3339 KCC*)
3201 # Kuck and Associates, Inc. (KAI) C++ Compiler 3340 # Kuck and Associates, Inc. (KAI) C++ Compiler
3202 3341
3203 # KCC will only create a shared library if the output file 3342 # KCC will only create a shared library if the output file
@@ -3213,14 +3352,14 @@ case $host_os in
3213 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' 3352 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
3214 3353
3215 ;; 3354 ;;
3216 RCC) 3355 RCC*)
3217 # Rational C++ 2.4.1 3356 # Rational C++ 2.4.1
3218 # FIXME: insert proper C++ library support 3357 # FIXME: insert proper C++ library support
3219 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3358 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3220 ;; 3359 ;;
3221 cxx) 3360 cxx*)
3222 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 3361 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3223 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' 3362 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
3224 3363
3225 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 3364 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3226 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: 3365 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3238,7 +3377,7 @@ case $host_os in
3238 *) 3377 *)
3239 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 3378 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3240 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 3379 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3241 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' 3380 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3242 3381
3243 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 3382 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3244 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: 3383 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3257,7 +3396,7 @@ case $host_os in
3257 ;; 3396 ;;
3258 osf4* | osf5*) 3397 osf4* | osf5*)
3259 case $cc_basename in 3398 case $cc_basename in
3260 KCC) 3399 KCC*)
3261 # Kuck and Associates, Inc. (KAI) C++ Compiler 3400 # Kuck and Associates, Inc. (KAI) C++ Compiler
3262 3401
3263 # KCC will only create a shared library if the output file 3402 # KCC will only create a shared library if the output file
@@ -3272,17 +3411,17 @@ case $host_os in
3272 # the KAI C++ compiler. 3411 # the KAI C++ compiler.
3273 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' 3412 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
3274 ;; 3413 ;;
3275 RCC) 3414 RCC*)
3276 # Rational C++ 2.4.1 3415 # Rational C++ 2.4.1
3277 # FIXME: insert proper C++ library support 3416 # FIXME: insert proper C++ library support
3278 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3417 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3279 ;; 3418 ;;
3280 cxx) 3419 cxx*)
3281 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 3420 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
3282 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' 3421 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
3283 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ 3422 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
3284 echo "-hidden">> $lib.exp~ 3423 echo "-hidden">> $lib.exp~
3285 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ 3424 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
3286 $rm $lib.exp' 3425 $rm $lib.exp'
3287 3426
3288 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' 3427 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -3301,7 +3440,7 @@ case $host_os in
3301 *) 3440 *)
3302 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 3441 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3303 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 3442 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3304 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' 3443 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
3305 3444
3306 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 3445 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3307 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: 3446 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3325,7 +3464,7 @@ case $host_os in
3325 sco*) 3464 sco*)
3326 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 3465 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3327 case $cc_basename in 3466 case $cc_basename in
3328 CC) 3467 CC*)
3329 # FIXME: insert proper C++ library support 3468 # FIXME: insert proper C++ library support
3330 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3469 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3331 ;; 3470 ;;
@@ -3337,12 +3476,12 @@ case $host_os in
3337 ;; 3476 ;;
3338 sunos4*) 3477 sunos4*)
3339 case $cc_basename in 3478 case $cc_basename in
3340 CC) 3479 CC*)
3341 # Sun C++ 4.x 3480 # Sun C++ 4.x
3342 # FIXME: insert proper C++ library support 3481 # FIXME: insert proper C++ library support
3343 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3482 _LT_AC_TAGVAR(ld_shlibs, $1)=no
3344 ;; 3483 ;;
3345 lcc) 3484 lcc*)
3346 # Lucid 3485 # Lucid
3347 # FIXME: insert proper C++ library support 3486 # FIXME: insert proper C++ library support
3348 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3487 _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3355,36 +3494,33 @@ case $host_os in
3355 ;; 3494 ;;
3356 solaris*) 3495 solaris*)
3357 case $cc_basename in 3496 case $cc_basename in
3358 CC) 3497 CC*)
3359 # Sun C++ 4.2, 5.x and Centerline C++ 3498 # Sun C++ 4.2, 5.x and Centerline C++
3499 _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
3360 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' 3500 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
3361 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 3501 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3362 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 3502 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3363 $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' 3503 $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
3364 3504
3365 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 3505 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
3366 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no 3506 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
3367 case $host_os in 3507 case $host_os in
3368 solaris2.[0-5] | solaris2.[0-5].*) ;; 3508 solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
3369 *) 3509 *)
3370 # The C++ compiler is used as linker so we must use $wl 3510 # The C++ compiler is used as linker so we must use $wl
3371 # flag to pass the commands to the underlying system 3511 # flag to pass the commands to the underlying system
3372 # linker. 3512 # linker. We must also pass each convience library through
3513 # to the system linker between allextract/defaultextract.
3514 # The C++ compiler will combine linker options so we
3515 # cannot just pass the convience library names through
3516 # without $wl.
3373 # Supported since Solaris 2.6 (maybe 2.5.1?) 3517 # Supported since Solaris 2.6 (maybe 2.5.1?)
3374 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' 3518 _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'
3375 ;; 3519 ;;
3376 esac 3520 esac
3377 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 3521 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
3378 3522
3379 # Commands to make compiler produce verbose output that lists 3523 output_verbose_link_cmd='echo'
3380 # what "hidden" libraries, object files and flags are used when
3381 # linking a shared library.
3382 #
3383 # There doesn't appear to be a way to prevent this compiler from
3384 # explicitly linking system object files so we need to strip them
3385 # from the output so that they don't get included in the library
3386 # dependencies.
3387 output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
3388 3524
3389 # Archives containing C++ object files must be created using 3525 # Archives containing C++ object files must be created using
3390 # "CC -xar", where "CC" is the Sun C++ compiler. This is 3526 # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -3392,7 +3528,7 @@ case $host_os in
3392 # in the archive. 3528 # in the archive.
3393 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' 3529 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
3394 ;; 3530 ;;
3395 gcx) 3531 gcx*)
3396 # Green Hills C++ Compiler 3532 # Green Hills C++ Compiler
3397 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 3533 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
3398 3534
@@ -3435,7 +3571,7 @@ case $host_os in
3435 ;; 3571 ;;
3436 tandem*) 3572 tandem*)
3437 case $cc_basename in 3573 case $cc_basename in
3438 NCC) 3574 NCC*)
3439 # NonStop-UX NCC 3.20 3575 # NonStop-UX NCC 3.20
3440 # FIXME: insert proper C++ library support 3576 # FIXME: insert proper C++ library support
3441 _LT_AC_TAGVAR(ld_shlibs, $1)=no 3577 _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3541,7 +3677,7 @@ if AC_TRY_EVAL(ac_compile); then
3541 # The `*' in the case matches for architectures that use `case' in 3677 # The `*' in the case matches for architectures that use `case' in
3542 # $output_verbose_cmd can trigger glob expansion during the loop 3678 # $output_verbose_cmd can trigger glob expansion during the loop
3543 # eval without this substitution. 3679 # eval without this substitution.
3544 output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" 3680 output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
3545 3681
3546 for p in `eval $output_verbose_link_cmd`; do 3682 for p in `eval $output_verbose_link_cmd`; do
3547 case $p in 3683 case $p in
@@ -3617,6 +3753,21 @@ fi
3617 3753
3618$rm -f confest.$objext 3754$rm -f confest.$objext
3619 3755
3756# PORTME: override above test on systems where it is broken
3757ifelse([$1],[CXX],
3758[case $host_os in
3759solaris*)
3760 case $cc_basename in
3761 CC*)
3762 # Adding this requires a known-good setup of shared libraries for
3763 # Sun compiler versions before 5.6, else PIC objects from an old
3764 # archive will be linked into the output, leading to subtle bugs.
3765 _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
3766 ;;
3767 esac
3768esac
3769])
3770
3620case " $_LT_AC_TAGVAR(postdeps, $1) " in 3771case " $_LT_AC_TAGVAR(postdeps, $1) " in
3621*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; 3772*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
3622esac 3773esac
@@ -3667,12 +3818,16 @@ lt_simple_link_test_code=" program t\n end\n"
3667# ltmain only uses $CC for tagged configurations so make sure $CC is set. 3818# ltmain only uses $CC for tagged configurations so make sure $CC is set.
3668_LT_AC_SYS_COMPILER 3819_LT_AC_SYS_COMPILER
3669 3820
3821# save warnings/boilerplate of simple test code
3822_LT_COMPILER_BOILERPLATE
3823_LT_LINKER_BOILERPLATE
3824
3670# Allow CC to be a program name with arguments. 3825# Allow CC to be a program name with arguments.
3671lt_save_CC="$CC" 3826lt_save_CC="$CC"
3672CC=${F77-"f77"} 3827CC=${F77-"f77"}
3673compiler=$CC 3828compiler=$CC
3674_LT_AC_TAGVAR(compiler, $1)=$CC 3829_LT_AC_TAGVAR(compiler, $1)=$CC
3675cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` 3830_LT_CC_BASENAME([$compiler])
3676 3831
3677AC_MSG_CHECKING([if libtool supports shared libraries]) 3832AC_MSG_CHECKING([if libtool supports shared libraries])
3678AC_MSG_RESULT([$can_build_shared]) 3833AC_MSG_RESULT([$can_build_shared])
@@ -3682,7 +3837,7 @@ test "$can_build_shared" = "no" && enable_shared=no
3682 3837
3683# On AIX, shared libraries and static libraries use the same namespace, and 3838# On AIX, shared libraries and static libraries use the same namespace, and
3684# are all built from PIC. 3839# are all built from PIC.
3685case "$host_os" in 3840case $host_os in
3686aix3*) 3841aix3*)
3687 test "$enable_shared" = yes && enable_static=no 3842 test "$enable_shared" = yes && enable_static=no
3688 if test -n "$RANLIB"; then 3843 if test -n "$RANLIB"; then
@@ -3691,7 +3846,9 @@ aix3*)
3691 fi 3846 fi
3692 ;; 3847 ;;
3693aix4* | aix5*) 3848aix4* | aix5*)
3694 test "$enable_shared" = yes && enable_static=no 3849 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
3850 test "$enable_shared" = yes && enable_static=no
3851 fi
3695 ;; 3852 ;;
3696esac 3853esac
3697AC_MSG_RESULT([$enable_shared]) 3854AC_MSG_RESULT([$enable_shared])
@@ -3742,20 +3899,27 @@ _LT_AC_TAGVAR(objext, $1)=$objext
3742lt_simple_compile_test_code="class foo {}\n" 3899lt_simple_compile_test_code="class foo {}\n"
3743 3900
3744# Code to be used in simple link tests 3901# Code to be used in simple link tests
3745lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' 3902lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
3746 3903
3747# ltmain only uses $CC for tagged configurations so make sure $CC is set. 3904# ltmain only uses $CC for tagged configurations so make sure $CC is set.
3748_LT_AC_SYS_COMPILER 3905_LT_AC_SYS_COMPILER
3749 3906
3907# save warnings/boilerplate of simple test code
3908_LT_COMPILER_BOILERPLATE
3909_LT_LINKER_BOILERPLATE
3910
3750# Allow CC to be a program name with arguments. 3911# Allow CC to be a program name with arguments.
3751lt_save_CC="$CC" 3912lt_save_CC="$CC"
3752CC=${GCJ-"gcj"} 3913CC=${GCJ-"gcj"}
3753compiler=$CC 3914compiler=$CC
3754_LT_AC_TAGVAR(compiler, $1)=$CC 3915_LT_AC_TAGVAR(compiler, $1)=$CC
3916_LT_CC_BASENAME([$compiler])
3755 3917
3756# GCJ did not exist at the time GCC didn't implicitly link libc in. 3918# GCJ did not exist at the time GCC didn't implicitly link libc in.
3757_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 3919_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3758 3920
3921_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3922
3759AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) 3923AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
3760AC_LIBTOOL_PROG_COMPILER_PIC($1) 3924AC_LIBTOOL_PROG_COMPILER_PIC($1)
3761AC_LIBTOOL_PROG_CC_C_O($1) 3925AC_LIBTOOL_PROG_CC_C_O($1)
@@ -3798,11 +3962,16 @@ lt_simple_link_test_code="$lt_simple_compile_test_code"
3798# ltmain only uses $CC for tagged configurations so make sure $CC is set. 3962# ltmain only uses $CC for tagged configurations so make sure $CC is set.
3799_LT_AC_SYS_COMPILER 3963_LT_AC_SYS_COMPILER
3800 3964
3965# save warnings/boilerplate of simple test code
3966_LT_COMPILER_BOILERPLATE
3967_LT_LINKER_BOILERPLATE
3968
3801# Allow CC to be a program name with arguments. 3969# Allow CC to be a program name with arguments.
3802lt_save_CC="$CC" 3970lt_save_CC="$CC"
3803CC=${RC-"windres"} 3971CC=${RC-"windres"}
3804compiler=$CC 3972compiler=$CC
3805_LT_AC_TAGVAR(compiler, $1)=$CC 3973_LT_AC_TAGVAR(compiler, $1)=$CC
3974_LT_CC_BASENAME([$compiler])
3806_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes 3975_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
3807 3976
3808AC_LIBTOOL_CONFIG($1) 3977AC_LIBTOOL_CONFIG($1)
@@ -3938,7 +4107,7 @@ ifelse([$1], [],
3938# 4107#
3939# You should have received a copy of the GNU General Public License 4108# You should have received a copy of the GNU General Public License
3940# along with this program; if not, write to the Free Software 4109# along with this program; if not, write to the Free Software
3941# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 4110# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3942# 4111#
3943# As a special exception to the GNU General Public License, if you 4112# As a special exception to the GNU General Public License, if you
3944# distribute this file as part of a program that contains a 4113# distribute this file as part of a program that contains a
@@ -3949,11 +4118,11 @@ ifelse([$1], [],
3949SED=$lt_SED 4118SED=$lt_SED
3950 4119
3951# Sed that helps us avoid accidentally triggering echo(1) options like -n. 4120# Sed that helps us avoid accidentally triggering echo(1) options like -n.
3952Xsed="$SED -e s/^X//" 4121Xsed="$SED -e 1s/^X//"
3953 4122
3954# The HP-UX ksh and POSIX shell print the target directory to stdout 4123# The HP-UX ksh and POSIX shell print the target directory to stdout
3955# if CDPATH is set. 4124# if CDPATH is set.
3956if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi 4125(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3957 4126
3958# The names of the tagged configurations supported by this script. 4127# The names of the tagged configurations supported by this script.
3959available_tags= 4128available_tags=
@@ -3984,6 +4153,12 @@ fast_install=$enable_fast_install
3984# The host system. 4153# The host system.
3985host_alias=$host_alias 4154host_alias=$host_alias
3986host=$host 4155host=$host
4156host_os=$host_os
4157
4158# The build system.
4159build_alias=$build_alias
4160build=$build
4161build_os=$build_os
3987 4162
3988# An echo program that does not interpret backslashes. 4163# An echo program that does not interpret backslashes.
3989echo=$lt_echo 4164echo=$lt_echo
@@ -4060,7 +4235,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
4060# Does compiler simultaneously support -c and -o options? 4235# Does compiler simultaneously support -c and -o options?
4061compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) 4236compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
4062 4237
4063# Must we lock files when doing compilation ? 4238# Must we lock files when doing compilation?
4064need_locks=$lt_need_locks 4239need_locks=$lt_need_locks
4065 4240
4066# Do we need the lib prefix for modules? 4241# Do we need the lib prefix for modules?
@@ -4334,9 +4509,6 @@ symcode='[[BCDEGRST]]'
4334# Regexp to match symbols that can be accessed directly from C. 4509# Regexp to match symbols that can be accessed directly from C.
4335sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' 4510sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
4336 4511
4337# Transform the above into a raw symbol and a C symbol.
4338symxfrm='\1 \2\3 \3'
4339
4340# Transform an extracted symbol line into a proper C declaration 4512# Transform an extracted symbol line into a proper C declaration
4341lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" 4513lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
4342 4514
@@ -4358,6 +4530,13 @@ hpux*) # Its linker distinguishes data from code symbols
4358 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4530 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4359 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'" 4531 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'"
4360 ;; 4532 ;;
4533linux*)
4534 if test "$host_cpu" = ia64; then
4535 symcode='[[ABCDGIRSTW]]'
4536 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4537 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'"
4538 fi
4539 ;;
4361irix* | nonstopux*) 4540irix* | nonstopux*)
4362 symcode='[[BCDEGRST]]' 4541 symcode='[[BCDEGRST]]'
4363 ;; 4542 ;;
@@ -4389,8 +4568,11 @@ esac
4389# Try without a prefix undercore, then with it. 4568# Try without a prefix undercore, then with it.
4390for ac_symprfx in "" "_"; do 4569for ac_symprfx in "" "_"; do
4391 4570
4571 # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
4572 symxfrm="\\1 $ac_symprfx\\2 \\2"
4573
4392 # Write the raw and C identifiers. 4574 # Write the raw and C identifiers.
4393 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" 4575 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4394 4576
4395 # Check to see that the pipe works correctly. 4577 # Check to see that the pipe works correctly.
4396 pipe_works=no 4578 pipe_works=no
@@ -4554,7 +4736,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4554 hpux*) 4736 hpux*)
4555 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 4737 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
4556 # not for PA HP-UX. 4738 # not for PA HP-UX.
4557 case "$host_cpu" in 4739 case $host_cpu in
4558 hppa*64*|ia64*) 4740 hppa*64*|ia64*)
4559 ;; 4741 ;;
4560 *) 4742 *)
@@ -4579,18 +4761,28 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4579 ;; 4761 ;;
4580 chorus*) 4762 chorus*)
4581 case $cc_basename in 4763 case $cc_basename in
4582 cxch68) 4764 cxch68*)
4583 # Green Hills C++ Compiler 4765 # Green Hills C++ Compiler
4584 # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" 4766 # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
4585 ;; 4767 ;;
4586 esac 4768 esac
4587 ;; 4769 ;;
4770 darwin*)
4771 # PIC is the default on this platform
4772 # Common symbols not allowed in MH_DYLIB files
4773 case $cc_basename in
4774 xlc*)
4775 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
4776 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4777 ;;
4778 esac
4779 ;;
4588 dgux*) 4780 dgux*)
4589 case $cc_basename in 4781 case $cc_basename in
4590 ec++) 4782 ec++*)
4591 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4783 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4592 ;; 4784 ;;
4593 ghcx) 4785 ghcx*)
4594 # Green Hills C++ Compiler 4786 # Green Hills C++ Compiler
4595 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' 4787 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4596 ;; 4788 ;;
@@ -4598,22 +4790,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4598 ;; 4790 ;;
4599 esac 4791 esac
4600 ;; 4792 ;;
4601 freebsd* | kfreebsd*-gnu) 4793 freebsd* | kfreebsd*-gnu | dragonfly*)
4602 # FreeBSD uses GNU C++ 4794 # FreeBSD uses GNU C++
4603 ;; 4795 ;;
4604 hpux9* | hpux10* | hpux11*) 4796 hpux9* | hpux10* | hpux11*)
4605 case $cc_basename in 4797 case $cc_basename in
4606 CC) 4798 CC*)
4607 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4799 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4608 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" 4800 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
4609 if test "$host_cpu" != ia64; then 4801 if test "$host_cpu" != ia64; then
4610 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' 4802 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
4611 fi 4803 fi
4612 ;; 4804 ;;
4613 aCC) 4805 aCC*)
4614 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4806 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4615 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" 4807 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
4616 case "$host_cpu" in 4808 case $host_cpu in
4617 hppa*64*|ia64*) 4809 hppa*64*|ia64*)
4618 # +Z the default 4810 # +Z the default
4619 ;; 4811 ;;
@@ -4628,7 +4820,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4628 ;; 4820 ;;
4629 irix5* | irix6* | nonstopux*) 4821 irix5* | irix6* | nonstopux*)
4630 case $cc_basename in 4822 case $cc_basename in
4631 CC) 4823 CC*)
4632 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4824 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4633 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' 4825 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4634 # CC pic flag -KPIC is the default. 4826 # CC pic flag -KPIC is the default.
@@ -4639,18 +4831,24 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4639 ;; 4831 ;;
4640 linux*) 4832 linux*)
4641 case $cc_basename in 4833 case $cc_basename in
4642 KCC) 4834 KCC*)
4643 # KAI C++ Compiler 4835 # KAI C++ Compiler
4644 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 4836 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
4645 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 4837 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4646 ;; 4838 ;;
4647 icpc) 4839 icpc* | ecpc*)
4648 # Intel C++ 4840 # Intel C++
4649 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4841 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4650 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4842 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4651 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' 4843 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
4652 ;; 4844 ;;
4653 cxx) 4845 pgCC*)
4846 # Portland Group C++ compiler.
4847 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4848 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
4849 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4850 ;;
4851 cxx*)
4654 # Compaq C++ 4852 # Compaq C++
4655 # Make sure the PIC flag is empty. It appears that all Alpha 4853 # Make sure the PIC flag is empty. It appears that all Alpha
4656 # Linux and Compaq Tru64 Unix objects are PIC. 4854 # Linux and Compaq Tru64 Unix objects are PIC.
@@ -4667,7 +4865,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4667 ;; 4865 ;;
4668 mvs*) 4866 mvs*)
4669 case $cc_basename in 4867 case $cc_basename in
4670 cxx) 4868 cxx*)
4671 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' 4869 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
4672 ;; 4870 ;;
4673 *) 4871 *)
@@ -4678,14 +4876,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4678 ;; 4876 ;;
4679 osf3* | osf4* | osf5*) 4877 osf3* | osf4* | osf5*)
4680 case $cc_basename in 4878 case $cc_basename in
4681 KCC) 4879 KCC*)
4682 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 4880 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
4683 ;; 4881 ;;
4684 RCC) 4882 RCC*)
4685 # Rational C++ 2.4.1 4883 # Rational C++ 2.4.1
4686 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' 4884 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4687 ;; 4885 ;;
4688 cxx) 4886 cxx*)
4689 # Digital/Compaq C++ 4887 # Digital/Compaq C++
4690 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4888 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4691 # Make sure the PIC flag is empty. It appears that all Alpha 4889 # Make sure the PIC flag is empty. It appears that all Alpha
@@ -4701,7 +4899,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4701 ;; 4899 ;;
4702 sco*) 4900 sco*)
4703 case $cc_basename in 4901 case $cc_basename in
4704 CC) 4902 CC*)
4705 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 4903 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4706 ;; 4904 ;;
4707 *) 4905 *)
@@ -4710,13 +4908,13 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4710 ;; 4908 ;;
4711 solaris*) 4909 solaris*)
4712 case $cc_basename in 4910 case $cc_basename in
4713 CC) 4911 CC*)
4714 # Sun C++ 4.2, 5.x and Centerline C++ 4912 # Sun C++ 4.2, 5.x and Centerline C++
4715 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4913 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4716 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 4914 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4717 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' 4915 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
4718 ;; 4916 ;;
4719 gcx) 4917 gcx*)
4720 # Green Hills C++ Compiler 4918 # Green Hills C++ Compiler
4721 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' 4919 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
4722 ;; 4920 ;;
@@ -4726,12 +4924,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4726 ;; 4924 ;;
4727 sunos4*) 4925 sunos4*)
4728 case $cc_basename in 4926 case $cc_basename in
4729 CC) 4927 CC*)
4730 # Sun C++ 4.x 4928 # Sun C++ 4.x
4731 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' 4929 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4732 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 4930 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4733 ;; 4931 ;;
4734 lcc) 4932 lcc*)
4735 # Lucid 4933 # Lucid
4736 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' 4934 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4737 ;; 4935 ;;
@@ -4741,7 +4939,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4741 ;; 4939 ;;
4742 tandem*) 4940 tandem*)
4743 case $cc_basename in 4941 case $cc_basename in
4744 NCC) 4942 NCC*)
4745 # NonStop-UX NCC 3.20 4943 # NonStop-UX NCC 3.20
4746 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4944 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4747 ;; 4945 ;;
@@ -4812,7 +5010,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4812 hpux*) 5010 hpux*)
4813 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 5011 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
4814 # not for PA HP-UX. 5012 # not for PA HP-UX.
4815 case "$host_cpu" in 5013 case $host_cpu in
4816 hppa*64*|ia64*) 5014 hppa*64*|ia64*)
4817 # +Z the default 5015 # +Z the default
4818 ;; 5016 ;;
@@ -4838,6 +5036,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4838 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' 5036 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
4839 fi 5037 fi
4840 ;; 5038 ;;
5039 darwin*)
5040 # PIC is the default on this platform
5041 # Common symbols not allowed in MH_DYLIB files
5042 case $cc_basename in
5043 xlc*)
5044 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
5045 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5046 ;;
5047 esac
5048 ;;
4841 5049
4842 mingw* | pw32* | os2*) 5050 mingw* | pw32* | os2*)
4843 # This hack is so that the source file can tell whether it is being 5051 # This hack is so that the source file can tell whether it is being
@@ -4849,7 +5057,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4849 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 5057 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4850 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 5058 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
4851 # not for PA HP-UX. 5059 # not for PA HP-UX.
4852 case "$host_cpu" in 5060 case $host_cpu in
4853 hppa*64*|ia64*) 5061 hppa*64*|ia64*)
4854 # +Z the default 5062 # +Z the default
4855 ;; 5063 ;;
@@ -4873,12 +5081,19 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4873 ;; 5081 ;;
4874 5082
4875 linux*) 5083 linux*)
4876 case $CC in 5084 case $cc_basename in
4877 icc* | ecc*) 5085 icc* | ecc*)
4878 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 5086 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4879 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 5087 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4880 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' 5088 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
4881 ;; 5089 ;;
5090 pgcc* | pgf77* | pgf90* | pgf95*)
5091 # Portland Group compilers (*not* the Pentium gcc compiler,
5092 # which looks to be a dead project)
5093 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5094 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
5095 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
5096 ;;
4882 ccc*) 5097 ccc*)
4883 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 5098 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4884 # All Alpha code is PIC. 5099 # All Alpha code is PIC.
@@ -4899,9 +5114,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4899 ;; 5114 ;;
4900 5115
4901 solaris*) 5116 solaris*)
4902 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4903 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 5117 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4904 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 5118 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
5119 case $cc_basename in
5120 f77* | f90* | f95*)
5121 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
5122 *)
5123 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
5124 esac
4905 ;; 5125 ;;
4906 5126
4907 sunos4*) 5127 sunos4*)
@@ -4923,6 +5143,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
4923 fi 5143 fi
4924 ;; 5144 ;;
4925 5145
5146 unicos*)
5147 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5148 _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
5149 ;;
5150
4926 uts4*) 5151 uts4*)
4927 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' 5152 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4928 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 5153 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4950,7 +5175,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
4950 [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= 5175 [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
4951 _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) 5176 _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
4952fi 5177fi
4953case "$host_os" in 5178case $host_os in
4954 # For platforms which do not support PIC, -DPIC is meaningless: 5179 # For platforms which do not support PIC, -DPIC is meaningless:
4955 *djgpp*) 5180 *djgpp*)
4956 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= 5181 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -4983,7 +5208,7 @@ ifelse([$1],[CXX],[
4983 _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 5208 _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4984 ;; 5209 ;;
4985 cygwin* | mingw*) 5210 cygwin* | mingw*)
4986 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' 5211 _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'
4987 ;; 5212 ;;
4988 linux*) 5213 linux*)
4989 _LT_AC_TAGVAR(link_all_deplibs, $1)=no 5214 _LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -5029,7 +5254,8 @@ ifelse([$1],[CXX],[
5029 # rely on this symbol name, it's probably fine to never include it in 5254 # rely on this symbol name, it's probably fine to never include it in
5030 # preloaded symbol tables. 5255 # preloaded symbol tables.
5031 extract_expsyms_cmds= 5256 extract_expsyms_cmds=
5032 5257 # Just being paranoid about ensuring that cc_basename is set.
5258 _LT_CC_BASENAME([$compiler])
5033 case $host_os in 5259 case $host_os in
5034 cygwin* | mingw* | pw32*) 5260 cygwin* | mingw* | pw32*)
5035 # FIXME: the MSVC++ port hasn't been tested in a loooong time 5261 # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -5049,6 +5275,27 @@ ifelse([$1],[CXX],[
5049 # If archive_cmds runs LD, not CC, wlarc should be empty 5275 # If archive_cmds runs LD, not CC, wlarc should be empty
5050 wlarc='${wl}' 5276 wlarc='${wl}'
5051 5277
5278 # Set some defaults for GNU ld with shared library support. These
5279 # are reset later if shared libraries are not supported. Putting them
5280 # here allows them to be overridden if necessary.
5281 runpath_var=LD_RUN_PATH
5282 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
5283 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5284 # ancient GNU ld didn't support --whole-archive et. al.
5285 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
5286 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
5287 else
5288 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
5289 fi
5290 supports_anon_versioning=no
5291 case `$LD -v 2>/dev/null` in
5292 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
5293 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
5294 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
5295 *\ 2.11.*) ;; # other 2.11 versions
5296 *) supports_anon_versioning=yes ;;
5297 esac
5298
5052 # See if GNU ld supports shared libraries. 5299 # See if GNU ld supports shared libraries.
5053 case $host_os in 5300 case $host_os in
5054 aix3* | aix4* | aix5*) 5301 aix3* | aix4* | aix5*)
@@ -5099,7 +5346,7 @@ EOF
5099 _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported 5346 _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
5100 _LT_AC_TAGVAR(always_export_symbols, $1)=no 5347 _LT_AC_TAGVAR(always_export_symbols, $1)=no
5101 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 5348 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5102 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' 5349 _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'
5103 5350
5104 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then 5351 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
5105 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 5352 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -5113,7 +5360,39 @@ EOF
5113 fi~ 5360 fi~
5114 $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 5361 $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
5115 else 5362 else
5116 ld_shlibs=no 5363 _LT_AC_TAGVAR(ld_shlibs, $1)=no
5364 fi
5365 ;;
5366
5367 linux*)
5368 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5369 tmp_addflag=
5370 case $cc_basename,$host_cpu in
5371 pgcc*) # Portland Group C compiler
5372 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
5373 tmp_addflag=' $pic_flag'
5374 ;;
5375 pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
5376 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
5377 tmp_addflag=' $pic_flag -Mnomain' ;;
5378 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
5379 tmp_addflag=' -i_dynamic' ;;
5380 efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
5381 tmp_addflag=' -i_dynamic -nofor_main' ;;
5382 ifc* | ifort*) # Intel Fortran compiler
5383 tmp_addflag=' -nofor_main' ;;
5384 esac
5385 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5386
5387 if test $supports_anon_versioning = yes; then
5388 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
5389 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
5390 $echo "local: *; };" >> $output_objdir/$libname.ver~
5391 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
5392 fi
5393 _LT_AC_TAGVAR(link_all_deplibs, $1)=no
5394 else
5395 _LT_AC_TAGVAR(ld_shlibs, $1)=no
5117 fi 5396 fi
5118 ;; 5397 ;;
5119 5398
@@ -5155,32 +5434,6 @@ EOF
5155 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no 5434 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5156 ;; 5435 ;;
5157 5436
5158 linux*)
5159 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5160 tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5161 _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
5162 supports_anon_versioning=no
5163 case `$LD -v 2>/dev/null` in
5164 *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
5165 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
5166 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
5167 *\ 2.11.*) ;; # other 2.11 versions
5168 *) supports_anon_versioning=yes ;;
5169 esac
5170 if test $supports_anon_versioning = yes; then
5171 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
5172cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
5173$echo "local: *; };" >> $output_objdir/$libname.ver~
5174 $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
5175 else
5176 _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
5177 fi
5178 _LT_AC_TAGVAR(link_all_deplibs, $1)=no
5179 else
5180 _LT_AC_TAGVAR(ld_shlibs, $1)=no
5181 fi
5182 ;;
5183
5184 *) 5437 *)
5185 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 5438 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5186 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 5439 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -5191,16 +5444,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5191 ;; 5444 ;;
5192 esac 5445 esac
5193 5446
5194 if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then 5447 if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
5195 runpath_var=LD_RUN_PATH 5448 runpath_var=
5196 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' 5449 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
5197 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 5450 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
5198 # ancient GNU ld didn't support --whole-archive et. al. 5451 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
5199 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
5200 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
5201 else
5202 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
5203 fi
5204 fi 5452 fi
5205 else 5453 else
5206 # PORTME fill in a description of your system's linker (not GNU ld) 5454 # PORTME fill in a description of your system's linker (not GNU ld)
@@ -5264,7 +5512,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5264 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 5512 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
5265 5513
5266 if test "$GCC" = yes; then 5514 if test "$GCC" = yes; then
5267 case $host_os in aix4.[012]|aix4.[012].*) 5515 case $host_os in aix4.[[012]]|aix4.[[012]].*)
5268 # We only want to do this on AIX 4.2 and lower, the check 5516 # We only want to do this on AIX 4.2 and lower, the check
5269 # below for broken collect2 doesn't work under 4.3+ 5517 # below for broken collect2 doesn't work under 4.3+
5270 collect2name=`${CC} -print-prog-name=collect2` 5518 collect2name=`${CC} -print-prog-name=collect2`
@@ -5285,6 +5533,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5285 fi 5533 fi
5286 esac 5534 esac
5287 shared_flag='-shared' 5535 shared_flag='-shared'
5536 if test "$aix_use_runtimelinking" = yes; then
5537 shared_flag="$shared_flag "'${wl}-G'
5538 fi
5288 else 5539 else
5289 # not using gcc 5540 # not using gcc
5290 if test "$host_cpu" = ia64; then 5541 if test "$host_cpu" = ia64; then
@@ -5329,7 +5580,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5329 # Exported symbols can be pulled into shared objects from archives 5580 # Exported symbols can be pulled into shared objects from archives
5330 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' 5581 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
5331 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes 5582 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
5332 # This is similar to how AIX traditionally builds it's shared libraries. 5583 # This is similar to how AIX traditionally builds its shared libraries.
5333 _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 5584 _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
5334 fi 5585 fi
5335 fi 5586 fi
@@ -5343,7 +5594,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5343 _LT_AC_TAGVAR(ld_shlibs, $1)=no 5594 _LT_AC_TAGVAR(ld_shlibs, $1)=no
5344 ;; 5595 ;;
5345 5596
5346 bsdi4*) 5597 bsdi[[45]]*)
5347 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic 5598 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
5348 ;; 5599 ;;
5349 5600
@@ -5364,57 +5615,57 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5364 _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' 5615 _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
5365 # FIXME: Should let the user specify the lib program. 5616 # FIXME: Should let the user specify the lib program.
5366 _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' 5617 _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
5367 fix_srcfile_path='`cygpath -w "$srcfile"`' 5618 _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
5368 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 5619 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5369 ;; 5620 ;;
5370 5621
5371 darwin* | rhapsody*) 5622 darwin* | rhapsody*)
5372 if test "$GXX" = yes ; then 5623 case $host_os in
5373 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 5624 rhapsody* | darwin1.[[012]])
5374 case "$host_os" in 5625 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
5375 rhapsody* | darwin1.[[012]]) 5626 ;;
5376 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' 5627 *) # Darwin 1.3 on
5377 ;; 5628 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
5378 *) # Darwin 1.3 on 5629 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
5379 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then 5630 else
5380 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' 5631 case ${MACOSX_DEPLOYMENT_TARGET} in
5381 else 5632 10.[[012]])
5382 case ${MACOSX_DEPLOYMENT_TARGET} in 5633 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
5383 10.[[012]]) 5634 ;;
5384 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' 5635 10.*)
5385 ;; 5636 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
5386 10.*) 5637 ;;
5387 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' 5638 esac
5388 ;; 5639 fi
5389 esac 5640 ;;
5390 fi
5391 ;;
5392 esac 5641 esac
5393 lt_int_apple_cc_single_mod=no 5642 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5394 output_verbose_link_cmd='echo'
5395 if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
5396 lt_int_apple_cc_single_mod=yes
5397 fi
5398 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
5399 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
5400 else
5401 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
5402 fi
5403 _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
5404 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
5405 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
5406 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5407 else
5408 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5409 fi
5410 _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}'
5411 _LT_AC_TAGVAR(hardcode_direct, $1)=no 5643 _LT_AC_TAGVAR(hardcode_direct, $1)=no
5412 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes 5644 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
5413 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported 5645 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
5414 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' 5646 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
5415 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 5647 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
5648 if test "$GCC" = yes ; then
5649 output_verbose_link_cmd='echo'
5650 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
5651 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
5652 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
5653 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5654 _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}'
5416 else 5655 else
5417 _LT_AC_TAGVAR(ld_shlibs, $1)=no 5656 case $cc_basename in
5657 xlc*)
5658 output_verbose_link_cmd='echo'
5659 _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'
5660 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
5661 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
5662 _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}'
5663 _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}'
5664 ;;
5665 *)
5666 _LT_AC_TAGVAR(ld_shlibs, $1)=no
5667 ;;
5668 esac
5418 fi 5669 fi
5419 ;; 5670 ;;
5420 5671
@@ -5448,7 +5699,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5448 ;; 5699 ;;
5449 5700
5450 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 5701 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5451 freebsd* | kfreebsd*-gnu) 5702 freebsd* | kfreebsd*-gnu | dragonfly*)
5452 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 5703 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
5453 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 5704 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5454 _LT_AC_TAGVAR(hardcode_direct, $1)=yes 5705 _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -5473,7 +5724,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5473 5724
5474 hpux10* | hpux11*) 5725 hpux10* | hpux11*)
5475 if test "$GCC" = yes -a "$with_gnu_ld" = no; then 5726 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
5476 case "$host_cpu" in 5727 case $host_cpu in
5477 hppa*64*|ia64*) 5728 hppa*64*|ia64*)
5478 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5729 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5479 ;; 5730 ;;
@@ -5482,7 +5733,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5482 ;; 5733 ;;
5483 esac 5734 esac
5484 else 5735 else
5485 case "$host_cpu" in 5736 case $host_cpu in
5486 hppa*64*|ia64*) 5737 hppa*64*|ia64*)
5487 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' 5738 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
5488 ;; 5739 ;;
@@ -5492,7 +5743,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5492 esac 5743 esac
5493 fi 5744 fi
5494 if test "$with_gnu_ld" = no; then 5745 if test "$with_gnu_ld" = no; then
5495 case "$host_cpu" in 5746 case $host_cpu in
5496 hppa*64*) 5747 hppa*64*)
5497 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' 5748 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
5498 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' 5749 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -5559,6 +5810,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5559 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no 5810 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5560 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 5811 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5561 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 5812 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
5813 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
5562 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' 5814 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5563 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' 5815 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
5564 else 5816 else
@@ -5604,7 +5856,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5604 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 5856 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5605 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' 5857 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
5606 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ 5858 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
5607 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' 5859 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
5608 5860
5609 # Both c and cxx compiler support -rpath directly 5861 # Both c and cxx compiler support -rpath directly
5610 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' 5862 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5623,10 +5875,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5623 solaris*) 5875 solaris*)
5624 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' 5876 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
5625 if test "$GCC" = yes; then 5877 if test "$GCC" = yes; then
5878 wlarc='${wl}'
5626 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5879 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5627 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 5880 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5628 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' 5881 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
5629 else 5882 else
5883 wlarc=''
5630 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' 5884 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
5631 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 5885 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5632 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' 5886 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -5635,8 +5889,18 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
5635 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no 5889 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5636 case $host_os in 5890 case $host_os in
5637 solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; 5891 solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
5638 *) # Supported since Solaris 2.6 (maybe 2.5.1?) 5892 *)
5639 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; 5893 # The compiler driver will combine linker options so we
5894 # cannot just pass the convience library names through
5895 # without $wl, iff we do not link with $LD.
5896 # Luckily, gcc supports the same syntax we need for Sun Studio.
5897 # Supported since Solaris 2.6 (maybe 2.5.1?)
5898 case $wlarc in
5899 '')
5900 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
5901 *)
5902 _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' ;;
5903 esac ;;
5640 esac 5904 esac
5641 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 5905 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
5642 ;; 5906 ;;
@@ -5897,7 +6161,7 @@ lt_ac_count=0
5897# Add /usr/xpg4/bin/sed as it is typically found on Solaris 6161# Add /usr/xpg4/bin/sed as it is typically found on Solaris
5898# along with /bin/sed that truncates output. 6162# along with /bin/sed that truncates output.
5899for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do 6163for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
5900 test ! -f $lt_ac_sed && break 6164 test ! -f $lt_ac_sed && continue
5901 cat /dev/null > conftest.in 6165 cat /dev/null > conftest.in
5902 lt_ac_count=0 6166 lt_ac_count=0
5903 echo $ECHO_N "0123456789$ECHO_C" >conftest.in 6167 echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -5922,14 +6186,13 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
5922 fi 6186 fi
5923 done 6187 done
5924done 6188done
5925SED=$lt_cv_path_SED
5926]) 6189])
6190SED=$lt_cv_path_SED
5927AC_MSG_RESULT([$SED]) 6191AC_MSG_RESULT([$SED])
5928]) 6192])
5929 6193
5930 6194
5931# serial 6 AC_LIB_LTDL 6195# serial 6 AC_LIB_LTDL
5932# Debian $Rev: 214 $
5933 6196
5934# AC_WITH_LTDL 6197# AC_WITH_LTDL
5935# ------------ 6198# ------------
@@ -5966,7 +6229,7 @@ fi
5966if test "x$with_included_ltdl" = xno; then 6229if test "x$with_included_ltdl" = xno; then
5967 # If the included ltdl is not to be used. then Use the 6230 # If the included ltdl is not to be used. then Use the
5968 # preinstalled libltdl we found. 6231 # preinstalled libltdl we found.
5969 AC_DEFINE([HAVE_LTDL], 1, 6232 AC_DEFINE([HAVE_LTDL], [1],
5970 [Define this if a modern libltdl is already installed]) 6233 [Define this if a modern libltdl is already installed])
5971 LIBLTDL=-lltdl 6234 LIBLTDL=-lltdl
5972fi 6235fi
@@ -6050,7 +6313,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
6050 # Assuming the user has installed a libdl from somewhere, this is true 6313 # Assuming the user has installed a libdl from somewhere, this is true
6051 # If you are looking for one http://www.opendarwin.org/projects/dlcompat 6314 # If you are looking for one http://www.opendarwin.org/projects/dlcompat
6052 libltdl_cv_sys_dlopen_deplibs=yes 6315 libltdl_cv_sys_dlopen_deplibs=yes
6053 ;; 6316 ;;
6054 gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) 6317 gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
6055 # GNU and its variants, using gnu ld.so (Glibc) 6318 # GNU and its variants, using gnu ld.so (Glibc)
6056 libltdl_cv_sys_dlopen_deplibs=yes 6319 libltdl_cv_sys_dlopen_deplibs=yes
@@ -6119,7 +6382,7 @@ module=yes
6119eval libltdl_cv_shlibext=$shrext_cmds 6382eval libltdl_cv_shlibext=$shrext_cmds
6120 ]) 6383 ])
6121if test -n "$libltdl_cv_shlibext"; then 6384if test -n "$libltdl_cv_shlibext"; then
6122 AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext", 6385 AC_DEFINE_UNQUOTED([LTDL_SHLIB_EXT], ["$libltdl_cv_shlibext"],
6123 [Define to the extension used for shared libraries, say, ".so".]) 6386 [Define to the extension used for shared libraries, say, ".so".])
6124fi 6387fi
6125])# AC_LTDL_SHLIBEXT 6388])# AC_LTDL_SHLIBEXT
@@ -6132,7 +6395,7 @@ AC_DEFUN([AC_LTDL_SHLIBPATH],
6132AC_CACHE_CHECK([which variable specifies run-time library path], 6395AC_CACHE_CHECK([which variable specifies run-time library path],
6133 [libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"]) 6396 [libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"])
6134if test -n "$libltdl_cv_shlibpath_var"; then 6397if test -n "$libltdl_cv_shlibpath_var"; then
6135 AC_DEFINE_UNQUOTED(LTDL_SHLIBPATH_VAR, "$libltdl_cv_shlibpath_var", 6398 AC_DEFINE_UNQUOTED([LTDL_SHLIBPATH_VAR], ["$libltdl_cv_shlibpath_var"],
6136 [Define to the name of the environment variable that determines the dynamic library search path.]) 6399 [Define to the name of the environment variable that determines the dynamic library search path.])
6137fi 6400fi
6138])# AC_LTDL_SHLIBPATH 6401])# AC_LTDL_SHLIBPATH
@@ -6154,7 +6417,7 @@ if test -n "$libltdl_cv_sys_search_path"; then
6154 sys_search_path="$sys_search_path$PATH_SEPARATOR$dir" 6417 sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
6155 fi 6418 fi
6156 done 6419 done
6157 AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path", 6420 AC_DEFINE_UNQUOTED([LTDL_SYSSEARCHPATH], ["$sys_search_path"],
6158 [Define to the system default library search path.]) 6421 [Define to the system default library search path.])
6159fi 6422fi
6160])# AC_LTDL_SYSSEARCHPATH 6423])# AC_LTDL_SYSSEARCHPATH
@@ -6180,7 +6443,7 @@ AC_DEFUN([AC_LTDL_OBJDIR],
6180 rmdir .libs 2>/dev/null 6443 rmdir .libs 2>/dev/null
6181 fi 6444 fi
6182 ]) 6445 ])
6183AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/", 6446AC_DEFINE_UNQUOTED([LTDL_OBJDIR], ["$libltdl_cv_objdir/"],
6184 [Define to the sub-directory in which libtool stores uninstalled libraries.]) 6447 [Define to the sub-directory in which libtool stores uninstalled libraries.])
6185])# AC_LTDL_OBJDIR 6448])# AC_LTDL_OBJDIR
6186 6449
@@ -6198,7 +6461,7 @@ AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
6198 fi 6461 fi
6199 ]) 6462 ])
6200if test x"$libltdl_cv_preloaded_symbols" = xyes; then 6463if test x"$libltdl_cv_preloaded_symbols" = xyes; then
6201 AC_DEFINE(HAVE_PRELOADED_SYMBOLS, 1, 6464 AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
6202 [Define if libtool can extract symbol lists from object files.]) 6465 [Define if libtool can extract symbol lists from object files.])
6203fi 6466fi
6204])# AC_LTDL_DLPREOPEN 6467])# AC_LTDL_DLPREOPEN
@@ -6317,7 +6580,7 @@ if test x"$ac_cv_sys_symbol_underscore" = xyes; then
6317fi 6580fi
6318 6581
6319if test x"$libltdl_cv_need_uscore" = xyes; then 6582if test x"$libltdl_cv_need_uscore" = xyes; then
6320 AC_DEFINE(NEED_USCORE, 1, 6583 AC_DEFINE([NEED_USCORE], [1],
6321 [Define if dlsym() requires a leading underscore in symbol names.]) 6584 [Define if dlsym() requires a leading underscore in symbol names.])
6322fi 6585fi
6323])# AC_LTDL_DLSYM_USCORE 6586])# AC_LTDL_DLSYM_USCORE
diff --git a/libltdl/config.guess b/libltdl/config.guess
index 45bee139..ad5281e6 100755
--- a/libltdl/config.guess
+++ b/libltdl/config.guess
@@ -3,7 +3,7 @@
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 4# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5 5
6timestamp='2005-04-22' 6timestamp='2005-08-03'
7 7
8# This file is free software; you can redistribute it and/or modify it 8# This file is free software; you can redistribute it and/or modify it
9# under the terms of the GNU General Public License as published by 9# under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ timestamp='2005-04-22'
17# 17#
18# You should have received a copy of the GNU General Public License 18# You should have received a copy of the GNU General Public License
19# along with this program; if not, write to the Free Software 19# along with this program; if not, write to the Free Software
20# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21# 02110-1301, USA.
21# 22#
22# As a special exception to the GNU General Public License, if you 23# As a special exception to the GNU General Public License, if you
23# distribute this file as part of a program that contains a 24# distribute this file as part of a program that contains a
24# configuration script generated by Autoconf, you may include it under 25# configuration script generated by Autoconf, you may include it under
25# the same distribution terms that you use for the rest of that program. 26# the same distribution terms that you use for the rest of that program.
26 27
28
27# Originally written by Per Bothner <per@bothner.com>. 29# Originally written by Per Bothner <per@bothner.com>.
28# Please send patches to <config-patches@gnu.org>. Submit a context 30# Please send patches to <config-patches@gnu.org>. Submit a context
29# diff and a properly formatted ChangeLog entry. 31# diff and a properly formatted ChangeLog entry.
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
66while test $# -gt 0 ; do 68while test $# -gt 0 ; do
67 case $1 in 69 case $1 in
68 --time-stamp | --time* | -t ) 70 --time-stamp | --time* | -t )
69 echo "$timestamp" ; exit 0 ;; 71 echo "$timestamp" ; exit ;;
70 --version | -v ) 72 --version | -v )
71 echo "$version" ; exit 0 ;; 73 echo "$version" ; exit ;;
72 --help | --h* | -h ) 74 --help | --h* | -h )
73 echo "$usage"; exit 0 ;; 75 echo "$usage"; exit ;;
74 -- ) # Stop option processing 76 -- ) # Stop option processing
75 shift; break ;; 77 shift; break ;;
76 - ) # Use stdin as input. 78 - ) # Use stdin as input.
@@ -123,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
123 ;; 125 ;;
124 ,,*) CC_FOR_BUILD=$CC ;; 126 ,,*) CC_FOR_BUILD=$CC ;;
125 ,*,*) CC_FOR_BUILD=$HOST_CC ;; 127 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
126esac ;' 128esac ; set_cc_for_build= ;'
127 129
128# This is needed to find uname on a Pyramid OSx when run in the BSD universe. 130# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
129# (ghazi@noc.rutgers.edu 1994-08-24) 131# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
196 # contains redundant information, the shorter form: 198 # contains redundant information, the shorter form:
197 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 199 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
198 echo "${machine}-${os}${release}" 200 echo "${machine}-${os}${release}"
199 exit 0 ;; 201 exit ;;
200 amd64:OpenBSD:*:*)
201 echo x86_64-unknown-openbsd${UNAME_RELEASE}
202 exit 0 ;;
203 amiga:OpenBSD:*:*)
204 echo m68k-unknown-openbsd${UNAME_RELEASE}
205 exit 0 ;;
206 cats:OpenBSD:*:*)
207 echo arm-unknown-openbsd${UNAME_RELEASE}
208 exit 0 ;;
209 hp300:OpenBSD:*:*)
210 echo m68k-unknown-openbsd${UNAME_RELEASE}
211 exit 0 ;;
212 luna88k:OpenBSD:*:*)
213 echo m88k-unknown-openbsd${UNAME_RELEASE}
214 exit 0 ;;
215 mac68k:OpenBSD:*:*)
216 echo m68k-unknown-openbsd${UNAME_RELEASE}
217 exit 0 ;;
218 macppc:OpenBSD:*:*)
219 echo powerpc-unknown-openbsd${UNAME_RELEASE}
220 exit 0 ;;
221 mvme68k:OpenBSD:*:*)
222 echo m68k-unknown-openbsd${UNAME_RELEASE}
223 exit 0 ;;
224 mvme88k:OpenBSD:*:*)
225 echo m88k-unknown-openbsd${UNAME_RELEASE}
226 exit 0 ;;
227 mvmeppc:OpenBSD:*:*)
228 echo powerpc-unknown-openbsd${UNAME_RELEASE}
229 exit 0 ;;
230 sgi:OpenBSD:*:*)
231 echo mips64-unknown-openbsd${UNAME_RELEASE}
232 exit 0 ;;
233 sun3:OpenBSD:*:*)
234 echo m68k-unknown-openbsd${UNAME_RELEASE}
235 exit 0 ;;
236 *:OpenBSD:*:*) 202 *:OpenBSD:*:*)
237 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} 203 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
238 exit 0 ;; 204 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
205 exit ;;
239 *:ekkoBSD:*:*) 206 *:ekkoBSD:*:*)
240 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 207 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
241 exit 0 ;; 208 exit ;;
242 macppc:MirBSD:*:*) 209 macppc:MirBSD:*:*)
243 echo powerppc-unknown-mirbsd${UNAME_RELEASE} 210 echo powerppc-unknown-mirbsd${UNAME_RELEASE}
244 exit 0 ;; 211 exit ;;
245 *:MirBSD:*:*) 212 *:MirBSD:*:*)
246 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 213 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
247 exit 0 ;; 214 exit ;;
248 alpha:OSF1:*:*) 215 alpha:OSF1:*:*)
249 case $UNAME_RELEASE in 216 case $UNAME_RELEASE in
250 *4.0) 217 *4.0)
@@ -297,40 +264,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
297 # A Xn.n version is an unreleased experimental baselevel. 264 # A Xn.n version is an unreleased experimental baselevel.
298 # 1.2 uses "1.2" for uname -r. 265 # 1.2 uses "1.2" for uname -r.
299 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 266 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
300 exit 0 ;; 267 exit ;;
301 Alpha\ *:Windows_NT*:*) 268 Alpha\ *:Windows_NT*:*)
302 # How do we know it's Interix rather than the generic POSIX subsystem? 269 # How do we know it's Interix rather than the generic POSIX subsystem?
303 # Should we change UNAME_MACHINE based on the output of uname instead 270 # Should we change UNAME_MACHINE based on the output of uname instead
304 # of the specific Alpha model? 271 # of the specific Alpha model?
305 echo alpha-pc-interix 272 echo alpha-pc-interix
306 exit 0 ;; 273 exit ;;
307 21064:Windows_NT:50:3) 274 21064:Windows_NT:50:3)
308 echo alpha-dec-winnt3.5 275 echo alpha-dec-winnt3.5
309 exit 0 ;; 276 exit ;;
310 Amiga*:UNIX_System_V:4.0:*) 277 Amiga*:UNIX_System_V:4.0:*)
311 echo m68k-unknown-sysv4 278 echo m68k-unknown-sysv4
312 exit 0;; 279 exit ;;
313 *:[Aa]miga[Oo][Ss]:*:*) 280 *:[Aa]miga[Oo][Ss]:*:*)
314 echo ${UNAME_MACHINE}-unknown-amigaos 281 echo ${UNAME_MACHINE}-unknown-amigaos
315 exit 0 ;; 282 exit ;;
316 *:[Mm]orph[Oo][Ss]:*:*) 283 *:[Mm]orph[Oo][Ss]:*:*)
317 echo ${UNAME_MACHINE}-unknown-morphos 284 echo ${UNAME_MACHINE}-unknown-morphos
318 exit 0 ;; 285 exit ;;
319 *:OS/390:*:*) 286 *:OS/390:*:*)
320 echo i370-ibm-openedition 287 echo i370-ibm-openedition
321 exit 0 ;; 288 exit ;;
322 *:z/VM:*:*) 289 *:z/VM:*:*)
323 echo s390-ibm-zvmoe 290 echo s390-ibm-zvmoe
324 exit 0 ;; 291 exit ;;
325 *:OS400:*:*) 292 *:OS400:*:*)
326 echo powerpc-ibm-os400 293 echo powerpc-ibm-os400
327 exit 0 ;; 294 exit ;;
328 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 295 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
329 echo arm-acorn-riscix${UNAME_RELEASE} 296 echo arm-acorn-riscix${UNAME_RELEASE}
330 exit 0;; 297 exit ;;
298 arm:riscos:*:*|arm:RISCOS:*:*)
299 echo arm-unknown-riscos
300 exit ;;
331 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) 301 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
332 echo hppa1.1-hitachi-hiuxmpp 302 echo hppa1.1-hitachi-hiuxmpp
333 exit 0;; 303 exit ;;
334 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) 304 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
335 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. 305 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
336 if test "`(/bin/universe) 2>/dev/null`" = att ; then 306 if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +308,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
338 else 308 else
339 echo pyramid-pyramid-bsd 309 echo pyramid-pyramid-bsd
340 fi 310 fi
341 exit 0 ;; 311 exit ;;
342 NILE*:*:*:dcosx) 312 NILE*:*:*:dcosx)
343 echo pyramid-pyramid-svr4 313 echo pyramid-pyramid-svr4
344 exit 0 ;; 314 exit ;;
345 DRS?6000:unix:4.0:6*) 315 DRS?6000:unix:4.0:6*)
346 echo sparc-icl-nx6 316 echo sparc-icl-nx6
347 exit 0 ;; 317 exit ;;
348 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) 318 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
349 case `/usr/bin/uname -p` in 319 case `/usr/bin/uname -p` in
350 sparc) echo sparc-icl-nx7 && exit 0 ;; 320 sparc) echo sparc-icl-nx7; exit ;;
351 esac ;; 321 esac ;;
352 sun4H:SunOS:5.*:*) 322 sun4H:SunOS:5.*:*)
353 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 323 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
354 exit 0 ;; 324 exit ;;
355 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 325 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
356 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 326 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
357 exit 0 ;; 327 exit ;;
358 i86pc:SunOS:5.*:*) 328 i86pc:SunOS:5.*:*)
359 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 329 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
360 exit 0 ;; 330 exit ;;
361 sun4*:SunOS:6*:*) 331 sun4*:SunOS:6*:*)
362 # According to config.sub, this is the proper way to canonicalize 332 # According to config.sub, this is the proper way to canonicalize
363 # SunOS6. Hard to guess exactly what SunOS6 will be like, but 333 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
364 # it's likely to be more like Solaris than SunOS4. 334 # it's likely to be more like Solaris than SunOS4.
365 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 335 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
366 exit 0 ;; 336 exit ;;
367 sun4*:SunOS:*:*) 337 sun4*:SunOS:*:*)
368 case "`/usr/bin/arch -k`" in 338 case "`/usr/bin/arch -k`" in
369 Series*|S4*) 339 Series*|S4*)
@@ -372,10 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
372 esac 342 esac
373 # Japanese Language versions have a version number like `4.1.3-JL'. 343 # Japanese Language versions have a version number like `4.1.3-JL'.
374 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` 344 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
375 exit 0 ;; 345 exit ;;
376 sun3*:SunOS:*:*) 346 sun3*:SunOS:*:*)
377 echo m68k-sun-sunos${UNAME_RELEASE} 347 echo m68k-sun-sunos${UNAME_RELEASE}
378 exit 0 ;; 348 exit ;;
379 sun*:*:4.2BSD:*) 349 sun*:*:4.2BSD:*)
380 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 350 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
381 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 351 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +357,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
387 echo sparc-sun-sunos${UNAME_RELEASE} 357 echo sparc-sun-sunos${UNAME_RELEASE}
388 ;; 358 ;;
389 esac 359 esac
390 exit 0 ;; 360 exit ;;
391 aushp:SunOS:*:*) 361 aushp:SunOS:*:*)
392 echo sparc-auspex-sunos${UNAME_RELEASE} 362 echo sparc-auspex-sunos${UNAME_RELEASE}
393 exit 0 ;; 363 exit ;;
394 # The situation for MiNT is a little confusing. The machine name 364 # The situation for MiNT is a little confusing. The machine name
395 # can be virtually everything (everything which is not 365 # can be virtually everything (everything which is not
396 # "atarist" or "atariste" at least should have a processor 366 # "atarist" or "atariste" at least should have a processor
@@ -401,40 +371,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
401 # be no problem. 371 # be no problem.
402 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 372 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
403 echo m68k-atari-mint${UNAME_RELEASE} 373 echo m68k-atari-mint${UNAME_RELEASE}
404 exit 0 ;; 374 exit ;;
405 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 375 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
406 echo m68k-atari-mint${UNAME_RELEASE} 376 echo m68k-atari-mint${UNAME_RELEASE}
407 exit 0 ;; 377 exit ;;
408 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 378 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
409 echo m68k-atari-mint${UNAME_RELEASE} 379 echo m68k-atari-mint${UNAME_RELEASE}
410 exit 0 ;; 380 exit ;;
411 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 381 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
412 echo m68k-milan-mint${UNAME_RELEASE} 382 echo m68k-milan-mint${UNAME_RELEASE}
413 exit 0 ;; 383 exit ;;
414 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 384 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
415 echo m68k-hades-mint${UNAME_RELEASE} 385 echo m68k-hades-mint${UNAME_RELEASE}
416 exit 0 ;; 386 exit ;;
417 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 387 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
418 echo m68k-unknown-mint${UNAME_RELEASE} 388 echo m68k-unknown-mint${UNAME_RELEASE}
419 exit 0 ;; 389 exit ;;
420 m68k:machten:*:*) 390 m68k:machten:*:*)
421 echo m68k-apple-machten${UNAME_RELEASE} 391 echo m68k-apple-machten${UNAME_RELEASE}
422 exit 0 ;; 392 exit ;;
423 powerpc:machten:*:*) 393 powerpc:machten:*:*)
424 echo powerpc-apple-machten${UNAME_RELEASE} 394 echo powerpc-apple-machten${UNAME_RELEASE}
425 exit 0 ;; 395 exit ;;
426 RISC*:Mach:*:*) 396 RISC*:Mach:*:*)
427 echo mips-dec-mach_bsd4.3 397 echo mips-dec-mach_bsd4.3
428 exit 0 ;; 398 exit ;;
429 RISC*:ULTRIX:*:*) 399 RISC*:ULTRIX:*:*)
430 echo mips-dec-ultrix${UNAME_RELEASE} 400 echo mips-dec-ultrix${UNAME_RELEASE}
431 exit 0 ;; 401 exit ;;
432 VAX*:ULTRIX*:*:*) 402 VAX*:ULTRIX*:*:*)
433 echo vax-dec-ultrix${UNAME_RELEASE} 403 echo vax-dec-ultrix${UNAME_RELEASE}
434 exit 0 ;; 404 exit ;;
435 2020:CLIX:*:* | 2430:CLIX:*:*) 405 2020:CLIX:*:* | 2430:CLIX:*:*)
436 echo clipper-intergraph-clix${UNAME_RELEASE} 406 echo clipper-intergraph-clix${UNAME_RELEASE}
437 exit 0 ;; 407 exit ;;
438 mips:*:*:UMIPS | mips:*:*:RISCos) 408 mips:*:*:UMIPS | mips:*:*:RISCos)
439 eval $set_cc_for_build 409 eval $set_cc_for_build
440 sed 's/^ //' << EOF >$dummy.c 410 sed 's/^ //' << EOF >$dummy.c
@@ -458,32 +428,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
458 exit (-1); 428 exit (-1);
459 } 429 }
460EOF 430EOF
461 $CC_FOR_BUILD -o $dummy $dummy.c \ 431 $CC_FOR_BUILD -o $dummy $dummy.c &&
462 && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ 432 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
463 && exit 0 433 SYSTEM_NAME=`$dummy $dummyarg` &&
434 { echo "$SYSTEM_NAME"; exit; }
464 echo mips-mips-riscos${UNAME_RELEASE} 435 echo mips-mips-riscos${UNAME_RELEASE}
465 exit 0 ;; 436 exit ;;
466 Motorola:PowerMAX_OS:*:*) 437 Motorola:PowerMAX_OS:*:*)
467 echo powerpc-motorola-powermax 438 echo powerpc-motorola-powermax
468 exit 0 ;; 439 exit ;;
469 Motorola:*:4.3:PL8-*) 440 Motorola:*:4.3:PL8-*)
470 echo powerpc-harris-powermax 441 echo powerpc-harris-powermax
471 exit 0 ;; 442 exit ;;
472 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) 443 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
473 echo powerpc-harris-powermax 444 echo powerpc-harris-powermax
474 exit 0 ;; 445 exit ;;
475 Night_Hawk:Power_UNIX:*:*) 446 Night_Hawk:Power_UNIX:*:*)
476 echo powerpc-harris-powerunix 447 echo powerpc-harris-powerunix
477 exit 0 ;; 448 exit ;;
478 m88k:CX/UX:7*:*) 449 m88k:CX/UX:7*:*)
479 echo m88k-harris-cxux7 450 echo m88k-harris-cxux7
480 exit 0 ;; 451 exit ;;
481 m88k:*:4*:R4*) 452 m88k:*:4*:R4*)
482 echo m88k-motorola-sysv4 453 echo m88k-motorola-sysv4
483 exit 0 ;; 454 exit ;;
484 m88k:*:3*:R3*) 455 m88k:*:3*:R3*)
485 echo m88k-motorola-sysv3 456 echo m88k-motorola-sysv3
486 exit 0 ;; 457 exit ;;
487 AViiON:dgux:*:*) 458 AViiON:dgux:*:*)
488 # DG/UX returns AViiON for all architectures 459 # DG/UX returns AViiON for all architectures
489 UNAME_PROCESSOR=`/usr/bin/uname -p` 460 UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +470,29 @@ EOF
499 else 470 else
500 echo i586-dg-dgux${UNAME_RELEASE} 471 echo i586-dg-dgux${UNAME_RELEASE}
501 fi 472 fi
502 exit 0 ;; 473 exit ;;
503 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 474 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
504 echo m88k-dolphin-sysv3 475 echo m88k-dolphin-sysv3
505 exit 0 ;; 476 exit ;;
506 M88*:*:R3*:*) 477 M88*:*:R3*:*)
507 # Delta 88k system running SVR3 478 # Delta 88k system running SVR3
508 echo m88k-motorola-sysv3 479 echo m88k-motorola-sysv3
509 exit 0 ;; 480 exit ;;
510 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) 481 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
511 echo m88k-tektronix-sysv3 482 echo m88k-tektronix-sysv3
512 exit 0 ;; 483 exit ;;
513 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) 484 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
514 echo m68k-tektronix-bsd 485 echo m68k-tektronix-bsd
515 exit 0 ;; 486 exit ;;
516 *:IRIX*:*:*) 487 *:IRIX*:*:*)
517 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` 488 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
518 exit 0 ;; 489 exit ;;
519 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. 490 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
520 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id 491 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
521 exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' 492 exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
522 i*86:AIX:*:*) 493 i*86:AIX:*:*)
523 echo i386-ibm-aix 494 echo i386-ibm-aix
524 exit 0 ;; 495 exit ;;
525 ia64:AIX:*:*) 496 ia64:AIX:*:*)
526 if [ -x /usr/bin/oslevel ] ; then 497 if [ -x /usr/bin/oslevel ] ; then
527 IBM_REV=`/usr/bin/oslevel` 498 IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +500,7 @@ EOF
529 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 500 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
530 fi 501 fi
531 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} 502 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
532 exit 0 ;; 503 exit ;;
533 *:AIX:2:3) 504 *:AIX:2:3)
534 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then 505 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
535 eval $set_cc_for_build 506 eval $set_cc_for_build
@@ -544,14 +515,18 @@ EOF
544 exit(0); 515 exit(0);
545 } 516 }
546EOF 517EOF
547 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 518 if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
548 echo rs6000-ibm-aix3.2.5 519 then
520 echo "$SYSTEM_NAME"
521 else
522 echo rs6000-ibm-aix3.2.5
523 fi
549 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then 524 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
550 echo rs6000-ibm-aix3.2.4 525 echo rs6000-ibm-aix3.2.4
551 else 526 else
552 echo rs6000-ibm-aix3.2 527 echo rs6000-ibm-aix3.2
553 fi 528 fi
554 exit 0 ;; 529 exit ;;
555 *:AIX:*:[45]) 530 *:AIX:*:[45])
556 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 531 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
557 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 532 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -565,28 +540,28 @@ EOF
565 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 540 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
566 fi 541 fi
567 echo ${IBM_ARCH}-ibm-aix${IBM_REV} 542 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
568 exit 0 ;; 543 exit ;;
569 *:AIX:*:*) 544 *:AIX:*:*)
570 echo rs6000-ibm-aix 545 echo rs6000-ibm-aix
571 exit 0 ;; 546 exit ;;
572 ibmrt:4.4BSD:*|romp-ibm:BSD:*) 547 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
573 echo romp-ibm-bsd4.4 548 echo romp-ibm-bsd4.4
574 exit 0 ;; 549 exit ;;
575 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and 550 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
576 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to 551 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
577 exit 0 ;; # report: romp-ibm BSD 4.3 552 exit ;; # report: romp-ibm BSD 4.3
578 *:BOSX:*:*) 553 *:BOSX:*:*)
579 echo rs6000-bull-bosx 554 echo rs6000-bull-bosx
580 exit 0 ;; 555 exit ;;
581 DPX/2?00:B.O.S.:*:*) 556 DPX/2?00:B.O.S.:*:*)
582 echo m68k-bull-sysv3 557 echo m68k-bull-sysv3
583 exit 0 ;; 558 exit ;;
584 9000/[34]??:4.3bsd:1.*:*) 559 9000/[34]??:4.3bsd:1.*:*)
585 echo m68k-hp-bsd 560 echo m68k-hp-bsd
586 exit 0 ;; 561 exit ;;
587 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) 562 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
588 echo m68k-hp-bsd4.4 563 echo m68k-hp-bsd4.4
589 exit 0 ;; 564 exit ;;
590 9000/[34678]??:HP-UX:*:*) 565 9000/[34678]??:HP-UX:*:*)
591 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 566 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
592 case "${UNAME_MACHINE}" in 567 case "${UNAME_MACHINE}" in
@@ -648,9 +623,19 @@ EOF
648 esac 623 esac
649 if [ ${HP_ARCH} = "hppa2.0w" ] 624 if [ ${HP_ARCH} = "hppa2.0w" ]
650 then 625 then
651 # avoid double evaluation of $set_cc_for_build 626 eval $set_cc_for_build
652 test -n "$CC_FOR_BUILD" || eval $set_cc_for_build 627
653 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null 628 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
629 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
630 # generating 64-bit code. GNU and HP use different nomenclature:
631 #
632 # $ CC_FOR_BUILD=cc ./config.guess
633 # => hppa2.0w-hp-hpux11.23
634 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
635 # => hppa64-hp-hpux11.23
636
637 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
638 grep __LP64__ >/dev/null
654 then 639 then
655 HP_ARCH="hppa2.0w" 640 HP_ARCH="hppa2.0w"
656 else 641 else
@@ -658,11 +643,11 @@ EOF
658 fi 643 fi
659 fi 644 fi
660 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 645 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
661 exit 0 ;; 646 exit ;;
662 ia64:HP-UX:*:*) 647 ia64:HP-UX:*:*)
663 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 648 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
664 echo ia64-hp-hpux${HPUX_REV} 649 echo ia64-hp-hpux${HPUX_REV}
665 exit 0 ;; 650 exit ;;
666 3050*:HI-UX:*:*) 651 3050*:HI-UX:*:*)
667 eval $set_cc_for_build 652 eval $set_cc_for_build
668 sed 's/^ //' << EOF >$dummy.c 653 sed 's/^ //' << EOF >$dummy.c
@@ -690,161 +675,166 @@ EOF
690 exit (0); 675 exit (0);
691 } 676 }
692EOF 677EOF
693 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 678 $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
679 { echo "$SYSTEM_NAME"; exit; }
694 echo unknown-hitachi-hiuxwe2 680 echo unknown-hitachi-hiuxwe2
695 exit 0 ;; 681 exit ;;
696 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 682 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
697 echo hppa1.1-hp-bsd 683 echo hppa1.1-hp-bsd
698 exit 0 ;; 684 exit ;;
699 9000/8??:4.3bsd:*:*) 685 9000/8??:4.3bsd:*:*)
700 echo hppa1.0-hp-bsd 686 echo hppa1.0-hp-bsd
701 exit 0 ;; 687 exit ;;
702 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) 688 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
703 echo hppa1.0-hp-mpeix 689 echo hppa1.0-hp-mpeix
704 exit 0 ;; 690 exit ;;
705 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) 691 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
706 echo hppa1.1-hp-osf 692 echo hppa1.1-hp-osf
707 exit 0 ;; 693 exit ;;
708 hp8??:OSF1:*:*) 694 hp8??:OSF1:*:*)
709 echo hppa1.0-hp-osf 695 echo hppa1.0-hp-osf
710 exit 0 ;; 696 exit ;;
711 i*86:OSF1:*:*) 697 i*86:OSF1:*:*)
712 if [ -x /usr/sbin/sysversion ] ; then 698 if [ -x /usr/sbin/sysversion ] ; then
713 echo ${UNAME_MACHINE}-unknown-osf1mk 699 echo ${UNAME_MACHINE}-unknown-osf1mk
714 else 700 else
715 echo ${UNAME_MACHINE}-unknown-osf1 701 echo ${UNAME_MACHINE}-unknown-osf1
716 fi 702 fi
717 exit 0 ;; 703 exit ;;
718 parisc*:Lites*:*:*) 704 parisc*:Lites*:*:*)
719 echo hppa1.1-hp-lites 705 echo hppa1.1-hp-lites
720 exit 0 ;; 706 exit ;;
721 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 707 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
722 echo c1-convex-bsd 708 echo c1-convex-bsd
723 exit 0 ;; 709 exit ;;
724 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 710 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
725 if getsysinfo -f scalar_acc 711 if getsysinfo -f scalar_acc
726 then echo c32-convex-bsd 712 then echo c32-convex-bsd
727 else echo c2-convex-bsd 713 else echo c2-convex-bsd
728 fi 714 fi
729 exit 0 ;; 715 exit ;;
730 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 716 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
731 echo c34-convex-bsd 717 echo c34-convex-bsd
732 exit 0 ;; 718 exit ;;
733 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 719 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
734 echo c38-convex-bsd 720 echo c38-convex-bsd
735 exit 0 ;; 721 exit ;;
736 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 722 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
737 echo c4-convex-bsd 723 echo c4-convex-bsd
738 exit 0 ;; 724 exit ;;
739 CRAY*Y-MP:*:*:*) 725 CRAY*Y-MP:*:*:*)
740 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 726 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
741 exit 0 ;; 727 exit ;;
742 CRAY*[A-Z]90:*:*:*) 728 CRAY*[A-Z]90:*:*:*)
743 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ 729 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
744 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ 730 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
745 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ 731 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
746 -e 's/\.[^.]*$/.X/' 732 -e 's/\.[^.]*$/.X/'
747 exit 0 ;; 733 exit ;;
748 CRAY*TS:*:*:*) 734 CRAY*TS:*:*:*)
749 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 735 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
750 exit 0 ;; 736 exit ;;
751 CRAY*T3E:*:*:*) 737 CRAY*T3E:*:*:*)
752 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 738 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
753 exit 0 ;; 739 exit ;;
754 CRAY*SV1:*:*:*) 740 CRAY*SV1:*:*:*)
755 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 741 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
756 exit 0 ;; 742 exit ;;
757 *:UNICOS/mp:*:*) 743 *:UNICOS/mp:*:*)
758 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 744 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
759 exit 0 ;; 745 exit ;;
760 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 746 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
761 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 747 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
762 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 748 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
763 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 749 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
764 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 750 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
765 exit 0 ;; 751 exit ;;
766 5000:UNIX_System_V:4.*:*) 752 5000:UNIX_System_V:4.*:*)
767 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 753 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
768 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 754 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
769 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 755 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
770 exit 0 ;; 756 exit ;;
771 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 757 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
772 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 758 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
773 exit 0 ;; 759 exit ;;
774 sparc*:BSD/OS:*:*) 760 sparc*:BSD/OS:*:*)
775 echo sparc-unknown-bsdi${UNAME_RELEASE} 761 echo sparc-unknown-bsdi${UNAME_RELEASE}
776 exit 0 ;; 762 exit ;;
777 *:BSD/OS:*:*) 763 *:BSD/OS:*:*)
778 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 764 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
779 exit 0 ;; 765 exit ;;
780 *:FreeBSD:*:*) 766 *:FreeBSD:*:*)
781 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 767 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
782 exit 0 ;; 768 exit ;;
783 i*:CYGWIN*:*) 769 i*:CYGWIN*:*)
784 echo ${UNAME_MACHINE}-pc-cygwin 770 echo ${UNAME_MACHINE}-pc-cygwin
785 exit 0 ;; 771 exit ;;
786 i*:MINGW*:*) 772 i*:MINGW*:*)
787 echo ${UNAME_MACHINE}-pc-mingw32 773 echo ${UNAME_MACHINE}-pc-mingw32
788 exit 0 ;; 774 exit ;;
775 i*:windows32*:*)
776 # uname -m includes "-pc" on this system.
777 echo ${UNAME_MACHINE}-mingw32
778 exit ;;
789 i*:PW*:*) 779 i*:PW*:*)
790 echo ${UNAME_MACHINE}-pc-pw32 780 echo ${UNAME_MACHINE}-pc-pw32
791 exit 0 ;; 781 exit ;;
792 x86:Interix*:[34]*) 782 x86:Interix*:[34]*)
793 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' 783 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
794 exit 0 ;; 784 exit ;;
795 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 785 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
796 echo i${UNAME_MACHINE}-pc-mks 786 echo i${UNAME_MACHINE}-pc-mks
797 exit 0 ;; 787 exit ;;
798 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 788 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
799 # How do we know it's Interix rather than the generic POSIX subsystem? 789 # How do we know it's Interix rather than the generic POSIX subsystem?
800 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 790 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
801 # UNAME_MACHINE based on the output of uname instead of i386? 791 # UNAME_MACHINE based on the output of uname instead of i386?
802 echo i586-pc-interix 792 echo i586-pc-interix
803 exit 0 ;; 793 exit ;;
804 i*:UWIN*:*) 794 i*:UWIN*:*)
805 echo ${UNAME_MACHINE}-pc-uwin 795 echo ${UNAME_MACHINE}-pc-uwin
806 exit 0 ;; 796 exit ;;
807 amd64:CYGWIN*:*:*) 797 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
808 echo x86_64-unknown-cygwin 798 echo x86_64-unknown-cygwin
809 exit 0 ;; 799 exit ;;
810 p*:CYGWIN*:*) 800 p*:CYGWIN*:*)
811 echo powerpcle-unknown-cygwin 801 echo powerpcle-unknown-cygwin
812 exit 0 ;; 802 exit ;;
813 prep*:SunOS:5.*:*) 803 prep*:SunOS:5.*:*)
814 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 804 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
815 exit 0 ;; 805 exit ;;
816 *:GNU:*:*) 806 *:GNU:*:*)
817 # the GNU system 807 # the GNU system
818 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 808 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
819 exit 0 ;; 809 exit ;;
820 *:GNU/*:*:*) 810 *:GNU/*:*:*)
821 # other systems with GNU libc and userland 811 # other systems with GNU libc and userland
822 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu 812 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
823 exit 0 ;; 813 exit ;;
824 i*86:Minix:*:*) 814 i*86:Minix:*:*)
825 echo ${UNAME_MACHINE}-pc-minix 815 echo ${UNAME_MACHINE}-pc-minix
826 exit 0 ;; 816 exit ;;
827 arm*:Linux:*:*) 817 arm*:Linux:*:*)
828 echo ${UNAME_MACHINE}-unknown-linux-gnu 818 echo ${UNAME_MACHINE}-unknown-linux-gnu
829 exit 0 ;; 819 exit ;;
830 cris:Linux:*:*) 820 cris:Linux:*:*)
831 echo cris-axis-linux-gnu 821 echo cris-axis-linux-gnu
832 exit 0 ;; 822 exit ;;
833 crisv32:Linux:*:*) 823 crisv32:Linux:*:*)
834 echo crisv32-axis-linux-gnu 824 echo crisv32-axis-linux-gnu
835 exit 0 ;; 825 exit ;;
836 frv:Linux:*:*) 826 frv:Linux:*:*)
837 echo frv-unknown-linux-gnu 827 echo frv-unknown-linux-gnu
838 exit 0 ;; 828 exit ;;
839 ia64:Linux:*:*) 829 ia64:Linux:*:*)
840 echo ${UNAME_MACHINE}-unknown-linux-gnu 830 echo ${UNAME_MACHINE}-unknown-linux-gnu
841 exit 0 ;; 831 exit ;;
842 m32r*:Linux:*:*) 832 m32r*:Linux:*:*)
843 echo ${UNAME_MACHINE}-unknown-linux-gnu 833 echo ${UNAME_MACHINE}-unknown-linux-gnu
844 exit 0 ;; 834 exit ;;
845 m68*:Linux:*:*) 835 m68*:Linux:*:*)
846 echo ${UNAME_MACHINE}-unknown-linux-gnu 836 echo ${UNAME_MACHINE}-unknown-linux-gnu
847 exit 0 ;; 837 exit ;;
848 mips:Linux:*:*) 838 mips:Linux:*:*)
849 eval $set_cc_for_build 839 eval $set_cc_for_build
850 sed 's/^ //' << EOF >$dummy.c 840 sed 's/^ //' << EOF >$dummy.c
@@ -862,7 +852,7 @@ EOF
862 #endif 852 #endif
863EOF 853EOF
864 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 854 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
865 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 855 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
866 ;; 856 ;;
867 mips64:Linux:*:*) 857 mips64:Linux:*:*)
868 eval $set_cc_for_build 858 eval $set_cc_for_build
@@ -881,14 +871,17 @@ EOF
881 #endif 871 #endif
882EOF 872EOF
883 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 873 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
884 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 874 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
885 ;; 875 ;;
876 or32:Linux:*:*)
877 echo or32-unknown-linux-gnu
878 exit ;;
886 ppc:Linux:*:*) 879 ppc:Linux:*:*)
887 echo powerpc-unknown-linux-gnu 880 echo powerpc-unknown-linux-gnu
888 exit 0 ;; 881 exit ;;
889 ppc64:Linux:*:*) 882 ppc64:Linux:*:*)
890 echo powerpc64-unknown-linux-gnu 883 echo powerpc64-unknown-linux-gnu
891 exit 0 ;; 884 exit ;;
892 alpha:Linux:*:*) 885 alpha:Linux:*:*)
893 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 886 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
894 EV5) UNAME_MACHINE=alphaev5 ;; 887 EV5) UNAME_MACHINE=alphaev5 ;;
@@ -902,7 +895,7 @@ EOF
902 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null 895 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
903 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 896 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
904 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 897 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
905 exit 0 ;; 898 exit ;;
906 parisc:Linux:*:* | hppa:Linux:*:*) 899 parisc:Linux:*:* | hppa:Linux:*:*)
907 # Look for CPU level 900 # Look for CPU level
908 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 901 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -910,25 +903,25 @@ EOF
910 PA8*) echo hppa2.0-unknown-linux-gnu ;; 903 PA8*) echo hppa2.0-unknown-linux-gnu ;;
911 *) echo hppa-unknown-linux-gnu ;; 904 *) echo hppa-unknown-linux-gnu ;;
912 esac 905 esac
913 exit 0 ;; 906 exit ;;
914 parisc64:Linux:*:* | hppa64:Linux:*:*) 907 parisc64:Linux:*:* | hppa64:Linux:*:*)
915 echo hppa64-unknown-linux-gnu 908 echo hppa64-unknown-linux-gnu
916 exit 0 ;; 909 exit ;;
917 s390:Linux:*:* | s390x:Linux:*:*) 910 s390:Linux:*:* | s390x:Linux:*:*)
918 echo ${UNAME_MACHINE}-ibm-linux 911 echo ${UNAME_MACHINE}-ibm-linux
919 exit 0 ;; 912 exit ;;
920 sh64*:Linux:*:*) 913 sh64*:Linux:*:*)
921 echo ${UNAME_MACHINE}-unknown-linux-gnu 914 echo ${UNAME_MACHINE}-unknown-linux-gnu
922 exit 0 ;; 915 exit ;;
923 sh*:Linux:*:*) 916 sh*:Linux:*:*)
924 echo ${UNAME_MACHINE}-unknown-linux-gnu 917 echo ${UNAME_MACHINE}-unknown-linux-gnu
925 exit 0 ;; 918 exit ;;
926 sparc:Linux:*:* | sparc64:Linux:*:*) 919 sparc:Linux:*:* | sparc64:Linux:*:*)
927 echo ${UNAME_MACHINE}-unknown-linux-gnu 920 echo ${UNAME_MACHINE}-unknown-linux-gnu
928 exit 0 ;; 921 exit ;;
929 x86_64:Linux:*:*) 922 x86_64:Linux:*:*)
930 echo x86_64-unknown-linux-gnu 923 echo x86_64-unknown-linux-gnu
931 exit 0 ;; 924 exit ;;
932 i*86:Linux:*:*) 925 i*86:Linux:*:*)
933 # The BFD linker knows what the default object file format is, so 926 # The BFD linker knows what the default object file format is, so
934 # first see if it will tell us. cd to the root directory to prevent 927 # first see if it will tell us. cd to the root directory to prevent
@@ -946,15 +939,15 @@ EOF
946 ;; 939 ;;
947 a.out-i386-linux) 940 a.out-i386-linux)
948 echo "${UNAME_MACHINE}-pc-linux-gnuaout" 941 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
949 exit 0 ;; 942 exit ;;
950 coff-i386) 943 coff-i386)
951 echo "${UNAME_MACHINE}-pc-linux-gnucoff" 944 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
952 exit 0 ;; 945 exit ;;
953 "") 946 "")
954 # Either a pre-BFD a.out linker (linux-gnuoldld) or 947 # Either a pre-BFD a.out linker (linux-gnuoldld) or
955 # one that does not give us useful --help. 948 # one that does not give us useful --help.
956 echo "${UNAME_MACHINE}-pc-linux-gnuoldld" 949 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
957 exit 0 ;; 950 exit ;;
958 esac 951 esac
959 # Determine whether the default compiler is a.out or elf 952 # Determine whether the default compiler is a.out or elf
960 eval $set_cc_for_build 953 eval $set_cc_for_build
@@ -982,15 +975,18 @@ EOF
982 #endif 975 #endif
983EOF 976EOF
984 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 977 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
985 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 978 test x"${LIBC}" != x && {
986 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 979 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
980 exit
981 }
982 test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
987 ;; 983 ;;
988 i*86:DYNIX/ptx:4*:*) 984 i*86:DYNIX/ptx:4*:*)
989 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 985 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
990 # earlier versions are messed up and put the nodename in both 986 # earlier versions are messed up and put the nodename in both
991 # sysname and nodename. 987 # sysname and nodename.
992 echo i386-sequent-sysv4 988 echo i386-sequent-sysv4
993 exit 0 ;; 989 exit ;;
994 i*86:UNIX_SV:4.2MP:2.*) 990 i*86:UNIX_SV:4.2MP:2.*)
995 # Unixware is an offshoot of SVR4, but it has its own version 991 # Unixware is an offshoot of SVR4, but it has its own version
996 # number series starting with 2... 992 # number series starting with 2...
@@ -998,27 +994,27 @@ EOF
998 # I just have to hope. -- rms. 994 # I just have to hope. -- rms.
999 # Use sysv4.2uw... so that sysv4* matches it. 995 # Use sysv4.2uw... so that sysv4* matches it.
1000 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 996 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1001 exit 0 ;; 997 exit ;;
1002 i*86:OS/2:*:*) 998 i*86:OS/2:*:*)
1003 # If we were able to find `uname', then EMX Unix compatibility 999 # If we were able to find `uname', then EMX Unix compatibility
1004 # is probably installed. 1000 # is probably installed.
1005 echo ${UNAME_MACHINE}-pc-os2-emx 1001 echo ${UNAME_MACHINE}-pc-os2-emx
1006 exit 0 ;; 1002 exit ;;
1007 i*86:XTS-300:*:STOP) 1003 i*86:XTS-300:*:STOP)
1008 echo ${UNAME_MACHINE}-unknown-stop 1004 echo ${UNAME_MACHINE}-unknown-stop
1009 exit 0 ;; 1005 exit ;;
1010 i*86:atheos:*:*) 1006 i*86:atheos:*:*)
1011 echo ${UNAME_MACHINE}-unknown-atheos 1007 echo ${UNAME_MACHINE}-unknown-atheos
1012 exit 0 ;; 1008 exit ;;
1013 i*86:syllable:*:*) 1009 i*86:syllable:*:*)
1014 echo ${UNAME_MACHINE}-pc-syllable 1010 echo ${UNAME_MACHINE}-pc-syllable
1015 exit 0 ;; 1011 exit ;;
1016 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) 1012 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1017 echo i386-unknown-lynxos${UNAME_RELEASE} 1013 echo i386-unknown-lynxos${UNAME_RELEASE}
1018 exit 0 ;; 1014 exit ;;
1019 i*86:*DOS:*:*) 1015 i*86:*DOS:*:*)
1020 echo ${UNAME_MACHINE}-pc-msdosdjgpp 1016 echo ${UNAME_MACHINE}-pc-msdosdjgpp
1021 exit 0 ;; 1017 exit ;;
1022 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) 1018 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1023 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` 1019 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1024 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then 1020 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1026,15 +1022,16 @@ EOF
1026 else 1022 else
1027 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 1023 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1028 fi 1024 fi
1029 exit 0 ;; 1025 exit ;;
1030 i*86:*:5:[78]*) 1026 i*86:*:5:[678]*)
1027 # UnixWare 7.x, OpenUNIX and OpenServer 6.
1031 case `/bin/uname -X | grep "^Machine"` in 1028 case `/bin/uname -X | grep "^Machine"` in
1032 *486*) UNAME_MACHINE=i486 ;; 1029 *486*) UNAME_MACHINE=i486 ;;
1033 *Pentium) UNAME_MACHINE=i586 ;; 1030 *Pentium) UNAME_MACHINE=i586 ;;
1034 *Pent*|*Celeron) UNAME_MACHINE=i686 ;; 1031 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1035 esac 1032 esac
1036 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} 1033 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1037 exit 0 ;; 1034 exit ;;
1038 i*86:*:3.2:*) 1035 i*86:*:3.2:*)
1039 if test -f /usr/options/cb.name; then 1036 if test -f /usr/options/cb.name; then
1040 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` 1037 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1052,73 +1049,73 @@ EOF
1052 else 1049 else
1053 echo ${UNAME_MACHINE}-pc-sysv32 1050 echo ${UNAME_MACHINE}-pc-sysv32
1054 fi 1051 fi
1055 exit 0 ;; 1052 exit ;;
1056 pc:*:*:*) 1053 pc:*:*:*)
1057 # Left here for compatibility: 1054 # Left here for compatibility:
1058 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1055 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1059 # the processor, so we play safe by assuming i386. 1056 # the processor, so we play safe by assuming i386.
1060 echo i386-pc-msdosdjgpp 1057 echo i386-pc-msdosdjgpp
1061 exit 0 ;; 1058 exit ;;
1062 Intel:Mach:3*:*) 1059 Intel:Mach:3*:*)
1063 echo i386-pc-mach3 1060 echo i386-pc-mach3
1064 exit 0 ;; 1061 exit ;;
1065 paragon:*:*:*) 1062 paragon:*:*:*)
1066 echo i860-intel-osf1 1063 echo i860-intel-osf1
1067 exit 0 ;; 1064 exit ;;
1068 i860:*:4.*:*) # i860-SVR4 1065 i860:*:4.*:*) # i860-SVR4
1069 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then 1066 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1070 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 1067 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1071 else # Add other i860-SVR4 vendors below as they are discovered. 1068 else # Add other i860-SVR4 vendors below as they are discovered.
1072 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 1069 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1073 fi 1070 fi
1074 exit 0 ;; 1071 exit ;;
1075 mini*:CTIX:SYS*5:*) 1072 mini*:CTIX:SYS*5:*)
1076 # "miniframe" 1073 # "miniframe"
1077 echo m68010-convergent-sysv 1074 echo m68010-convergent-sysv
1078 exit 0 ;; 1075 exit ;;
1079 mc68k:UNIX:SYSTEM5:3.51m) 1076 mc68k:UNIX:SYSTEM5:3.51m)
1080 echo m68k-convergent-sysv 1077 echo m68k-convergent-sysv
1081 exit 0 ;; 1078 exit ;;
1082 M680?0:D-NIX:5.3:*) 1079 M680?0:D-NIX:5.3:*)
1083 echo m68k-diab-dnix 1080 echo m68k-diab-dnix
1084 exit 0 ;; 1081 exit ;;
1085 M68*:*:R3V[5678]*:*) 1082 M68*:*:R3V[5678]*:*)
1086 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 1083 test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1087 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) 1084 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
1088 OS_REL='' 1085 OS_REL=''
1089 test -r /etc/.relid \ 1086 test -r /etc/.relid \
1090 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1087 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1091 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1088 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1092 && echo i486-ncr-sysv4.3${OS_REL} && exit 0 1089 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1093 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1090 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1094 && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 1091 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1095 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1092 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1096 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1093 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1097 && echo i486-ncr-sysv4 && exit 0 ;; 1094 && { echo i486-ncr-sysv4; exit; } ;;
1098 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 1095 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1099 echo m68k-unknown-lynxos${UNAME_RELEASE} 1096 echo m68k-unknown-lynxos${UNAME_RELEASE}
1100 exit 0 ;; 1097 exit ;;
1101 mc68030:UNIX_System_V:4.*:*) 1098 mc68030:UNIX_System_V:4.*:*)
1102 echo m68k-atari-sysv4 1099 echo m68k-atari-sysv4
1103 exit 0 ;; 1100 exit ;;
1104 TSUNAMI:LynxOS:2.*:*) 1101 TSUNAMI:LynxOS:2.*:*)
1105 echo sparc-unknown-lynxos${UNAME_RELEASE} 1102 echo sparc-unknown-lynxos${UNAME_RELEASE}
1106 exit 0 ;; 1103 exit ;;
1107 rs6000:LynxOS:2.*:*) 1104 rs6000:LynxOS:2.*:*)
1108 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1105 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1109 exit 0 ;; 1106 exit ;;
1110 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) 1107 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1111 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1108 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1112 exit 0 ;; 1109 exit ;;
1113 SM[BE]S:UNIX_SV:*:*) 1110 SM[BE]S:UNIX_SV:*:*)
1114 echo mips-dde-sysv${UNAME_RELEASE} 1111 echo mips-dde-sysv${UNAME_RELEASE}
1115 exit 0 ;; 1112 exit ;;
1116 RM*:ReliantUNIX-*:*:*) 1113 RM*:ReliantUNIX-*:*:*)
1117 echo mips-sni-sysv4 1114 echo mips-sni-sysv4
1118 exit 0 ;; 1115 exit ;;
1119 RM*:SINIX-*:*:*) 1116 RM*:SINIX-*:*:*)
1120 echo mips-sni-sysv4 1117 echo mips-sni-sysv4
1121 exit 0 ;; 1118 exit ;;
1122 *:SINIX-*:*:*) 1119 *:SINIX-*:*:*)
1123 if uname -p 2>/dev/null >/dev/null ; then 1120 if uname -p 2>/dev/null >/dev/null ; then
1124 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1121 UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1126,65 +1123,65 @@ EOF
1126 else 1123 else
1127 echo ns32k-sni-sysv 1124 echo ns32k-sni-sysv
1128 fi 1125 fi
1129 exit 0 ;; 1126 exit ;;
1130 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 1127 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1131 # says <Richard.M.Bartel@ccMail.Census.GOV> 1128 # says <Richard.M.Bartel@ccMail.Census.GOV>
1132 echo i586-unisys-sysv4 1129 echo i586-unisys-sysv4
1133 exit 0 ;; 1130 exit ;;
1134 *:UNIX_System_V:4*:FTX*) 1131 *:UNIX_System_V:4*:FTX*)
1135 # From Gerald Hewes <hewes@openmarket.com>. 1132 # From Gerald Hewes <hewes@openmarket.com>.
1136 # How about differentiating between stratus architectures? -djm 1133 # How about differentiating between stratus architectures? -djm
1137 echo hppa1.1-stratus-sysv4 1134 echo hppa1.1-stratus-sysv4
1138 exit 0 ;; 1135 exit ;;
1139 *:*:*:FTX*) 1136 *:*:*:FTX*)
1140 # From seanf@swdc.stratus.com. 1137 # From seanf@swdc.stratus.com.
1141 echo i860-stratus-sysv4 1138 echo i860-stratus-sysv4
1142 exit 0 ;; 1139 exit ;;
1143 i*86:VOS:*:*) 1140 i*86:VOS:*:*)
1144 # From Paul.Green@stratus.com. 1141 # From Paul.Green@stratus.com.
1145 echo ${UNAME_MACHINE}-stratus-vos 1142 echo ${UNAME_MACHINE}-stratus-vos
1146 exit 0 ;; 1143 exit ;;
1147 *:VOS:*:*) 1144 *:VOS:*:*)
1148 # From Paul.Green@stratus.com. 1145 # From Paul.Green@stratus.com.
1149 echo hppa1.1-stratus-vos 1146 echo hppa1.1-stratus-vos
1150 exit 0 ;; 1147 exit ;;
1151 mc68*:A/UX:*:*) 1148 mc68*:A/UX:*:*)
1152 echo m68k-apple-aux${UNAME_RELEASE} 1149 echo m68k-apple-aux${UNAME_RELEASE}
1153 exit 0 ;; 1150 exit ;;
1154 news*:NEWS-OS:6*:*) 1151 news*:NEWS-OS:6*:*)
1155 echo mips-sony-newsos6 1152 echo mips-sony-newsos6
1156 exit 0 ;; 1153 exit ;;
1157 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 1154 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1158 if [ -d /usr/nec ]; then 1155 if [ -d /usr/nec ]; then
1159 echo mips-nec-sysv${UNAME_RELEASE} 1156 echo mips-nec-sysv${UNAME_RELEASE}
1160 else 1157 else
1161 echo mips-unknown-sysv${UNAME_RELEASE} 1158 echo mips-unknown-sysv${UNAME_RELEASE}
1162 fi 1159 fi
1163 exit 0 ;; 1160 exit ;;
1164 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 1161 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1165 echo powerpc-be-beos 1162 echo powerpc-be-beos
1166 exit 0 ;; 1163 exit ;;
1167 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. 1164 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
1168 echo powerpc-apple-beos 1165 echo powerpc-apple-beos
1169 exit 0 ;; 1166 exit ;;
1170 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 1167 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1171 echo i586-pc-beos 1168 echo i586-pc-beos
1172 exit 0 ;; 1169 exit ;;
1173 SX-4:SUPER-UX:*:*) 1170 SX-4:SUPER-UX:*:*)
1174 echo sx4-nec-superux${UNAME_RELEASE} 1171 echo sx4-nec-superux${UNAME_RELEASE}
1175 exit 0 ;; 1172 exit ;;
1176 SX-5:SUPER-UX:*:*) 1173 SX-5:SUPER-UX:*:*)
1177 echo sx5-nec-superux${UNAME_RELEASE} 1174 echo sx5-nec-superux${UNAME_RELEASE}
1178 exit 0 ;; 1175 exit ;;
1179 SX-6:SUPER-UX:*:*) 1176 SX-6:SUPER-UX:*:*)
1180 echo sx6-nec-superux${UNAME_RELEASE} 1177 echo sx6-nec-superux${UNAME_RELEASE}
1181 exit 0 ;; 1178 exit ;;
1182 Power*:Rhapsody:*:*) 1179 Power*:Rhapsody:*:*)
1183 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1180 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1184 exit 0 ;; 1181 exit ;;
1185 *:Rhapsody:*:*) 1182 *:Rhapsody:*:*)
1186 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 1183 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1187 exit 0 ;; 1184 exit ;;
1188 *:Darwin:*:*) 1185 *:Darwin:*:*)
1189 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1186 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1190 case $UNAME_PROCESSOR in 1187 case $UNAME_PROCESSOR in
@@ -1192,7 +1189,7 @@ EOF
1192 unknown) UNAME_PROCESSOR=powerpc ;; 1189 unknown) UNAME_PROCESSOR=powerpc ;;
1193 esac 1190 esac
1194 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1191 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1195 exit 0 ;; 1192 exit ;;
1196 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1193 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1197 UNAME_PROCESSOR=`uname -p` 1194 UNAME_PROCESSOR=`uname -p`
1198 if test "$UNAME_PROCESSOR" = "x86"; then 1195 if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1200,25 +1197,25 @@ EOF
1200 UNAME_MACHINE=pc 1197 UNAME_MACHINE=pc
1201 fi 1198 fi
1202 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1199 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1203 exit 0 ;; 1200 exit ;;
1204 *:QNX:*:4*) 1201 *:QNX:*:4*)
1205 echo i386-pc-qnx 1202 echo i386-pc-qnx
1206 exit 0 ;; 1203 exit ;;
1207 NSE-?:NONSTOP_KERNEL:*:*) 1204 NSE-?:NONSTOP_KERNEL:*:*)
1208 echo nse-tandem-nsk${UNAME_RELEASE} 1205 echo nse-tandem-nsk${UNAME_RELEASE}
1209 exit 0 ;; 1206 exit ;;
1210 NSR-?:NONSTOP_KERNEL:*:*) 1207 NSR-?:NONSTOP_KERNEL:*:*)
1211 echo nsr-tandem-nsk${UNAME_RELEASE} 1208 echo nsr-tandem-nsk${UNAME_RELEASE}
1212 exit 0 ;; 1209 exit ;;
1213 *:NonStop-UX:*:*) 1210 *:NonStop-UX:*:*)
1214 echo mips-compaq-nonstopux 1211 echo mips-compaq-nonstopux
1215 exit 0 ;; 1212 exit ;;
1216 BS2000:POSIX*:*:*) 1213 BS2000:POSIX*:*:*)
1217 echo bs2000-siemens-sysv 1214 echo bs2000-siemens-sysv
1218 exit 0 ;; 1215 exit ;;
1219 DS/*:UNIX_System_V:*:*) 1216 DS/*:UNIX_System_V:*:*)
1220 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} 1217 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1221 exit 0 ;; 1218 exit ;;
1222 *:Plan9:*:*) 1219 *:Plan9:*:*)
1223 # "uname -m" is not consistent, so use $cputype instead. 386 1220 # "uname -m" is not consistent, so use $cputype instead. 386
1224 # is converted to i386 for consistency with other x86 1221 # is converted to i386 for consistency with other x86
@@ -1229,41 +1226,44 @@ EOF
1229 UNAME_MACHINE="$cputype" 1226 UNAME_MACHINE="$cputype"
1230 fi 1227 fi
1231 echo ${UNAME_MACHINE}-unknown-plan9 1228 echo ${UNAME_MACHINE}-unknown-plan9
1232 exit 0 ;; 1229 exit ;;
1233 *:TOPS-10:*:*) 1230 *:TOPS-10:*:*)
1234 echo pdp10-unknown-tops10 1231 echo pdp10-unknown-tops10
1235 exit 0 ;; 1232 exit ;;
1236 *:TENEX:*:*) 1233 *:TENEX:*:*)
1237 echo pdp10-unknown-tenex 1234 echo pdp10-unknown-tenex
1238 exit 0 ;; 1235 exit ;;
1239 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) 1236 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1240 echo pdp10-dec-tops20 1237 echo pdp10-dec-tops20
1241 exit 0 ;; 1238 exit ;;
1242 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) 1239 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1243 echo pdp10-xkl-tops20 1240 echo pdp10-xkl-tops20
1244 exit 0 ;; 1241 exit ;;
1245 *:TOPS-20:*:*) 1242 *:TOPS-20:*:*)
1246 echo pdp10-unknown-tops20 1243 echo pdp10-unknown-tops20
1247 exit 0 ;; 1244 exit ;;
1248 *:ITS:*:*) 1245 *:ITS:*:*)
1249 echo pdp10-unknown-its 1246 echo pdp10-unknown-its
1250 exit 0 ;; 1247 exit ;;
1251 SEI:*:*:SEIUX) 1248 SEI:*:*:SEIUX)
1252 echo mips-sei-seiux${UNAME_RELEASE} 1249 echo mips-sei-seiux${UNAME_RELEASE}
1253 exit 0 ;; 1250 exit ;;
1254 *:DragonFly:*:*) 1251 *:DragonFly:*:*)
1255 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 1252 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1256 exit 0 ;; 1253 exit ;;
1257 *:*VMS:*:*) 1254 *:*VMS:*:*)
1258 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1255 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1259 case "${UNAME_MACHINE}" in 1256 case "${UNAME_MACHINE}" in
1260 A*) echo alpha-dec-vms && exit 0 ;; 1257 A*) echo alpha-dec-vms ; exit ;;
1261 I*) echo ia64-dec-vms && exit 0 ;; 1258 I*) echo ia64-dec-vms ; exit ;;
1262 V*) echo vax-dec-vms && exit 0 ;; 1259 V*) echo vax-dec-vms ; exit ;;
1263 esac ;; 1260 esac ;;
1264 *:XENIX:*:SysV) 1261 *:XENIX:*:SysV)
1265 echo i386-pc-xenix 1262 echo i386-pc-xenix
1266 exit 0 ;; 1263 exit ;;
1264 i*86:skyos:*:*)
1265 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1266 exit ;;
1267esac 1267esac
1268 1268
1269#echo '(No uname command or uname output not recognized.)' 1>&2 1269#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1295,7 +1295,7 @@ main ()
1295#endif 1295#endif
1296 1296
1297#if defined (__arm) && defined (__acorn) && defined (__unix) 1297#if defined (__arm) && defined (__acorn) && defined (__unix)
1298 printf ("arm-acorn-riscix"); exit (0); 1298 printf ("arm-acorn-riscix\n"); exit (0);
1299#endif 1299#endif
1300 1300
1301#if defined (hp300) && !defined (hpux) 1301#if defined (hp300) && !defined (hpux)
@@ -1384,11 +1384,12 @@ main ()
1384} 1384}
1385EOF 1385EOF
1386 1386
1387$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 1387$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1388 { echo "$SYSTEM_NAME"; exit; }
1388 1389
1389# Apollos put the system type in the environment. 1390# Apollos put the system type in the environment.
1390 1391
1391test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } 1392test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1392 1393
1393# Convex versions that predate uname can use getsysinfo(1) 1394# Convex versions that predate uname can use getsysinfo(1)
1394 1395
@@ -1397,22 +1398,22 @@ then
1397 case `getsysinfo -f cpu_type` in 1398 case `getsysinfo -f cpu_type` in
1398 c1*) 1399 c1*)
1399 echo c1-convex-bsd 1400 echo c1-convex-bsd
1400 exit 0 ;; 1401 exit ;;
1401 c2*) 1402 c2*)
1402 if getsysinfo -f scalar_acc 1403 if getsysinfo -f scalar_acc
1403 then echo c32-convex-bsd 1404 then echo c32-convex-bsd
1404 else echo c2-convex-bsd 1405 else echo c2-convex-bsd
1405 fi 1406 fi
1406 exit 0 ;; 1407 exit ;;
1407 c34*) 1408 c34*)
1408 echo c34-convex-bsd 1409 echo c34-convex-bsd
1409 exit 0 ;; 1410 exit ;;
1410 c38*) 1411 c38*)
1411 echo c38-convex-bsd 1412 echo c38-convex-bsd
1412 exit 0 ;; 1413 exit ;;
1413 c4*) 1414 c4*)
1414 echo c4-convex-bsd 1415 echo c4-convex-bsd
1415 exit 0 ;; 1416 exit ;;
1416 esac 1417 esac
1417fi 1418fi
1418 1419
diff --git a/libltdl/config.sub b/libltdl/config.sub
index 87a1ee49..1c366dfd 100755
--- a/libltdl/config.sub
+++ b/libltdl/config.sub
@@ -3,7 +3,7 @@
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 4# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5 5
6timestamp='2005-04-22' 6timestamp='2005-07-08'
7 7
8# This file is (in principle) common to ALL GNU software. 8# This file is (in principle) common to ALL GNU software.
9# The presence of a machine in this file suggests that SOME GNU software 9# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2005-04-22'
21# 21#
22# You should have received a copy of the GNU General Public License 22# You should have received a copy of the GNU General Public License
23# along with this program; if not, write to the Free Software 23# along with this program; if not, write to the Free Software
24# Foundation, Inc., 59 Temple Place - Suite 330, 24# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25# Boston, MA 02111-1307, USA. 25# 02110-1301, USA.
26 26#
27# As a special exception to the GNU General Public License, if you 27# As a special exception to the GNU General Public License, if you
28# distribute this file as part of a program that contains a 28# distribute this file as part of a program that contains a
29# configuration script generated by Autoconf, you may include it under 29# configuration script generated by Autoconf, you may include it under
30# the same distribution terms that you use for the rest of that program. 30# the same distribution terms that you use for the rest of that program.
31 31
32
32# Please send patches to <config-patches@gnu.org>. Submit a context 33# Please send patches to <config-patches@gnu.org>. Submit a context
33# diff and a properly formatted ChangeLog entry. 34# diff and a properly formatted ChangeLog entry.
34# 35#
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
83while test $# -gt 0 ; do 84while test $# -gt 0 ; do
84 case $1 in 85 case $1 in
85 --time-stamp | --time* | -t ) 86 --time-stamp | --time* | -t )
86 echo "$timestamp" ; exit 0 ;; 87 echo "$timestamp" ; exit ;;
87 --version | -v ) 88 --version | -v )
88 echo "$version" ; exit 0 ;; 89 echo "$version" ; exit ;;
89 --help | --h* | -h ) 90 --help | --h* | -h )
90 echo "$usage"; exit 0 ;; 91 echo "$usage"; exit ;;
91 -- ) # Stop option processing 92 -- ) # Stop option processing
92 shift; break ;; 93 shift; break ;;
93 - ) # Use stdin as input. 94 - ) # Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
99 *local*) 100 *local*)
100 # First pass through any local machine types. 101 # First pass through any local machine types.
101 echo $1 102 echo $1
102 exit 0;; 103 exit ;;
103 104
104 * ) 105 * )
105 break ;; 106 break ;;
@@ -247,6 +248,7 @@ case $basic_machine in
247 | mips64vr4100 | mips64vr4100el \ 248 | mips64vr4100 | mips64vr4100el \
248 | mips64vr4300 | mips64vr4300el \ 249 | mips64vr4300 | mips64vr4300el \
249 | mips64vr5000 | mips64vr5000el \ 250 | mips64vr5000 | mips64vr5000el \
251 | mips64vr5900 | mips64vr5900el \
250 | mipsisa32 | mipsisa32el \ 252 | mipsisa32 | mipsisa32el \
251 | mipsisa32r2 | mipsisa32r2el \ 253 | mipsisa32r2 | mipsisa32r2el \
252 | mipsisa64 | mipsisa64el \ 254 | mipsisa64 | mipsisa64el \
@@ -255,13 +257,14 @@ case $basic_machine in
255 | mipsisa64sr71k | mipsisa64sr71kel \ 257 | mipsisa64sr71k | mipsisa64sr71kel \
256 | mipstx39 | mipstx39el \ 258 | mipstx39 | mipstx39el \
257 | mn10200 | mn10300 \ 259 | mn10200 | mn10300 \
260 | ms1 \
258 | msp430 \ 261 | msp430 \
259 | ns16k | ns32k \ 262 | ns16k | ns32k \
260 | openrisc | or32 \ 263 | or32 \
261 | pdp10 | pdp11 | pj | pjl \ 264 | pdp10 | pdp11 | pj | pjl \
262 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 265 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
263 | pyramid \ 266 | pyramid \
264 | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ 267 | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
265 | sh64 | sh64le \ 268 | sh64 | sh64le \
266 | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ 269 | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
267 | sparcv8 | sparcv9 | sparcv9b \ 270 | sparcv8 | sparcv9 | sparcv9b \
@@ -273,6 +276,9 @@ case $basic_machine in
273 | z8k) 276 | z8k)
274 basic_machine=$basic_machine-unknown 277 basic_machine=$basic_machine-unknown
275 ;; 278 ;;
279 m32c)
280 basic_machine=$basic_machine-unknown
281 ;;
276 m6811 | m68hc11 | m6812 | m68hc12) 282 m6811 | m68hc11 | m6812 | m68hc12)
277 # Motorola 68HC11/12. 283 # Motorola 68HC11/12.
278 basic_machine=$basic_machine-unknown 284 basic_machine=$basic_machine-unknown
@@ -321,6 +327,7 @@ case $basic_machine in
321 | mips64vr4100-* | mips64vr4100el-* \ 327 | mips64vr4100-* | mips64vr4100el-* \
322 | mips64vr4300-* | mips64vr4300el-* \ 328 | mips64vr4300-* | mips64vr4300el-* \
323 | mips64vr5000-* | mips64vr5000el-* \ 329 | mips64vr5000-* | mips64vr5000el-* \
330 | mips64vr5900-* | mips64vr5900el-* \
324 | mipsisa32-* | mipsisa32el-* \ 331 | mipsisa32-* | mipsisa32el-* \
325 | mipsisa32r2-* | mipsisa32r2el-* \ 332 | mipsisa32r2-* | mipsisa32r2el-* \
326 | mipsisa64-* | mipsisa64el-* \ 333 | mipsisa64-* | mipsisa64el-* \
@@ -329,6 +336,7 @@ case $basic_machine in
329 | mipsisa64sr71k-* | mipsisa64sr71kel-* \ 336 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
330 | mipstx39-* | mipstx39el-* \ 337 | mipstx39-* | mipstx39el-* \
331 | mmix-* \ 338 | mmix-* \
339 | ms1-* \
332 | msp430-* \ 340 | msp430-* \
333 | none-* | np1-* | ns16k-* | ns32k-* \ 341 | none-* | np1-* | ns16k-* | ns32k-* \
334 | orion-* \ 342 | orion-* \
@@ -336,7 +344,7 @@ case $basic_machine in
336 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 344 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
337 | pyramid-* \ 345 | pyramid-* \
338 | romp-* | rs6000-* \ 346 | romp-* | rs6000-* \
339 | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ 347 | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
340 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 348 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
341 | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ 349 | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
342 | sparclite-* \ 350 | sparclite-* \
@@ -351,6 +359,8 @@ case $basic_machine in
351 | ymp-* \ 359 | ymp-* \
352 | z8k-*) 360 | z8k-*)
353 ;; 361 ;;
362 m32c-*)
363 ;;
354 # Recognize the various machine names and aliases which stand 364 # Recognize the various machine names and aliases which stand
355 # for a CPU type and a company and sometimes even an OS. 365 # for a CPU type and a company and sometimes even an OS.
356 386bsd) 366 386bsd)
@@ -761,9 +771,8 @@ case $basic_machine in
761 basic_machine=hppa1.1-oki 771 basic_machine=hppa1.1-oki
762 os=-proelf 772 os=-proelf
763 ;; 773 ;;
764 or32 | or32-*) 774 openrisc | openrisc-*)
765 basic_machine=or32-unknown 775 basic_machine=or32-unknown
766 os=-coff
767 ;; 776 ;;
768 os400) 777 os400)
769 basic_machine=powerpc-ibm 778 basic_machine=powerpc-ibm
@@ -1089,12 +1098,9 @@ case $basic_machine in
1089 we32k) 1098 we32k)
1090 basic_machine=we32k-att 1099 basic_machine=we32k-att
1091 ;; 1100 ;;
1092 sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) 1101 sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1093 basic_machine=sh-unknown 1102 basic_machine=sh-unknown
1094 ;; 1103 ;;
1095 sh64)
1096 basic_machine=sh64-unknown
1097 ;;
1098 sparc | sparcv8 | sparcv9 | sparcv9b) 1104 sparc | sparcv8 | sparcv9 | sparcv9b)
1099 basic_machine=sparc-sun 1105 basic_machine=sparc-sun
1100 ;; 1106 ;;
@@ -1181,7 +1187,8 @@ case $os in
1181 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 1187 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1182 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1188 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1183 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1189 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1184 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) 1190 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1191 | -skyos* | -haiku*)
1185 # Remember, each alternative MUST END IN *, to match a version number. 1192 # Remember, each alternative MUST END IN *, to match a version number.
1186 ;; 1193 ;;
1187 -qnx*) 1194 -qnx*)
@@ -1199,7 +1206,7 @@ case $os in
1199 os=`echo $os | sed -e 's|nto|nto-qnx|'` 1206 os=`echo $os | sed -e 's|nto|nto-qnx|'`
1200 ;; 1207 ;;
1201 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ 1208 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1202 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ 1209 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1203 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) 1210 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1204 ;; 1211 ;;
1205 -mac*) 1212 -mac*)
@@ -1388,6 +1395,9 @@ case $basic_machine in
1388 *-be) 1395 *-be)
1389 os=-beos 1396 os=-beos
1390 ;; 1397 ;;
1398 *-haiku)
1399 os=-haiku
1400 ;;
1391 *-ibm) 1401 *-ibm)
1392 os=-aix 1402 os=-aix
1393 ;; 1403 ;;
@@ -1559,7 +1569,7 @@ case $basic_machine in
1559esac 1569esac
1560 1570
1561echo $basic_machine$os 1571echo $basic_machine$os
1562exit 0 1572exit
1563 1573
1564# Local variables: 1574# Local variables:
1565# eval: (add-hook 'write-file-hooks 'time-stamp) 1575# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/libltdl/configure b/libltdl/configure
index 13b09f57..4bf2ba56 100755
--- a/libltdl/configure
+++ b/libltdl/configure
@@ -280,15 +280,15 @@ fi
280 280
281# The HP-UX ksh and POSIX shell print the target directory to stdout 281# The HP-UX ksh and POSIX shell print the target directory to stdout
282# if CDPATH is set. 282# if CDPATH is set.
283if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi 283(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
284 284
285if test -z "$ECHO"; then 285if test -z "$ECHO"; then
286if test "X${echo_test_string+set}" != Xset; then 286if test "X${echo_test_string+set}" != Xset; then
287# find a string as large as possible, as long as the shell can cope with it 287# find a string as large as possible, as long as the shell can cope with it
288 for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do 288 for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
289 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... 289 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
290 if (echo_test_string="`eval $cmd`") 2>/dev/null && 290 if (echo_test_string=`eval $cmd`) 2>/dev/null &&
291 echo_test_string="`eval $cmd`" && 291 echo_test_string=`eval $cmd` &&
292 (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null 292 (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
293 then 293 then
294 break 294 break
@@ -3420,7 +3420,7 @@ lt_ac_count=0
3420# Add /usr/xpg4/bin/sed as it is typically found on Solaris 3420# Add /usr/xpg4/bin/sed as it is typically found on Solaris
3421# along with /bin/sed that truncates output. 3421# along with /bin/sed that truncates output.
3422for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do 3422for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
3423 test ! -f $lt_ac_sed && break 3423 test ! -f $lt_ac_sed && continue
3424 cat /dev/null > conftest.in 3424 cat /dev/null > conftest.in
3425 lt_ac_count=0 3425 lt_ac_count=0
3426 echo $ECHO_N "0123456789$ECHO_C" >conftest.in 3426 echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3445,10 +3445,10 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
3445 fi 3445 fi
3446 done 3446 done
3447done 3447done
3448SED=$lt_cv_path_SED
3449 3448
3450fi 3449fi
3451 3450
3451SED=$lt_cv_path_SED
3452echo "$as_me:$LINENO: result: $SED" >&5 3452echo "$as_me:$LINENO: result: $SED" >&5
3453echo "${ECHO_T}$SED" >&6 3453echo "${ECHO_T}$SED" >&6
3454 3454
@@ -3525,7 +3525,7 @@ else
3525 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then 3525 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
3526 lt_cv_path_LD="$ac_dir/$ac_prog" 3526 lt_cv_path_LD="$ac_dir/$ac_prog"
3527 # Check to see if the program is GNU ld. I'd rather use --version, 3527 # Check to see if the program is GNU ld. I'd rather use --version,
3528 # but apparently some GNU ld's only accept -v. 3528 # but apparently some variants of GNU ld only accept -v.
3529 # Break only if it was the GNU/non-GNU ld that we prefer. 3529 # Break only if it was the GNU/non-GNU ld that we prefer.
3530 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in 3530 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
3531 *GNU* | *'with BFD'*) 3531 *GNU* | *'with BFD'*)
@@ -3559,7 +3559,7 @@ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
3559if test "${lt_cv_prog_gnu_ld+set}" = set; then 3559if test "${lt_cv_prog_gnu_ld+set}" = set; then
3560 echo $ECHO_N "(cached) $ECHO_C" >&6 3560 echo $ECHO_N "(cached) $ECHO_C" >&6
3561else 3561else
3562 # I'd rather use --version here, but apparently some GNU ld's only accept -v. 3562 # I'd rather use --version here, but apparently some GNU lds only accept -v.
3563case `$LD -v 2>&1 </dev/null` in 3563case `$LD -v 2>&1 </dev/null` in
3564*GNU* | *'with BFD'*) 3564*GNU* | *'with BFD'*)
3565 lt_cv_prog_gnu_ld=yes 3565 lt_cv_prog_gnu_ld=yes
@@ -3589,6 +3589,15 @@ case $reload_flag in
3589*) reload_flag=" $reload_flag" ;; 3589*) reload_flag=" $reload_flag" ;;
3590esac 3590esac
3591reload_cmds='$LD$reload_flag -o $output$reload_objs' 3591reload_cmds='$LD$reload_flag -o $output$reload_objs'
3592case $host_os in
3593 darwin*)
3594 if test "$GCC" = yes; then
3595 reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
3596 else
3597 reload_cmds='$LD$reload_flag -o $output$reload_objs'
3598 fi
3599 ;;
3600esac
3592 3601
3593echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 3602echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
3594echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 3603echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -3675,7 +3684,7 @@ beos*)
3675 lt_cv_deplibs_check_method=pass_all 3684 lt_cv_deplibs_check_method=pass_all
3676 ;; 3685 ;;
3677 3686
3678bsdi4*) 3687bsdi[45]*)
3679 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' 3688 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
3680 lt_cv_file_magic_cmd='/usr/bin/file -L' 3689 lt_cv_file_magic_cmd='/usr/bin/file -L'
3681 lt_cv_file_magic_test_file=/shlib/libc.so 3690 lt_cv_file_magic_test_file=/shlib/libc.so
@@ -3698,13 +3707,13 @@ darwin* | rhapsody*)
3698 lt_cv_deplibs_check_method=pass_all 3707 lt_cv_deplibs_check_method=pass_all
3699 ;; 3708 ;;
3700 3709
3701freebsd* | kfreebsd*-gnu) 3710freebsd* | kfreebsd*-gnu | dragonfly*)
3702 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then 3711 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
3703 case $host_cpu in 3712 case $host_cpu in
3704 i*86 ) 3713 i*86 )
3705 # Not sure whether the presence of OpenBSD here was a mistake. 3714 # Not sure whether the presence of OpenBSD here was a mistake.
3706 # Let's accept both of them until this is cleared up. 3715 # Let's accept both of them until this is cleared up.
3707 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' 3716 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
3708 lt_cv_file_magic_cmd=/usr/bin/file 3717 lt_cv_file_magic_cmd=/usr/bin/file
3709 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` 3718 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
3710 ;; 3719 ;;
@@ -3720,7 +3729,7 @@ gnu*)
3720 3729
3721hpux10.20* | hpux11*) 3730hpux10.20* | hpux11*)
3722 lt_cv_file_magic_cmd=/usr/bin/file 3731 lt_cv_file_magic_cmd=/usr/bin/file
3723 case "$host_cpu" in 3732 case $host_cpu in
3724 ia64*) 3733 ia64*)
3725 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' 3734 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
3726 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so 3735 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -3770,12 +3779,10 @@ nto-qnx*)
3770 ;; 3779 ;;
3771 3780
3772openbsd*) 3781openbsd*)
3773 lt_cv_file_magic_cmd=/usr/bin/file
3774 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
3775 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 3782 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
3776 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' 3783 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
3777 else 3784 else
3778 lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' 3785 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
3779 fi 3786 fi
3780 ;; 3787 ;;
3781 3788
@@ -3867,7 +3874,7 @@ ia64-*-hpux*)
3867 ;; 3874 ;;
3868*-*-irix6*) 3875*-*-irix6*)
3869 # Find out which ABI we are using. 3876 # Find out which ABI we are using.
3870 echo '#line 3870 "configure"' > conftest.$ac_ext 3877 echo '#line 3877 "configure"' > conftest.$ac_ext
3871 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3878 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3872 (eval $ac_compile) 2>&5 3879 (eval $ac_compile) 2>&5
3873 ac_status=$? 3880 ac_status=$?
@@ -3910,7 +3917,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
3910 ac_status=$? 3917 ac_status=$?
3911 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3918 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3912 (exit $ac_status); }; then 3919 (exit $ac_status); }; then
3913 case "`/usr/bin/file conftest.o`" in 3920 case `/usr/bin/file conftest.o` in
3914 *32-bit*) 3921 *32-bit*)
3915 case $host in 3922 case $host in
3916 x86_64-*linux*) 3923 x86_64-*linux*)
@@ -5350,7 +5357,12 @@ else
5350fi 5357fi
5351 5358
5352 5359
5353ac_ext=cc 5360
5361
5362if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5363 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
5364 (test "X$CXX" != "Xg++"))) ; then
5365 ac_ext=cc
5354ac_cpp='$CXXCPP $CPPFLAGS' 5366ac_cpp='$CXXCPP $CPPFLAGS'
5355ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 5367ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5356ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 5368ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5580,6 +5592,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5580ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 5592ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5581ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 5593ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5582 5594
5595fi
5596
5583 5597
5584ac_ext=f 5598ac_ext=f
5585ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' 5599ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -5673,7 +5687,7 @@ fi
5673 5687
5674 5688
5675# Provide some information about the compiler. 5689# Provide some information about the compiler.
5676echo "$as_me:5676:" \ 5690echo "$as_me:5690:" \
5677 "checking for Fortran 77 compiler version" >&5 5691 "checking for Fortran 77 compiler version" >&5
5678ac_compiler=`set X $ac_compile; echo $2` 5692ac_compiler=`set X $ac_compile; echo $2`
5679{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 5693{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5861,11 +5875,38 @@ else
5861 lt_cv_sys_max_cmd_len=8192; 5875 lt_cv_sys_max_cmd_len=8192;
5862 ;; 5876 ;;
5863 5877
5864 *) 5878 netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
5879 # This has been around since 386BSD, at least. Likely further.
5880 if test -x /sbin/sysctl; then
5881 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
5882 elif test -x /usr/sbin/sysctl; then
5883 lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
5884 else
5885 lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
5886 fi
5887 # And add a safety zone
5888 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
5889 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
5890 ;;
5891 osf*)
5892 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
5893 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
5894 # nice to cause kernel panics so lets avoid the loop below.
5895 # First set a reasonable default.
5896 lt_cv_sys_max_cmd_len=16384
5897 #
5898 if test -x /sbin/sysconfig; then
5899 case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
5900 *1*) lt_cv_sys_max_cmd_len=-1 ;;
5901 esac
5902 fi
5903 ;;
5904 *)
5865 # If test is not a shell built-in, we'll probably end up computing a 5905 # If test is not a shell built-in, we'll probably end up computing a
5866 # maximum length that is only half of the actual maximum length, but 5906 # maximum length that is only half of the actual maximum length, but
5867 # we can't tell. 5907 # we can't tell.
5868 while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ 5908 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
5909 while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
5869 = "XX$teststring") >/dev/null 2>&1 && 5910 = "XX$teststring") >/dev/null 2>&1 &&
5870 new_result=`expr "X$teststring" : ".*" 2>&1` && 5911 new_result=`expr "X$teststring" : ".*" 2>&1` &&
5871 lt_cv_sys_max_cmd_len=$new_result && 5912 lt_cv_sys_max_cmd_len=$new_result &&
@@ -5911,9 +5952,6 @@ symcode='[BCDEGRST]'
5911# Regexp to match symbols that can be accessed directly from C. 5952# Regexp to match symbols that can be accessed directly from C.
5912sympat='\([_A-Za-z][_A-Za-z0-9]*\)' 5953sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
5913 5954
5914# Transform the above into a raw symbol and a C symbol.
5915symxfrm='\1 \2\3 \3'
5916
5917# Transform an extracted symbol line into a proper C declaration 5955# Transform an extracted symbol line into a proper C declaration
5918lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" 5956lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
5919 5957
@@ -5935,6 +5973,13 @@ hpux*) # Its linker distinguishes data from code symbols
5935 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 5973 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
5936 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'" 5974 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'"
5937 ;; 5975 ;;
5976linux*)
5977 if test "$host_cpu" = ia64; then
5978 symcode='[ABCDGIRSTW]'
5979 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
5980 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'"
5981 fi
5982 ;;
5938irix* | nonstopux*) 5983irix* | nonstopux*)
5939 symcode='[BCDEGRST]' 5984 symcode='[BCDEGRST]'
5940 ;; 5985 ;;
@@ -5966,8 +6011,11 @@ esac
5966# Try without a prefix undercore, then with it. 6011# Try without a prefix undercore, then with it.
5967for ac_symprfx in "" "_"; do 6012for ac_symprfx in "" "_"; do
5968 6013
6014 # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
6015 symxfrm="\\1 $ac_symprfx\\2 \\2"
6016
5969 # Write the raw and C identifiers. 6017 # Write the raw and C identifiers.
5970 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" 6018 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
5971 6019
5972 # Check to see that the pipe works correctly. 6020 # Check to see that the pipe works correctly.
5973 pipe_works=no 6021 pipe_works=no
@@ -6129,7 +6177,7 @@ esac
6129 6177
6130# Sed substitution that helps us do robust quoting. It backslashifies 6178# Sed substitution that helps us do robust quoting. It backslashifies
6131# metacharacters that are still active within double-quoted strings. 6179# metacharacters that are still active within double-quoted strings.
6132Xsed='sed -e s/^X//' 6180Xsed='sed -e 1s/^X//'
6133sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' 6181sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
6134 6182
6135# Same as above, but do not quote variable references. 6183# Same as above, but do not quote variable references.
@@ -6149,7 +6197,7 @@ rm="rm -f"
6149default_ofile=libtool 6197default_ofile=libtool
6150can_build_shared=yes 6198can_build_shared=yes
6151 6199
6152# All known linkers require a `.a' archive for static linking (except M$VC, 6200# All known linkers require a `.a' archive for static linking (except MSVC,
6153# which needs '.lib'). 6201# which needs '.lib').
6154libext=a 6202libext=a
6155ltmain="$ac_aux_dir/ltmain.sh" 6203ltmain="$ac_aux_dir/ltmain.sh"
@@ -6434,6 +6482,17 @@ if test -n "$RANLIB"; then
6434 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" 6482 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
6435fi 6483fi
6436 6484
6485for cc_temp in $compiler""; do
6486 case $cc_temp in
6487 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
6488 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
6489 \-*) ;;
6490 *) break;;
6491 esac
6492done
6493cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
6494
6495
6437# Only perform the check for file, if the check method requires it 6496# Only perform the check for file, if the check method requires it
6438case $deplibs_check_method in 6497case $deplibs_check_method in
6439file_magic*) 6498file_magic*)
@@ -6459,7 +6518,7 @@ else
6459 if test -n "$file_magic_test_file"; then 6518 if test -n "$file_magic_test_file"; then
6460 case $deplibs_check_method in 6519 case $deplibs_check_method in
6461 "file_magic "*) 6520 "file_magic "*)
6462 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" 6521 file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
6463 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 6522 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
6464 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | 6523 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
6465 $EGREP "$file_magic_regex" > /dev/null; then 6524 $EGREP "$file_magic_regex" > /dev/null; then
@@ -6521,7 +6580,7 @@ else
6521 if test -n "$file_magic_test_file"; then 6580 if test -n "$file_magic_test_file"; then
6522 case $deplibs_check_method in 6581 case $deplibs_check_method in
6523 "file_magic "*) 6582 "file_magic "*)
6524 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" 6583 file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
6525 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 6584 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
6526 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | 6585 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
6527 $EGREP "$file_magic_regex" > /dev/null; then 6586 $EGREP "$file_magic_regex" > /dev/null; then
@@ -6620,6 +6679,20 @@ LTCC=${LTCC-"$CC"}
6620compiler=$CC 6679compiler=$CC
6621 6680
6622 6681
6682# save warnings/boilerplate of simple test code
6683ac_outfile=conftest.$ac_objext
6684printf "$lt_simple_compile_test_code" >conftest.$ac_ext
6685eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
6686_lt_compiler_boilerplate=`cat conftest.err`
6687$rm conftest*
6688
6689ac_outfile=conftest.$ac_objext
6690printf "$lt_simple_link_test_code" >conftest.$ac_ext
6691eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
6692_lt_linker_boilerplate=`cat conftest.err`
6693$rm conftest*
6694
6695
6623# 6696#
6624# Check for any special shared library compilation flags. 6697# Check for any special shared library compilation flags.
6625# 6698#
@@ -6656,11 +6729,16 @@ else
6656 LDFLAGS="$LDFLAGS $lt_prog_compiler_static" 6729 LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
6657 printf "$lt_simple_link_test_code" > conftest.$ac_ext 6730 printf "$lt_simple_link_test_code" > conftest.$ac_ext
6658 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then 6731 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
6659 # The compiler can only warn and ignore the option if not recognized 6732 # The linker can only warn and ignore the option if not recognized
6660 # So say no if there are warnings 6733 # So say no if there are warnings
6661 if test -s conftest.err; then 6734 if test -s conftest.err; then
6662 # Append any errors to the config.log. 6735 # Append any errors to the config.log.
6663 cat conftest.err 1>&5 6736 cat conftest.err 1>&5
6737 $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
6738 $SED '/^$/d' conftest.err >conftest.er2
6739 if diff conftest.exp conftest.er2 >/dev/null; then
6740 lt_prog_compiler_static_works=yes
6741 fi
6664 else 6742 else
6665 lt_prog_compiler_static_works=yes 6743 lt_prog_compiler_static_works=yes
6666 fi 6744 fi
@@ -6702,18 +6780,20 @@ else
6702 # with a dollar sign (not a hyphen), so the echo should work correctly. 6780 # with a dollar sign (not a hyphen), so the echo should work correctly.
6703 # The option is referenced via a variable to avoid confusing sed. 6781 # The option is referenced via a variable to avoid confusing sed.
6704 lt_compile=`echo "$ac_compile" | $SED \ 6782 lt_compile=`echo "$ac_compile" | $SED \
6705 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 6783 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6706 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 6784 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6707 -e 's:$: $lt_compiler_flag:'` 6785 -e 's:$: $lt_compiler_flag:'`
6708 (eval echo "\"\$as_me:6708: $lt_compile\"" >&5) 6786 (eval echo "\"\$as_me:6786: $lt_compile\"" >&5)
6709 (eval "$lt_compile" 2>conftest.err) 6787 (eval "$lt_compile" 2>conftest.err)
6710 ac_status=$? 6788 ac_status=$?
6711 cat conftest.err >&5 6789 cat conftest.err >&5
6712 echo "$as_me:6712: \$? = $ac_status" >&5 6790 echo "$as_me:6790: \$? = $ac_status" >&5
6713 if (exit $ac_status) && test -s "$ac_outfile"; then 6791 if (exit $ac_status) && test -s "$ac_outfile"; then
6714 # The compiler can only warn and ignore the option if not recognized 6792 # The compiler can only warn and ignore the option if not recognized
6715 # So say no if there are warnings 6793 # So say no if there are warnings other than the usual output.
6716 if test ! -s conftest.err; then 6794 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
6795 $SED '/^$/d' conftest.err >conftest.er2
6796 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
6717 lt_cv_prog_compiler_rtti_exceptions=yes 6797 lt_cv_prog_compiler_rtti_exceptions=yes
6718 fi 6798 fi
6719 fi 6799 fi
@@ -6790,7 +6870,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
6790 hpux*) 6870 hpux*)
6791 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 6871 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
6792 # not for PA HP-UX. 6872 # not for PA HP-UX.
6793 case "$host_cpu" in 6873 case $host_cpu in
6794 hppa*64*|ia64*) 6874 hppa*64*|ia64*)
6795 # +Z the default 6875 # +Z the default
6796 ;; 6876 ;;
@@ -6816,6 +6896,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
6816 lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' 6896 lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
6817 fi 6897 fi
6818 ;; 6898 ;;
6899 darwin*)
6900 # PIC is the default on this platform
6901 # Common symbols not allowed in MH_DYLIB files
6902 case $cc_basename in
6903 xlc*)
6904 lt_prog_compiler_pic='-qnocommon'
6905 lt_prog_compiler_wl='-Wl,'
6906 ;;
6907 esac
6908 ;;
6819 6909
6820 mingw* | pw32* | os2*) 6910 mingw* | pw32* | os2*)
6821 # This hack is so that the source file can tell whether it is being 6911 # This hack is so that the source file can tell whether it is being
@@ -6827,7 +6917,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
6827 lt_prog_compiler_wl='-Wl,' 6917 lt_prog_compiler_wl='-Wl,'
6828 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 6918 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
6829 # not for PA HP-UX. 6919 # not for PA HP-UX.
6830 case "$host_cpu" in 6920 case $host_cpu in
6831 hppa*64*|ia64*) 6921 hppa*64*|ia64*)
6832 # +Z the default 6922 # +Z the default
6833 ;; 6923 ;;
@@ -6851,12 +6941,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
6851 ;; 6941 ;;
6852 6942
6853 linux*) 6943 linux*)
6854 case $CC in 6944 case $cc_basename in
6855 icc* | ecc*) 6945 icc* | ecc*)
6856 lt_prog_compiler_wl='-Wl,' 6946 lt_prog_compiler_wl='-Wl,'
6857 lt_prog_compiler_pic='-KPIC' 6947 lt_prog_compiler_pic='-KPIC'
6858 lt_prog_compiler_static='-static' 6948 lt_prog_compiler_static='-static'
6859 ;; 6949 ;;
6950 pgcc* | pgf77* | pgf90* | pgf95*)
6951 # Portland Group compilers (*not* the Pentium gcc compiler,
6952 # which looks to be a dead project)
6953 lt_prog_compiler_wl='-Wl,'
6954 lt_prog_compiler_pic='-fpic'
6955 lt_prog_compiler_static='-Bstatic'
6956 ;;
6860 ccc*) 6957 ccc*)
6861 lt_prog_compiler_wl='-Wl,' 6958 lt_prog_compiler_wl='-Wl,'
6862 # All Alpha code is PIC. 6959 # All Alpha code is PIC.
@@ -6877,9 +6974,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
6877 ;; 6974 ;;
6878 6975
6879 solaris*) 6976 solaris*)
6880 lt_prog_compiler_wl='-Wl,'
6881 lt_prog_compiler_pic='-KPIC' 6977 lt_prog_compiler_pic='-KPIC'
6882 lt_prog_compiler_static='-Bstatic' 6978 lt_prog_compiler_static='-Bstatic'
6979 case $cc_basename in
6980 f77* | f90* | f95*)
6981 lt_prog_compiler_wl='-Qoption ld ';;
6982 *)
6983 lt_prog_compiler_wl='-Wl,';;
6984 esac
6883 ;; 6985 ;;
6884 6986
6885 sunos4*) 6987 sunos4*)
@@ -6901,6 +7003,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
6901 fi 7003 fi
6902 ;; 7004 ;;
6903 7005
7006 unicos*)
7007 lt_prog_compiler_wl='-Wl,'
7008 lt_prog_compiler_can_build_shared=no
7009 ;;
7010
6904 uts4*) 7011 uts4*)
6905 lt_prog_compiler_pic='-pic' 7012 lt_prog_compiler_pic='-pic'
6906 lt_prog_compiler_static='-Bstatic' 7013 lt_prog_compiler_static='-Bstatic'
@@ -6935,18 +7042,20 @@ else
6935 # with a dollar sign (not a hyphen), so the echo should work correctly. 7042 # with a dollar sign (not a hyphen), so the echo should work correctly.
6936 # The option is referenced via a variable to avoid confusing sed. 7043 # The option is referenced via a variable to avoid confusing sed.
6937 lt_compile=`echo "$ac_compile" | $SED \ 7044 lt_compile=`echo "$ac_compile" | $SED \
6938 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 7045 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6939 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7046 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6940 -e 's:$: $lt_compiler_flag:'` 7047 -e 's:$: $lt_compiler_flag:'`
6941 (eval echo "\"\$as_me:6941: $lt_compile\"" >&5) 7048 (eval echo "\"\$as_me:7048: $lt_compile\"" >&5)
6942 (eval "$lt_compile" 2>conftest.err) 7049 (eval "$lt_compile" 2>conftest.err)
6943 ac_status=$? 7050 ac_status=$?
6944 cat conftest.err >&5 7051 cat conftest.err >&5
6945 echo "$as_me:6945: \$? = $ac_status" >&5 7052 echo "$as_me:7052: \$? = $ac_status" >&5
6946 if (exit $ac_status) && test -s "$ac_outfile"; then 7053 if (exit $ac_status) && test -s "$ac_outfile"; then
6947 # The compiler can only warn and ignore the option if not recognized 7054 # The compiler can only warn and ignore the option if not recognized
6948 # So say no if there are warnings 7055 # So say no if there are warnings other than the usual output.
6949 if test ! -s conftest.err; then 7056 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
7057 $SED '/^$/d' conftest.err >conftest.er2
7058 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
6950 lt_prog_compiler_pic_works=yes 7059 lt_prog_compiler_pic_works=yes
6951 fi 7060 fi
6952 fi 7061 fi
@@ -6967,7 +7076,7 @@ else
6967fi 7076fi
6968 7077
6969fi 7078fi
6970case "$host_os" in 7079case $host_os in
6971 # For platforms which do not support PIC, -DPIC is meaningless: 7080 # For platforms which do not support PIC, -DPIC is meaningless:
6972 *djgpp*) 7081 *djgpp*)
6973 lt_prog_compiler_pic= 7082 lt_prog_compiler_pic=
@@ -6995,23 +7104,25 @@ else
6995 # Note that $ac_compile itself does not contain backslashes and begins 7104 # Note that $ac_compile itself does not contain backslashes and begins
6996 # with a dollar sign (not a hyphen), so the echo should work correctly. 7105 # with a dollar sign (not a hyphen), so the echo should work correctly.
6997 lt_compile=`echo "$ac_compile" | $SED \ 7106 lt_compile=`echo "$ac_compile" | $SED \
6998 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 7107 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6999 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7108 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7000 -e 's:$: $lt_compiler_flag:'` 7109 -e 's:$: $lt_compiler_flag:'`
7001 (eval echo "\"\$as_me:7001: $lt_compile\"" >&5) 7110 (eval echo "\"\$as_me:7110: $lt_compile\"" >&5)
7002 (eval "$lt_compile" 2>out/conftest.err) 7111 (eval "$lt_compile" 2>out/conftest.err)
7003 ac_status=$? 7112 ac_status=$?
7004 cat out/conftest.err >&5 7113 cat out/conftest.err >&5
7005 echo "$as_me:7005: \$? = $ac_status" >&5 7114 echo "$as_me:7114: \$? = $ac_status" >&5
7006 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7115 if (exit $ac_status) && test -s out/conftest2.$ac_objext
7007 then 7116 then
7008 # The compiler can only warn and ignore the option if not recognized 7117 # The compiler can only warn and ignore the option if not recognized
7009 # So say no if there are warnings 7118 # So say no if there are warnings
7010 if test ! -s out/conftest.err; then 7119 $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
7120 $SED '/^$/d' out/conftest.err >out/conftest.er2
7121 if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
7011 lt_cv_prog_compiler_c_o=yes 7122 lt_cv_prog_compiler_c_o=yes
7012 fi 7123 fi
7013 fi 7124 fi
7014 chmod u+w . 7125 chmod u+w . 2>&5
7015 $rm conftest* 7126 $rm conftest*
7016 # SGI C++ compiler will create directory out/ii_files/ for 7127 # SGI C++ compiler will create directory out/ii_files/ for
7017 # template instantiation 7128 # template instantiation
@@ -7087,6 +7198,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
7087 # rely on this symbol name, it's probably fine to never include it in 7198 # rely on this symbol name, it's probably fine to never include it in
7088 # preloaded symbol tables. 7199 # preloaded symbol tables.
7089 extract_expsyms_cmds= 7200 extract_expsyms_cmds=
7201 # Just being paranoid about ensuring that cc_basename is set.
7202 for cc_temp in $compiler""; do
7203 case $cc_temp in
7204 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
7205 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
7206 \-*) ;;
7207 *) break;;
7208 esac
7209done
7210cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
7090 7211
7091 case $host_os in 7212 case $host_os in
7092 cygwin* | mingw* | pw32*) 7213 cygwin* | mingw* | pw32*)
@@ -7107,6 +7228,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
7107 # If archive_cmds runs LD, not CC, wlarc should be empty 7228 # If archive_cmds runs LD, not CC, wlarc should be empty
7108 wlarc='${wl}' 7229 wlarc='${wl}'
7109 7230
7231 # Set some defaults for GNU ld with shared library support. These
7232 # are reset later if shared libraries are not supported. Putting them
7233 # here allows them to be overridden if necessary.
7234 runpath_var=LD_RUN_PATH
7235 hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
7236 export_dynamic_flag_spec='${wl}--export-dynamic'
7237 # ancient GNU ld didn't support --whole-archive et. al.
7238 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
7239 whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7240 else
7241 whole_archive_flag_spec=
7242 fi
7243 supports_anon_versioning=no
7244 case `$LD -v 2>/dev/null` in
7245 *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
7246 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
7247 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
7248 *\ 2.11.*) ;; # other 2.11 versions
7249 *) supports_anon_versioning=yes ;;
7250 esac
7251
7110 # See if GNU ld supports shared libraries. 7252 # See if GNU ld supports shared libraries.
7111 case $host_os in 7253 case $host_os in
7112 aix3* | aix4* | aix5*) 7254 aix3* | aix4* | aix5*)
@@ -7157,7 +7299,7 @@ EOF
7157 allow_undefined_flag=unsupported 7299 allow_undefined_flag=unsupported
7158 always_export_symbols=no 7300 always_export_symbols=no
7159 enable_shared_with_static_runtimes=yes 7301 enable_shared_with_static_runtimes=yes
7160 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' 7302 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
7161 7303
7162 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then 7304 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
7163 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 7305 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -7175,6 +7317,38 @@ EOF
7175 fi 7317 fi
7176 ;; 7318 ;;
7177 7319
7320 linux*)
7321 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7322 tmp_addflag=
7323 case $cc_basename,$host_cpu in
7324 pgcc*) # Portland Group C compiler
7325 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7326 tmp_addflag=' $pic_flag'
7327 ;;
7328 pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
7329 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7330 tmp_addflag=' $pic_flag -Mnomain' ;;
7331 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
7332 tmp_addflag=' -i_dynamic' ;;
7333 efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
7334 tmp_addflag=' -i_dynamic -nofor_main' ;;
7335 ifc* | ifort*) # Intel Fortran compiler
7336 tmp_addflag=' -nofor_main' ;;
7337 esac
7338 archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7339
7340 if test $supports_anon_versioning = yes; then
7341 archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
7342 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
7343 $echo "local: *; };" >> $output_objdir/$libname.ver~
7344 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
7345 fi
7346 link_all_deplibs=no
7347 else
7348 ld_shlibs=no
7349 fi
7350 ;;
7351
7178 netbsd* | netbsdelf*-gnu | knetbsd*-gnu) 7352 netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
7179 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then 7353 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
7180 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 7354 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7213,32 +7387,6 @@ EOF
7213 hardcode_shlibpath_var=no 7387 hardcode_shlibpath_var=no
7214 ;; 7388 ;;
7215 7389
7216 linux*)
7217 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7218 tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7219 archive_cmds="$tmp_archive_cmds"
7220 supports_anon_versioning=no
7221 case `$LD -v 2>/dev/null` in
7222 *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
7223 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
7224 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
7225 *\ 2.11.*) ;; # other 2.11 versions
7226 *) supports_anon_versioning=yes ;;
7227 esac
7228 if test $supports_anon_versioning = yes; then
7229 archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
7230cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
7231$echo "local: *; };" >> $output_objdir/$libname.ver~
7232 $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
7233 else
7234 archive_expsym_cmds="$tmp_archive_cmds"
7235 fi
7236 link_all_deplibs=no
7237 else
7238 ld_shlibs=no
7239 fi
7240 ;;
7241
7242 *) 7390 *)
7243 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 7391 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7244 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 7392 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -7249,16 +7397,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
7249 ;; 7397 ;;
7250 esac 7398 esac
7251 7399
7252 if test "$ld_shlibs" = yes; then 7400 if test "$ld_shlibs" = no; then
7253 runpath_var=LD_RUN_PATH 7401 runpath_var=
7254 hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' 7402 hardcode_libdir_flag_spec=
7255 export_dynamic_flag_spec='${wl}--export-dynamic' 7403 export_dynamic_flag_spec=
7256 # ancient GNU ld didn't support --whole-archive et. al. 7404 whole_archive_flag_spec=
7257 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
7258 whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7259 else
7260 whole_archive_flag_spec=
7261 fi
7262 fi 7405 fi
7263 else 7406 else
7264 # PORTME fill in a description of your system's linker (not GNU ld) 7407 # PORTME fill in a description of your system's linker (not GNU ld)
@@ -7322,7 +7465,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
7322 link_all_deplibs=yes 7465 link_all_deplibs=yes
7323 7466
7324 if test "$GCC" = yes; then 7467 if test "$GCC" = yes; then
7325 case $host_os in aix4.012|aix4.012.*) 7468 case $host_os in aix4.[012]|aix4.[012].*)
7326 # We only want to do this on AIX 4.2 and lower, the check 7469 # We only want to do this on AIX 4.2 and lower, the check
7327 # below for broken collect2 doesn't work under 4.3+ 7470 # below for broken collect2 doesn't work under 4.3+
7328 collect2name=`${CC} -print-prog-name=collect2` 7471 collect2name=`${CC} -print-prog-name=collect2`
@@ -7343,6 +7486,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
7343 fi 7486 fi
7344 esac 7487 esac
7345 shared_flag='-shared' 7488 shared_flag='-shared'
7489 if test "$aix_use_runtimelinking" = yes; then
7490 shared_flag="$shared_flag "'${wl}-G'
7491 fi
7346 else 7492 else
7347 # not using gcc 7493 # not using gcc
7348 if test "$host_cpu" = ia64; then 7494 if test "$host_cpu" = ia64; then
@@ -7487,7 +7633,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7487 # Exported symbols can be pulled into shared objects from archives 7633 # Exported symbols can be pulled into shared objects from archives
7488 whole_archive_flag_spec=' ' 7634 whole_archive_flag_spec=' '
7489 archive_cmds_need_lc=yes 7635 archive_cmds_need_lc=yes
7490 # This is similar to how AIX traditionally builds it's shared libraries. 7636 # This is similar to how AIX traditionally builds its shared libraries.
7491 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 7637 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
7492 fi 7638 fi
7493 fi 7639 fi
@@ -7501,7 +7647,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7501 ld_shlibs=no 7647 ld_shlibs=no
7502 ;; 7648 ;;
7503 7649
7504 bsdi4*) 7650 bsdi[45]*)
7505 export_dynamic_flag_spec=-rdynamic 7651 export_dynamic_flag_spec=-rdynamic
7506 ;; 7652 ;;
7507 7653
@@ -7527,52 +7673,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7527 ;; 7673 ;;
7528 7674
7529 darwin* | rhapsody*) 7675 darwin* | rhapsody*)
7530 if test "$GXX" = yes ; then 7676 case $host_os in
7531 archive_cmds_need_lc=no 7677 rhapsody* | darwin1.[012])
7532 case "$host_os" in 7678 allow_undefined_flag='${wl}-undefined ${wl}suppress'
7533 rhapsody* | darwin1.[012]) 7679 ;;
7534 allow_undefined_flag='-undefined suppress' 7680 *) # Darwin 1.3 on
7535 ;; 7681 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
7536 *) # Darwin 1.3 on 7682 allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
7537 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then 7683 else
7538 allow_undefined_flag='-flat_namespace -undefined suppress' 7684 case ${MACOSX_DEPLOYMENT_TARGET} in
7539 else 7685 10.[012])
7540 case ${MACOSX_DEPLOYMENT_TARGET} in 7686 allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
7541 10.[012]) 7687 ;;
7542 allow_undefined_flag='-flat_namespace -undefined suppress' 7688 10.*)
7543 ;; 7689 allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
7544 10.*) 7690 ;;
7545 allow_undefined_flag='-undefined dynamic_lookup' 7691 esac
7546 ;; 7692 fi
7547 esac 7693 ;;
7548 fi
7549 ;;
7550 esac 7694 esac
7551 lt_int_apple_cc_single_mod=no 7695 archive_cmds_need_lc=no
7552 output_verbose_link_cmd='echo'
7553 if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
7554 lt_int_apple_cc_single_mod=yes
7555 fi
7556 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
7557 archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
7558 else
7559 archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
7560 fi
7561 module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7562 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
7563 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
7564 archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7565 else
7566 archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7567 fi
7568 module_expsym_cmds='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}'
7569 hardcode_direct=no 7696 hardcode_direct=no
7570 hardcode_automatic=yes 7697 hardcode_automatic=yes
7571 hardcode_shlibpath_var=unsupported 7698 hardcode_shlibpath_var=unsupported
7572 whole_archive_flag_spec='-all_load $convenience' 7699 whole_archive_flag_spec=''
7573 link_all_deplibs=yes 7700 link_all_deplibs=yes
7701 if test "$GCC" = yes ; then
7702 output_verbose_link_cmd='echo'
7703 archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
7704 module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7705 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
7706 archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7707 module_expsym_cmds='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}'
7574 else 7708 else
7575 ld_shlibs=no 7709 case $cc_basename in
7710 xlc*)
7711 output_verbose_link_cmd='echo'
7712 archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
7713 module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7714 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
7715 archive_expsym_cmds='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}'
7716 module_expsym_cmds='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}'
7717 ;;
7718 *)
7719 ld_shlibs=no
7720 ;;
7721 esac
7576 fi 7722 fi
7577 ;; 7723 ;;
7578 7724
@@ -7606,7 +7752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7606 ;; 7752 ;;
7607 7753
7608 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 7754 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
7609 freebsd* | kfreebsd*-gnu) 7755 freebsd* | kfreebsd*-gnu | dragonfly*)
7610 archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 7756 archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
7611 hardcode_libdir_flag_spec='-R$libdir' 7757 hardcode_libdir_flag_spec='-R$libdir'
7612 hardcode_direct=yes 7758 hardcode_direct=yes
@@ -7631,7 +7777,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7631 7777
7632 hpux10* | hpux11*) 7778 hpux10* | hpux11*)
7633 if test "$GCC" = yes -a "$with_gnu_ld" = no; then 7779 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
7634 case "$host_cpu" in 7780 case $host_cpu in
7635 hppa*64*|ia64*) 7781 hppa*64*|ia64*)
7636 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 7782 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7637 ;; 7783 ;;
@@ -7640,7 +7786,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7640 ;; 7786 ;;
7641 esac 7787 esac
7642 else 7788 else
7643 case "$host_cpu" in 7789 case $host_cpu in
7644 hppa*64*|ia64*) 7790 hppa*64*|ia64*)
7645 archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' 7791 archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
7646 ;; 7792 ;;
@@ -7650,7 +7796,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7650 esac 7796 esac
7651 fi 7797 fi
7652 if test "$with_gnu_ld" = no; then 7798 if test "$with_gnu_ld" = no; then
7653 case "$host_cpu" in 7799 case $host_cpu in
7654 hppa*64*) 7800 hppa*64*)
7655 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' 7801 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
7656 hardcode_libdir_flag_spec_ld='+b $libdir' 7802 hardcode_libdir_flag_spec_ld='+b $libdir'
@@ -7717,6 +7863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7717 hardcode_shlibpath_var=no 7863 hardcode_shlibpath_var=no
7718 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 7864 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7719 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 7865 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
7866 archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
7720 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 7867 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
7721 export_dynamic_flag_spec='${wl}-E' 7868 export_dynamic_flag_spec='${wl}-E'
7722 else 7869 else
@@ -7762,7 +7909,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7762 allow_undefined_flag=' -expect_unresolved \*' 7909 allow_undefined_flag=' -expect_unresolved \*'
7763 archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' 7910 archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7764 archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ 7911 archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
7765 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' 7912 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
7766 7913
7767 # Both c and cxx compiler support -rpath directly 7914 # Both c and cxx compiler support -rpath directly
7768 hardcode_libdir_flag_spec='-rpath $libdir' 7915 hardcode_libdir_flag_spec='-rpath $libdir'
@@ -7781,10 +7928,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7781 solaris*) 7928 solaris*)
7782 no_undefined_flag=' -z text' 7929 no_undefined_flag=' -z text'
7783 if test "$GCC" = yes; then 7930 if test "$GCC" = yes; then
7931 wlarc='${wl}'
7784 archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 7932 archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
7785 archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 7933 archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
7786 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' 7934 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
7787 else 7935 else
7936 wlarc=''
7788 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' 7937 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
7789 archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 7938 archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
7790 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' 7939 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -7793,8 +7942,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7793 hardcode_shlibpath_var=no 7942 hardcode_shlibpath_var=no
7794 case $host_os in 7943 case $host_os in
7795 solaris2.[0-5] | solaris2.[0-5].*) ;; 7944 solaris2.[0-5] | solaris2.[0-5].*) ;;
7796 *) # Supported since Solaris 2.6 (maybe 2.5.1?) 7945 *)
7797 whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; 7946 # The compiler driver will combine linker options so we
7947 # cannot just pass the convience library names through
7948 # without $wl, iff we do not link with $LD.
7949 # Luckily, gcc supports the same syntax we need for Sun Studio.
7950 # Supported since Solaris 2.6 (maybe 2.5.1?)
7951 case $wlarc in
7952 '')
7953 whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
7954 *)
7955 whole_archive_flag_spec='${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' ;;
7956 esac ;;
7798 esac 7957 esac
7799 link_all_deplibs=yes 7958 link_all_deplibs=yes
7800 ;; 7959 ;;
@@ -8068,7 +8227,7 @@ beos*)
8068 shlibpath_var=LIBRARY_PATH 8227 shlibpath_var=LIBRARY_PATH
8069 ;; 8228 ;;
8070 8229
8071bsdi4*) 8230bsdi[45]*)
8072 version_type=linux 8231 version_type=linux
8073 need_version=no 8232 need_version=no
8074 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 8233 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -8096,7 +8255,8 @@ cygwin* | mingw* | pw32*)
8096 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ 8255 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
8097 dldir=$destdir/`dirname \$dlpath`~ 8256 dldir=$destdir/`dirname \$dlpath`~
8098 test -d \$dldir || mkdir -p \$dldir~ 8257 test -d \$dldir || mkdir -p \$dldir~
8099 $install_prog $dir/$dlname \$dldir/$dlname' 8258 $install_prog $dir/$dlname \$dldir/$dlname~
8259 chmod a+x \$dldir/$dlname'
8100 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 8260 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8101 dlpath=$dir/\$dldll~ 8261 dlpath=$dir/\$dldll~
8102 $rm \$dlpath' 8262 $rm \$dlpath'
@@ -8126,7 +8286,7 @@ cygwin* | mingw* | pw32*)
8126 ;; 8286 ;;
8127 pw32*) 8287 pw32*)
8128 # pw32 DLLs use 'pw' prefix rather than 'lib' 8288 # pw32 DLLs use 'pw' prefix rather than 'lib'
8129 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' 8289 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8130 ;; 8290 ;;
8131 esac 8291 esac
8132 ;; 8292 ;;
@@ -8149,7 +8309,7 @@ darwin* | rhapsody*)
8149 soname_spec='${libname}${release}${major}$shared_ext' 8309 soname_spec='${libname}${release}${major}$shared_ext'
8150 shlibpath_overrides_runpath=yes 8310 shlibpath_overrides_runpath=yes
8151 shlibpath_var=DYLD_LIBRARY_PATH 8311 shlibpath_var=DYLD_LIBRARY_PATH
8152 shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' 8312 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
8153 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 8313 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
8154 if test "$GCC" = yes; then 8314 if test "$GCC" = yes; then
8155 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"` 8315 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"`
@@ -8184,8 +8344,17 @@ kfreebsd*-gnu)
8184 dynamic_linker='GNU ld.so' 8344 dynamic_linker='GNU ld.so'
8185 ;; 8345 ;;
8186 8346
8187freebsd*) 8347freebsd* | dragonfly*)
8188 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 8348 # DragonFly does not have aout. When/if they implement a new
8349 # versioning mechanism, adjust this.
8350 if test -x /usr/bin/objformat; then
8351 objformat=`/usr/bin/objformat`
8352 else
8353 case $host_os in
8354 freebsd[123]*) objformat=aout ;;
8355 *) objformat=elf ;;
8356 esac
8357 fi
8189 version_type=freebsd-$objformat 8358 version_type=freebsd-$objformat
8190 case $version_type in 8359 case $version_type in
8191 freebsd-elf*) 8360 freebsd-elf*)
@@ -8203,7 +8372,7 @@ freebsd*)
8203 freebsd2*) 8372 freebsd2*)
8204 shlibpath_overrides_runpath=yes 8373 shlibpath_overrides_runpath=yes
8205 ;; 8374 ;;
8206 freebsd3.01* | freebsdelf3.01*) 8375 freebsd3.[01]* | freebsdelf3.[01]*)
8207 shlibpath_overrides_runpath=yes 8376 shlibpath_overrides_runpath=yes
8208 hardcode_into_libs=yes 8377 hardcode_into_libs=yes
8209 ;; 8378 ;;
@@ -8230,7 +8399,7 @@ hpux9* | hpux10* | hpux11*)
8230 version_type=sunos 8399 version_type=sunos
8231 need_lib_prefix=no 8400 need_lib_prefix=no
8232 need_version=no 8401 need_version=no
8233 case "$host_cpu" in 8402 case $host_cpu in
8234 ia64*) 8403 ia64*)
8235 shrext_cmds='.so' 8404 shrext_cmds='.so'
8236 hardcode_into_libs=yes 8405 hardcode_into_libs=yes
@@ -8329,7 +8498,7 @@ linux*)
8329 8498
8330 # Append ld.so.conf contents to the search path 8499 # Append ld.so.conf contents to the search path
8331 if test -f /etc/ld.so.conf; then 8500 if test -f /etc/ld.so.conf; then
8332 lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` 8501 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' ' '`
8333 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 8502 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8334 fi 8503 fi
8335 8504
@@ -8404,7 +8573,11 @@ nto-qnx*)
8404openbsd*) 8573openbsd*)
8405 version_type=sunos 8574 version_type=sunos
8406 need_lib_prefix=no 8575 need_lib_prefix=no
8407 need_version=yes 8576 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
8577 case $host_os in
8578 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
8579 *) need_version=no ;;
8580 esac
8408 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 8581 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
8409 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 8582 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
8410 shlibpath_var=LD_LIBRARY_PATH 8583 shlibpath_var=LD_LIBRARY_PATH
@@ -8526,8 +8699,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
8526echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 8699echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
8527hardcode_action= 8700hardcode_action=
8528if test -n "$hardcode_libdir_flag_spec" || \ 8701if test -n "$hardcode_libdir_flag_spec" || \
8529 test -n "$runpath_var " || \ 8702 test -n "$runpath_var" || \
8530 test "X$hardcode_automatic"="Xyes" ; then 8703 test "X$hardcode_automatic" = "Xyes" ; then
8531 8704
8532 # We can hardcode non-existant directories. 8705 # We can hardcode non-existant directories.
8533 if test "$hardcode_direct" != no && 8706 if test "$hardcode_direct" != no &&
@@ -9186,7 +9359,7 @@ else
9186 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9359 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9187 lt_status=$lt_dlunknown 9360 lt_status=$lt_dlunknown
9188 cat > conftest.$ac_ext <<EOF 9361 cat > conftest.$ac_ext <<EOF
9189#line 9189 "configure" 9362#line 9362 "configure"
9190#include "confdefs.h" 9363#include "confdefs.h"
9191 9364
9192#if HAVE_DLFCN_H 9365#if HAVE_DLFCN_H
@@ -9252,7 +9425,7 @@ EOF
9252 ac_status=$? 9425 ac_status=$?
9253 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9426 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9254 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 9427 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
9255 (./conftest; exit; ) 2>/dev/null 9428 (./conftest; exit; ) >&5 2>/dev/null
9256 lt_status=$? 9429 lt_status=$?
9257 case x$lt_status in 9430 case x$lt_status in
9258 x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; 9431 x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -9284,7 +9457,7 @@ else
9284 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9457 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9285 lt_status=$lt_dlunknown 9458 lt_status=$lt_dlunknown
9286 cat > conftest.$ac_ext <<EOF 9459 cat > conftest.$ac_ext <<EOF
9287#line 9287 "configure" 9460#line 9460 "configure"
9288#include "confdefs.h" 9461#include "confdefs.h"
9289 9462
9290#if HAVE_DLFCN_H 9463#if HAVE_DLFCN_H
@@ -9350,7 +9523,7 @@ EOF
9350 ac_status=$? 9523 ac_status=$?
9351 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9524 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9352 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 9525 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
9353 (./conftest; exit; ) 2>/dev/null 9526 (./conftest; exit; ) >&5 2>/dev/null
9354 lt_status=$? 9527 lt_status=$?
9355 case x$lt_status in 9528 case x$lt_status in
9356 x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; 9529 x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -9400,7 +9573,7 @@ test "$can_build_shared" = "no" && enable_shared=no
9400 9573
9401# On AIX, shared libraries and static libraries use the same namespace, and 9574# On AIX, shared libraries and static libraries use the same namespace, and
9402# are all built from PIC. 9575# are all built from PIC.
9403case "$host_os" in 9576case $host_os in
9404aix3*) 9577aix3*)
9405 test "$enable_shared" = yes && enable_static=no 9578 test "$enable_shared" = yes && enable_static=no
9406 if test -n "$RANLIB"; then 9579 if test -n "$RANLIB"; then
@@ -9413,43 +9586,6 @@ aix4* | aix5*)
9413 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 9586 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9414 test "$enable_shared" = yes && enable_static=no 9587 test "$enable_shared" = yes && enable_static=no
9415 fi 9588 fi
9416 ;;
9417 darwin* | rhapsody*)
9418 if test "$GCC" = yes; then
9419 archive_cmds_need_lc=no
9420 case "$host_os" in
9421 rhapsody* | darwin1.[012])
9422 allow_undefined_flag='-undefined suppress'
9423 ;;
9424 *) # Darwin 1.3 on
9425 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
9426 allow_undefined_flag='-flat_namespace -undefined suppress'
9427 else
9428 case ${MACOSX_DEPLOYMENT_TARGET} in
9429 10.[012])
9430 allow_undefined_flag='-flat_namespace -undefined suppress'
9431 ;;
9432 10.*)
9433 allow_undefined_flag='-undefined dynamic_lookup'
9434 ;;
9435 esac
9436 fi
9437 ;;
9438 esac
9439 output_verbose_link_cmd='echo'
9440 archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
9441 module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
9442 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
9443 archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
9444 module_expsym_cmds='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}'
9445 hardcode_direct=no
9446 hardcode_automatic=yes
9447 hardcode_shlibpath_var=unsupported
9448 whole_archive_flag_spec='-all_load $convenience'
9449 link_all_deplibs=yes
9450 else
9451 ld_shlibs=no
9452 fi
9453 ;; 9589 ;;
9454esac 9590esac
9455echo "$as_me:$LINENO: result: $enable_shared" >&5 9591echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -9579,7 +9715,7 @@ echo "$as_me: creating $ofile" >&6;}
9579# 9715#
9580# You should have received a copy of the GNU General Public License 9716# You should have received a copy of the GNU General Public License
9581# along with this program; if not, write to the Free Software 9717# along with this program; if not, write to the Free Software
9582# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 9718# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
9583# 9719#
9584# As a special exception to the GNU General Public License, if you 9720# As a special exception to the GNU General Public License, if you
9585# distribute this file as part of a program that contains a 9721# distribute this file as part of a program that contains a
@@ -9590,11 +9726,11 @@ echo "$as_me: creating $ofile" >&6;}
9590SED=$lt_SED 9726SED=$lt_SED
9591 9727
9592# Sed that helps us avoid accidentally triggering echo(1) options like -n. 9728# Sed that helps us avoid accidentally triggering echo(1) options like -n.
9593Xsed="$SED -e s/^X//" 9729Xsed="$SED -e 1s/^X//"
9594 9730
9595# The HP-UX ksh and POSIX shell print the target directory to stdout 9731# The HP-UX ksh and POSIX shell print the target directory to stdout
9596# if CDPATH is set. 9732# if CDPATH is set.
9597if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi 9733(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
9598 9734
9599# The names of the tagged configurations supported by this script. 9735# The names of the tagged configurations supported by this script.
9600available_tags= 9736available_tags=
@@ -9624,6 +9760,12 @@ fast_install=$enable_fast_install
9624# The host system. 9760# The host system.
9625host_alias=$host_alias 9761host_alias=$host_alias
9626host=$host 9762host=$host
9763host_os=$host_os
9764
9765# The build system.
9766build_alias=$build_alias
9767build=$build
9768build_os=$build_os
9627 9769
9628# An echo program that does not interpret backslashes. 9770# An echo program that does not interpret backslashes.
9629echo=$lt_echo 9771echo=$lt_echo
@@ -9700,7 +9842,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
9700# Does compiler simultaneously support -c and -o options? 9842# Does compiler simultaneously support -c and -o options?
9701compiler_c_o=$lt_lt_cv_prog_compiler_c_o 9843compiler_c_o=$lt_lt_cv_prog_compiler_c_o
9702 9844
9703# Must we lock files when doing compilation ? 9845# Must we lock files when doing compilation?
9704need_locks=$lt_need_locks 9846need_locks=$lt_need_locks
9705 9847
9706# Do we need the lib prefix for modules? 9848# Do we need the lib prefix for modules?
@@ -9995,7 +10137,9 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
9995 10137
9996 case $tagname in 10138 case $tagname in
9997 CXX) 10139 CXX)
9998 if test -n "$CXX" && test "X$CXX" != "Xno"; then 10140 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
10141 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
10142 (test "X$CXX" != "Xg++"))) ; then
9999 ac_ext=cc 10143 ac_ext=cc
10000ac_cpp='$CXXCPP $CPPFLAGS' 10144ac_cpp='$CXXCPP $CPPFLAGS'
10001ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 10145ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10032,7 +10176,7 @@ postdeps_CXX=
10032compiler_lib_search_path_CXX= 10176compiler_lib_search_path_CXX=
10033 10177
10034# Source file extension for C++ test sources. 10178# Source file extension for C++ test sources.
10035ac_ext=cc 10179ac_ext=cpp
10036 10180
10037# Object file extension for compiled C++ test sources. 10181# Object file extension for compiled C++ test sources.
10038objext=o 10182objext=o
@@ -10053,6 +10197,20 @@ LTCC=${LTCC-"$CC"}
10053compiler=$CC 10197compiler=$CC
10054 10198
10055 10199
10200# save warnings/boilerplate of simple test code
10201ac_outfile=conftest.$ac_objext
10202printf "$lt_simple_compile_test_code" >conftest.$ac_ext
10203eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
10204_lt_compiler_boilerplate=`cat conftest.err`
10205$rm conftest*
10206
10207ac_outfile=conftest.$ac_objext
10208printf "$lt_simple_link_test_code" >conftest.$ac_ext
10209eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
10210_lt_linker_boilerplate=`cat conftest.err`
10211$rm conftest*
10212
10213
10056# Allow CC to be a program name with arguments. 10214# Allow CC to be a program name with arguments.
10057lt_save_CC=$CC 10215lt_save_CC=$CC
10058lt_save_LD=$LD 10216lt_save_LD=$LD
@@ -10074,7 +10232,16 @@ test -z "${LDCXX+set}" || LD=$LDCXX
10074CC=${CXX-"c++"} 10232CC=${CXX-"c++"}
10075compiler=$CC 10233compiler=$CC
10076compiler_CXX=$CC 10234compiler_CXX=$CC
10077cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` 10235for cc_temp in $compiler""; do
10236 case $cc_temp in
10237 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
10238 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
10239 \-*) ;;
10240 *) break;;
10241 esac
10242done
10243cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
10244
10078 10245
10079# We don't want -fno-exception wen compiling C++ code, so set the 10246# We don't want -fno-exception wen compiling C++ code, so set the
10080# no_builtin_flag separately 10247# no_builtin_flag separately
@@ -10145,7 +10312,7 @@ else
10145 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then 10312 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
10146 lt_cv_path_LD="$ac_dir/$ac_prog" 10313 lt_cv_path_LD="$ac_dir/$ac_prog"
10147 # Check to see if the program is GNU ld. I'd rather use --version, 10314 # Check to see if the program is GNU ld. I'd rather use --version,
10148 # but apparently some GNU ld's only accept -v. 10315 # but apparently some variants of GNU ld only accept -v.
10149 # Break only if it was the GNU/non-GNU ld that we prefer. 10316 # Break only if it was the GNU/non-GNU ld that we prefer.
10150 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in 10317 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
10151 *GNU* | *'with BFD'*) 10318 *GNU* | *'with BFD'*)
@@ -10179,7 +10346,7 @@ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
10179if test "${lt_cv_prog_gnu_ld+set}" = set; then 10346if test "${lt_cv_prog_gnu_ld+set}" = set; then
10180 echo $ECHO_N "(cached) $ECHO_C" >&6 10347 echo $ECHO_N "(cached) $ECHO_C" >&6
10181else 10348else
10182 # I'd rather use --version here, but apparently some GNU ld's only accept -v. 10349 # I'd rather use --version here, but apparently some GNU lds only accept -v.
10183case `$LD -v 2>&1 </dev/null` in 10350case `$LD -v 2>&1 </dev/null` in
10184*GNU* | *'with BFD'*) 10351*GNU* | *'with BFD'*)
10185 lt_cv_prog_gnu_ld=yes 10352 lt_cv_prog_gnu_ld=yes
@@ -10288,7 +10455,7 @@ case $host_os in
10288 link_all_deplibs_CXX=yes 10455 link_all_deplibs_CXX=yes
10289 10456
10290 if test "$GXX" = yes; then 10457 if test "$GXX" = yes; then
10291 case $host_os in aix4.012|aix4.012.*) 10458 case $host_os in aix4.[012]|aix4.[012].*)
10292 # We only want to do this on AIX 4.2 and lower, the check 10459 # We only want to do this on AIX 4.2 and lower, the check
10293 # below for broken collect2 doesn't work under 4.3+ 10460 # below for broken collect2 doesn't work under 4.3+
10294 collect2name=`${CC} -print-prog-name=collect2` 10461 collect2name=`${CC} -print-prog-name=collect2`
@@ -10309,6 +10476,9 @@ case $host_os in
10309 fi 10476 fi
10310 esac 10477 esac
10311 shared_flag='-shared' 10478 shared_flag='-shared'
10479 if test "$aix_use_runtimelinking" = yes; then
10480 shared_flag="$shared_flag "'${wl}-G'
10481 fi
10312 else 10482 else
10313 # not using gcc 10483 # not using gcc
10314 if test "$host_cpu" = ia64; then 10484 if test "$host_cpu" = ia64; then
@@ -10454,7 +10624,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10454 # Exported symbols can be pulled into shared objects from archives 10624 # Exported symbols can be pulled into shared objects from archives
10455 whole_archive_flag_spec_CXX=' ' 10625 whole_archive_flag_spec_CXX=' '
10456 archive_cmds_need_lc_CXX=yes 10626 archive_cmds_need_lc_CXX=yes
10457 # This is similar to how AIX traditionally builds it's shared libraries. 10627 # This is similar to how AIX traditionally builds its shared libraries.
10458 archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 10628 archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
10459 fi 10629 fi
10460 fi 10630 fi
@@ -10468,6 +10638,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10468 esac 10638 esac
10469 ;; 10639 ;;
10470 10640
10641
10471 cygwin* | mingw* | pw32*) 10642 cygwin* | mingw* | pw32*)
10472 # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 10643 # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
10473 # as there is no search path for DLLs. 10644 # as there is no search path for DLLs.
@@ -10491,65 +10662,76 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10491 ld_shlibs_CXX=no 10662 ld_shlibs_CXX=no
10492 fi 10663 fi
10493 ;; 10664 ;;
10665 darwin* | rhapsody*)
10666 case $host_os in
10667 rhapsody* | darwin1.[012])
10668 allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
10669 ;;
10670 *) # Darwin 1.3 on
10671 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
10672 allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
10673 else
10674 case ${MACOSX_DEPLOYMENT_TARGET} in
10675 10.[012])
10676 allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
10677 ;;
10678 10.*)
10679 allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
10680 ;;
10681 esac
10682 fi
10683 ;;
10684 esac
10685 archive_cmds_need_lc_CXX=no
10686 hardcode_direct_CXX=no
10687 hardcode_automatic_CXX=yes
10688 hardcode_shlibpath_var_CXX=unsupported
10689 whole_archive_flag_spec_CXX=''
10690 link_all_deplibs_CXX=yes
10494 10691
10495 darwin* | rhapsody*) 10692 if test "$GXX" = yes ; then
10496 if test "$GXX" = yes; then 10693 lt_int_apple_cc_single_mod=no
10497 archive_cmds_need_lc_CXX=no 10694 output_verbose_link_cmd='echo'
10498 case "$host_os" in 10695 if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
10499 rhapsody* | darwin1.[012]) 10696 lt_int_apple_cc_single_mod=yes
10500 allow_undefined_flag_CXX='-undefined suppress' 10697 fi
10501 ;; 10698 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
10502 *) # Darwin 1.3 on 10699 archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
10503 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
10504 allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
10505 else 10700 else
10506 case ${MACOSX_DEPLOYMENT_TARGET} in 10701 archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
10507 10.[012]) 10702 fi
10508 allow_undefined_flag_CXX='-flat_namespace -undefined suppress' 10703 module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
10509 ;; 10704 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
10510 10.*) 10705 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
10511 allow_undefined_flag_CXX='-undefined dynamic_lookup' 10706 archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10512 ;; 10707 else
10513 esac 10708 archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10709 fi
10710 module_expsym_cmds_CXX='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}'
10711 else
10712 case $cc_basename in
10713 xlc*)
10714 output_verbose_link_cmd='echo'
10715 archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
10716 module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
10717 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
10718 archive_expsym_cmds_CXX='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}'
10719 module_expsym_cmds_CXX='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}'
10720 ;;
10721 *)
10722 ld_shlibs_CXX=no
10723 ;;
10724 esac
10514 fi 10725 fi
10515 ;; 10726 ;;
10516 esac
10517 lt_int_apple_cc_single_mod=no
10518 output_verbose_link_cmd='echo'
10519 if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
10520 lt_int_apple_cc_single_mod=yes
10521 fi
10522 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
10523 archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
10524 else
10525 archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
10526 fi
10527 module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
10528
10529 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
10530 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
10531 archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10532 else
10533 archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10534 fi
10535 module_expsym_cmds_CXX='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}'
10536 hardcode_direct_CXX=no
10537 hardcode_automatic_CXX=yes
10538 hardcode_shlibpath_var_CXX=unsupported
10539 whole_archive_flag_spec_CXX='-all_load $convenience'
10540 link_all_deplibs_CXX=yes
10541 else
10542 ld_shlibs_CXX=no
10543 fi
10544 ;;
10545 10727
10546 dgux*) 10728 dgux*)
10547 case $cc_basename in 10729 case $cc_basename in
10548 ec++) 10730 ec++*)
10549 # FIXME: insert proper C++ library support 10731 # FIXME: insert proper C++ library support
10550 ld_shlibs_CXX=no 10732 ld_shlibs_CXX=no
10551 ;; 10733 ;;
10552 ghcx) 10734 ghcx*)
10553 # Green Hills C++ Compiler 10735 # Green Hills C++ Compiler
10554 # FIXME: insert proper C++ library support 10736 # FIXME: insert proper C++ library support
10555 ld_shlibs_CXX=no 10737 ld_shlibs_CXX=no
@@ -10560,14 +10742,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10560 ;; 10742 ;;
10561 esac 10743 esac
10562 ;; 10744 ;;
10563 freebsd12*) 10745 freebsd[12]*)
10564 # C++ shared libraries reported to be fairly broken before switch to ELF 10746 # C++ shared libraries reported to be fairly broken before switch to ELF
10565 ld_shlibs_CXX=no 10747 ld_shlibs_CXX=no
10566 ;; 10748 ;;
10567 freebsd-elf*) 10749 freebsd-elf*)
10568 archive_cmds_need_lc_CXX=no 10750 archive_cmds_need_lc_CXX=no
10569 ;; 10751 ;;
10570 freebsd* | kfreebsd*-gnu) 10752 freebsd* | kfreebsd*-gnu | dragonfly*)
10571 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF 10753 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
10572 # conventions 10754 # conventions
10573 ld_shlibs_CXX=yes 10755 ld_shlibs_CXX=yes
@@ -10584,11 +10766,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10584 # location of the library. 10766 # location of the library.
10585 10767
10586 case $cc_basename in 10768 case $cc_basename in
10587 CC) 10769 CC*)
10588 # FIXME: insert proper C++ library support 10770 # FIXME: insert proper C++ library support
10589 ld_shlibs_CXX=no 10771 ld_shlibs_CXX=no
10590 ;; 10772 ;;
10591 aCC) 10773 aCC*)
10592 archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 10774 archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
10593 # Commands to make compiler produce verbose output that lists 10775 # Commands to make compiler produce verbose output that lists
10594 # what "hidden" libraries, object files and flags are used when 10776 # what "hidden" libraries, object files and flags are used when
@@ -10598,7 +10780,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10598 # explicitly linking system object files so we need to strip them 10780 # explicitly linking system object files so we need to strip them
10599 # from the output so that they don't get included in the library 10781 # from the output so that they don't get included in the library
10600 # dependencies. 10782 # dependencies.
10601 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' 10783 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
10602 ;; 10784 ;;
10603 *) 10785 *)
10604 if test "$GXX" = yes; then 10786 if test "$GXX" = yes; then
@@ -10612,7 +10794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10612 ;; 10794 ;;
10613 hpux10*|hpux11*) 10795 hpux10*|hpux11*)
10614 if test $with_gnu_ld = no; then 10796 if test $with_gnu_ld = no; then
10615 case "$host_cpu" in 10797 case $host_cpu in
10616 hppa*64*) 10798 hppa*64*)
10617 hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' 10799 hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
10618 hardcode_libdir_flag_spec_ld_CXX='+b $libdir' 10800 hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
@@ -10628,7 +10810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10628 ;; 10810 ;;
10629 esac 10811 esac
10630 fi 10812 fi
10631 case "$host_cpu" in 10813 case $host_cpu in
10632 hppa*64*) 10814 hppa*64*)
10633 hardcode_direct_CXX=no 10815 hardcode_direct_CXX=no
10634 hardcode_shlibpath_var_CXX=no 10816 hardcode_shlibpath_var_CXX=no
@@ -10649,12 +10831,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10649 esac 10831 esac
10650 10832
10651 case $cc_basename in 10833 case $cc_basename in
10652 CC) 10834 CC*)
10653 # FIXME: insert proper C++ library support 10835 # FIXME: insert proper C++ library support
10654 ld_shlibs_CXX=no 10836 ld_shlibs_CXX=no
10655 ;; 10837 ;;
10656 aCC) 10838 aCC*)
10657 case "$host_cpu" in 10839 case $host_cpu in
10658 hppa*64*|ia64*) 10840 hppa*64*|ia64*)
10659 archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' 10841 archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
10660 ;; 10842 ;;
@@ -10675,7 +10857,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10675 *) 10857 *)
10676 if test "$GXX" = yes; then 10858 if test "$GXX" = yes; then
10677 if test $with_gnu_ld = no; then 10859 if test $with_gnu_ld = no; then
10678 case "$host_cpu" in 10860 case $host_cpu in
10679 ia64*|hppa*64*) 10861 ia64*|hppa*64*)
10680 archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' 10862 archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
10681 ;; 10863 ;;
@@ -10693,9 +10875,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10693 ;; 10875 ;;
10694 irix5* | irix6*) 10876 irix5* | irix6*)
10695 case $cc_basename in 10877 case $cc_basename in
10696 CC) 10878 CC*)
10697 # SGI C++ 10879 # SGI C++
10698 archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' 10880 archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
10699 10881
10700 # Archives containing C++ object files must be created using 10882 # Archives containing C++ object files must be created using
10701 # "CC -ar", where "CC" is the IRIX C++ compiler. This is 10883 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -10706,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10706 *) 10888 *)
10707 if test "$GXX" = yes; then 10889 if test "$GXX" = yes; then
10708 if test "$with_gnu_ld" = no; then 10890 if test "$with_gnu_ld" = no; then
10709 archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' 10891 archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10710 else 10892 else
10711 archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' 10893 archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
10712 fi 10894 fi
@@ -10719,7 +10901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10719 ;; 10901 ;;
10720 linux*) 10902 linux*)
10721 case $cc_basename in 10903 case $cc_basename in
10722 KCC) 10904 KCC*)
10723 # Kuck and Associates, Inc. (KAI) C++ Compiler 10905 # Kuck and Associates, Inc. (KAI) C++ Compiler
10724 10906
10725 # KCC will only create a shared library if the output file 10907 # KCC will only create a shared library if the output file
@@ -10744,17 +10926,41 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10744 # "CC -Bstatic", where "CC" is the KAI C++ compiler. 10926 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
10745 old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' 10927 old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
10746 ;; 10928 ;;
10747 icpc) 10929 icpc*)
10748 # Intel C++ 10930 # Intel C++
10749 with_gnu_ld=yes 10931 with_gnu_ld=yes
10932 # version 8.0 and above of icpc choke on multiply defined symbols
10933 # if we add $predep_objects and $postdep_objects, however 7.1 and
10934 # earlier do not add the objects themselves.
10935 case `$CC -V 2>&1` in
10936 *"Version 7."*)
10937 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
10938 archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10939 ;;
10940 *) # Version 8.0 or newer
10941 tmp_idyn=
10942 case $host_cpu in
10943 ia64*) tmp_idyn=' -i_dynamic';;
10944 esac
10945 archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10946 archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10947 ;;
10948 esac
10750 archive_cmds_need_lc_CXX=no 10949 archive_cmds_need_lc_CXX=no
10751 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
10752 archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10753 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' 10950 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
10754 export_dynamic_flag_spec_CXX='${wl}--export-dynamic' 10951 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
10755 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' 10952 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
10756 ;; 10953 ;;
10757 cxx) 10954 pgCC*)
10955 # Portland Group C++ compiler
10956 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
10957 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
10958
10959 hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
10960 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
10961 whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
10962 ;;
10963 cxx*)
10758 # Compaq C++ 10964 # Compaq C++
10759 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' 10965 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
10760 archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' 10966 archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -10785,7 +10991,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10785 ;; 10991 ;;
10786 mvs*) 10992 mvs*)
10787 case $cc_basename in 10993 case $cc_basename in
10788 cxx) 10994 cxx*)
10789 # FIXME: insert proper C++ library support 10995 # FIXME: insert proper C++ library support
10790 ld_shlibs_CXX=no 10996 ld_shlibs_CXX=no
10791 ;; 10997 ;;
@@ -10806,9 +11012,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10806 # Workaround some broken pre-1.5 toolchains 11012 # Workaround some broken pre-1.5 toolchains
10807 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' 11013 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
10808 ;; 11014 ;;
11015 openbsd2*)
11016 # C++ shared libraries are fairly broken
11017 ld_shlibs_CXX=no
11018 ;;
11019 openbsd*)
11020 hardcode_direct_CXX=yes
11021 hardcode_shlibpath_var_CXX=no
11022 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
11023 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
11024 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
11025 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
11026 export_dynamic_flag_spec_CXX='${wl}-E'
11027 whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
11028 fi
11029 output_verbose_link_cmd='echo'
11030 ;;
10809 osf3*) 11031 osf3*)
10810 case $cc_basename in 11032 case $cc_basename in
10811 KCC) 11033 KCC*)
10812 # Kuck and Associates, Inc. (KAI) C++ Compiler 11034 # Kuck and Associates, Inc. (KAI) C++ Compiler
10813 11035
10814 # KCC will only create a shared library if the output file 11036 # KCC will only create a shared library if the output file
@@ -10824,14 +11046,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10824 old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' 11046 old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
10825 11047
10826 ;; 11048 ;;
10827 RCC) 11049 RCC*)
10828 # Rational C++ 2.4.1 11050 # Rational C++ 2.4.1
10829 # FIXME: insert proper C++ library support 11051 # FIXME: insert proper C++ library support
10830 ld_shlibs_CXX=no 11052 ld_shlibs_CXX=no
10831 ;; 11053 ;;
10832 cxx) 11054 cxx*)
10833 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' 11055 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
10834 archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' 11056 archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
10835 11057
10836 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' 11058 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
10837 hardcode_libdir_separator_CXX=: 11059 hardcode_libdir_separator_CXX=:
@@ -10849,7 +11071,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10849 *) 11071 *)
10850 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 11072 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
10851 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' 11073 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
10852 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' 11074 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10853 11075
10854 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' 11076 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
10855 hardcode_libdir_separator_CXX=: 11077 hardcode_libdir_separator_CXX=:
@@ -10868,7 +11090,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10868 ;; 11090 ;;
10869 osf4* | osf5*) 11091 osf4* | osf5*)
10870 case $cc_basename in 11092 case $cc_basename in
10871 KCC) 11093 KCC*)
10872 # Kuck and Associates, Inc. (KAI) C++ Compiler 11094 # Kuck and Associates, Inc. (KAI) C++ Compiler
10873 11095
10874 # KCC will only create a shared library if the output file 11096 # KCC will only create a shared library if the output file
@@ -10883,17 +11105,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10883 # the KAI C++ compiler. 11105 # the KAI C++ compiler.
10884 old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' 11106 old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
10885 ;; 11107 ;;
10886 RCC) 11108 RCC*)
10887 # Rational C++ 2.4.1 11109 # Rational C++ 2.4.1
10888 # FIXME: insert proper C++ library support 11110 # FIXME: insert proper C++ library support
10889 ld_shlibs_CXX=no 11111 ld_shlibs_CXX=no
10890 ;; 11112 ;;
10891 cxx) 11113 cxx*)
10892 allow_undefined_flag_CXX=' -expect_unresolved \*' 11114 allow_undefined_flag_CXX=' -expect_unresolved \*'
10893 archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' 11115 archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
10894 archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ 11116 archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
10895 echo "-hidden">> $lib.exp~ 11117 echo "-hidden">> $lib.exp~
10896 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ 11118 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
10897 $rm $lib.exp' 11119 $rm $lib.exp'
10898 11120
10899 hardcode_libdir_flag_spec_CXX='-rpath $libdir' 11121 hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -10912,7 +11134,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10912 *) 11134 *)
10913 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 11135 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
10914 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' 11136 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
10915 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' 11137 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10916 11138
10917 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' 11139 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
10918 hardcode_libdir_separator_CXX=: 11140 hardcode_libdir_separator_CXX=:
@@ -10936,7 +11158,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10936 sco*) 11158 sco*)
10937 archive_cmds_need_lc_CXX=no 11159 archive_cmds_need_lc_CXX=no
10938 case $cc_basename in 11160 case $cc_basename in
10939 CC) 11161 CC*)
10940 # FIXME: insert proper C++ library support 11162 # FIXME: insert proper C++ library support
10941 ld_shlibs_CXX=no 11163 ld_shlibs_CXX=no
10942 ;; 11164 ;;
@@ -10948,12 +11170,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10948 ;; 11170 ;;
10949 sunos4*) 11171 sunos4*)
10950 case $cc_basename in 11172 case $cc_basename in
10951 CC) 11173 CC*)
10952 # Sun C++ 4.x 11174 # Sun C++ 4.x
10953 # FIXME: insert proper C++ library support 11175 # FIXME: insert proper C++ library support
10954 ld_shlibs_CXX=no 11176 ld_shlibs_CXX=no
10955 ;; 11177 ;;
10956 lcc) 11178 lcc*)
10957 # Lucid 11179 # Lucid
10958 # FIXME: insert proper C++ library support 11180 # FIXME: insert proper C++ library support
10959 ld_shlibs_CXX=no 11181 ld_shlibs_CXX=no
@@ -10966,36 +11188,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10966 ;; 11188 ;;
10967 solaris*) 11189 solaris*)
10968 case $cc_basename in 11190 case $cc_basename in
10969 CC) 11191 CC*)
10970 # Sun C++ 4.2, 5.x and Centerline C++ 11192 # Sun C++ 4.2, 5.x and Centerline C++
11193 archive_cmds_need_lc_CXX=yes
10971 no_undefined_flag_CXX=' -zdefs' 11194 no_undefined_flag_CXX=' -zdefs'
10972 archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 11195 archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
10973 archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 11196 archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
10974 $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' 11197 $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
10975 11198
10976 hardcode_libdir_flag_spec_CXX='-R$libdir' 11199 hardcode_libdir_flag_spec_CXX='-R$libdir'
10977 hardcode_shlibpath_var_CXX=no 11200 hardcode_shlibpath_var_CXX=no
10978 case $host_os in 11201 case $host_os in
10979 solaris2.0-5 | solaris2.0-5.*) ;; 11202 solaris2.[0-5] | solaris2.[0-5].*) ;;
10980 *) 11203 *)
10981 # The C++ compiler is used as linker so we must use $wl 11204 # The C++ compiler is used as linker so we must use $wl
10982 # flag to pass the commands to the underlying system 11205 # flag to pass the commands to the underlying system
10983 # linker. 11206 # linker. We must also pass each convience library through
11207 # to the system linker between allextract/defaultextract.
11208 # The C++ compiler will combine linker options so we
11209 # cannot just pass the convience library names through
11210 # without $wl.
10984 # Supported since Solaris 2.6 (maybe 2.5.1?) 11211 # Supported since Solaris 2.6 (maybe 2.5.1?)
10985 whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' 11212 whole_archive_flag_spec_CXX='${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'
10986 ;; 11213 ;;
10987 esac 11214 esac
10988 link_all_deplibs_CXX=yes 11215 link_all_deplibs_CXX=yes
10989 11216
10990 # Commands to make compiler produce verbose output that lists 11217 output_verbose_link_cmd='echo'
10991 # what "hidden" libraries, object files and flags are used when
10992 # linking a shared library.
10993 #
10994 # There doesn't appear to be a way to prevent this compiler from
10995 # explicitly linking system object files so we need to strip them
10996 # from the output so that they don't get included in the library
10997 # dependencies.
10998 output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
10999 11218
11000 # Archives containing C++ object files must be created using 11219 # Archives containing C++ object files must be created using
11001 # "CC -xar", where "CC" is the Sun C++ compiler. This is 11220 # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -11003,7 +11222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11003 # in the archive. 11222 # in the archive.
11004 old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' 11223 old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
11005 ;; 11224 ;;
11006 gcx) 11225 gcx*)
11007 # Green Hills C++ Compiler 11226 # Green Hills C++ Compiler
11008 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 11227 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11009 11228
@@ -11046,7 +11265,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11046 ;; 11265 ;;
11047 tandem*) 11266 tandem*)
11048 case $cc_basename in 11267 case $cc_basename in
11049 NCC) 11268 NCC*)
11050 # NonStop-UX NCC 3.20 11269 # NonStop-UX NCC 3.20
11051 # FIXME: insert proper C++ library support 11270 # FIXME: insert proper C++ library support
11052 ld_shlibs_CXX=no 11271 ld_shlibs_CXX=no
@@ -11099,7 +11318,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11099 # The `*' in the case matches for architectures that use `case' in 11318 # The `*' in the case matches for architectures that use `case' in
11100 # $output_verbose_cmd can trigger glob expansion during the loop 11319 # $output_verbose_cmd can trigger glob expansion during the loop
11101 # eval without this substitution. 11320 # eval without this substitution.
11102 output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" 11321 output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
11103 11322
11104 for p in `eval $output_verbose_link_cmd`; do 11323 for p in `eval $output_verbose_link_cmd`; do
11105 case $p in 11324 case $p in
@@ -11175,6 +11394,20 @@ fi
11175 11394
11176$rm -f confest.$objext 11395$rm -f confest.$objext
11177 11396
11397# PORTME: override above test on systems where it is broken
11398case $host_os in
11399solaris*)
11400 case $cc_basename in
11401 CC*)
11402 # Adding this requires a known-good setup of shared libraries for
11403 # Sun compiler versions before 5.6, else PIC objects from an old
11404 # archive will be linked into the output, leading to subtle bugs.
11405 postdeps_CXX='-lCstd -lCrun'
11406 ;;
11407 esac
11408esac
11409
11410
11178case " $postdeps_CXX " in 11411case " $postdeps_CXX " in
11179*" -lc "*) archive_cmds_need_lc_CXX=no ;; 11412*" -lc "*) archive_cmds_need_lc_CXX=no ;;
11180esac 11413esac
@@ -11230,7 +11463,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11230 hpux*) 11463 hpux*)
11231 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 11464 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
11232 # not for PA HP-UX. 11465 # not for PA HP-UX.
11233 case "$host_cpu" in 11466 case $host_cpu in
11234 hppa*64*|ia64*) 11467 hppa*64*|ia64*)
11235 ;; 11468 ;;
11236 *) 11469 *)
@@ -11255,18 +11488,28 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11255 ;; 11488 ;;
11256 chorus*) 11489 chorus*)
11257 case $cc_basename in 11490 case $cc_basename in
11258 cxch68) 11491 cxch68*)
11259 # Green Hills C++ Compiler 11492 # Green Hills C++ Compiler
11260 # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" 11493 # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
11261 ;; 11494 ;;
11262 esac 11495 esac
11263 ;; 11496 ;;
11497 darwin*)
11498 # PIC is the default on this platform
11499 # Common symbols not allowed in MH_DYLIB files
11500 case $cc_basename in
11501 xlc*)
11502 lt_prog_compiler_pic_CXX='-qnocommon'
11503 lt_prog_compiler_wl_CXX='-Wl,'
11504 ;;
11505 esac
11506 ;;
11264 dgux*) 11507 dgux*)
11265 case $cc_basename in 11508 case $cc_basename in
11266 ec++) 11509 ec++*)
11267 lt_prog_compiler_pic_CXX='-KPIC' 11510 lt_prog_compiler_pic_CXX='-KPIC'
11268 ;; 11511 ;;
11269 ghcx) 11512 ghcx*)
11270 # Green Hills C++ Compiler 11513 # Green Hills C++ Compiler
11271 lt_prog_compiler_pic_CXX='-pic' 11514 lt_prog_compiler_pic_CXX='-pic'
11272 ;; 11515 ;;
@@ -11274,22 +11517,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11274 ;; 11517 ;;
11275 esac 11518 esac
11276 ;; 11519 ;;
11277 freebsd* | kfreebsd*-gnu) 11520 freebsd* | kfreebsd*-gnu | dragonfly*)
11278 # FreeBSD uses GNU C++ 11521 # FreeBSD uses GNU C++
11279 ;; 11522 ;;
11280 hpux9* | hpux10* | hpux11*) 11523 hpux9* | hpux10* | hpux11*)
11281 case $cc_basename in 11524 case $cc_basename in
11282 CC) 11525 CC*)
11283 lt_prog_compiler_wl_CXX='-Wl,' 11526 lt_prog_compiler_wl_CXX='-Wl,'
11284 lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" 11527 lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
11285 if test "$host_cpu" != ia64; then 11528 if test "$host_cpu" != ia64; then
11286 lt_prog_compiler_pic_CXX='+Z' 11529 lt_prog_compiler_pic_CXX='+Z'
11287 fi 11530 fi
11288 ;; 11531 ;;
11289 aCC) 11532 aCC*)
11290 lt_prog_compiler_wl_CXX='-Wl,' 11533 lt_prog_compiler_wl_CXX='-Wl,'
11291 lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" 11534 lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
11292 case "$host_cpu" in 11535 case $host_cpu in
11293 hppa*64*|ia64*) 11536 hppa*64*|ia64*)
11294 # +Z the default 11537 # +Z the default
11295 ;; 11538 ;;
@@ -11304,7 +11547,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11304 ;; 11547 ;;
11305 irix5* | irix6* | nonstopux*) 11548 irix5* | irix6* | nonstopux*)
11306 case $cc_basename in 11549 case $cc_basename in
11307 CC) 11550 CC*)
11308 lt_prog_compiler_wl_CXX='-Wl,' 11551 lt_prog_compiler_wl_CXX='-Wl,'
11309 lt_prog_compiler_static_CXX='-non_shared' 11552 lt_prog_compiler_static_CXX='-non_shared'
11310 # CC pic flag -KPIC is the default. 11553 # CC pic flag -KPIC is the default.
@@ -11315,18 +11558,24 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11315 ;; 11558 ;;
11316 linux*) 11559 linux*)
11317 case $cc_basename in 11560 case $cc_basename in
11318 KCC) 11561 KCC*)
11319 # KAI C++ Compiler 11562 # KAI C++ Compiler
11320 lt_prog_compiler_wl_CXX='--backend -Wl,' 11563 lt_prog_compiler_wl_CXX='--backend -Wl,'
11321 lt_prog_compiler_pic_CXX='-fPIC' 11564 lt_prog_compiler_pic_CXX='-fPIC'
11322 ;; 11565 ;;
11323 icpc) 11566 icpc* | ecpc*)
11324 # Intel C++ 11567 # Intel C++
11325 lt_prog_compiler_wl_CXX='-Wl,' 11568 lt_prog_compiler_wl_CXX='-Wl,'
11326 lt_prog_compiler_pic_CXX='-KPIC' 11569 lt_prog_compiler_pic_CXX='-KPIC'
11327 lt_prog_compiler_static_CXX='-static' 11570 lt_prog_compiler_static_CXX='-static'
11328 ;; 11571 ;;
11329 cxx) 11572 pgCC*)
11573 # Portland Group C++ compiler.
11574 lt_prog_compiler_wl_CXX='-Wl,'
11575 lt_prog_compiler_pic_CXX='-fpic'
11576 lt_prog_compiler_static_CXX='-Bstatic'
11577 ;;
11578 cxx*)
11330 # Compaq C++ 11579 # Compaq C++
11331 # Make sure the PIC flag is empty. It appears that all Alpha 11580 # Make sure the PIC flag is empty. It appears that all Alpha
11332 # Linux and Compaq Tru64 Unix objects are PIC. 11581 # Linux and Compaq Tru64 Unix objects are PIC.
@@ -11343,7 +11592,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11343 ;; 11592 ;;
11344 mvs*) 11593 mvs*)
11345 case $cc_basename in 11594 case $cc_basename in
11346 cxx) 11595 cxx*)
11347 lt_prog_compiler_pic_CXX='-W c,exportall' 11596 lt_prog_compiler_pic_CXX='-W c,exportall'
11348 ;; 11597 ;;
11349 *) 11598 *)
@@ -11354,14 +11603,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11354 ;; 11603 ;;
11355 osf3* | osf4* | osf5*) 11604 osf3* | osf4* | osf5*)
11356 case $cc_basename in 11605 case $cc_basename in
11357 KCC) 11606 KCC*)
11358 lt_prog_compiler_wl_CXX='--backend -Wl,' 11607 lt_prog_compiler_wl_CXX='--backend -Wl,'
11359 ;; 11608 ;;
11360 RCC) 11609 RCC*)
11361 # Rational C++ 2.4.1 11610 # Rational C++ 2.4.1
11362 lt_prog_compiler_pic_CXX='-pic' 11611 lt_prog_compiler_pic_CXX='-pic'
11363 ;; 11612 ;;
11364 cxx) 11613 cxx*)
11365 # Digital/Compaq C++ 11614 # Digital/Compaq C++
11366 lt_prog_compiler_wl_CXX='-Wl,' 11615 lt_prog_compiler_wl_CXX='-Wl,'
11367 # Make sure the PIC flag is empty. It appears that all Alpha 11616 # Make sure the PIC flag is empty. It appears that all Alpha
@@ -11377,7 +11626,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11377 ;; 11626 ;;
11378 sco*) 11627 sco*)
11379 case $cc_basename in 11628 case $cc_basename in
11380 CC) 11629 CC*)
11381 lt_prog_compiler_pic_CXX='-fPIC' 11630 lt_prog_compiler_pic_CXX='-fPIC'
11382 ;; 11631 ;;
11383 *) 11632 *)
@@ -11386,13 +11635,13 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11386 ;; 11635 ;;
11387 solaris*) 11636 solaris*)
11388 case $cc_basename in 11637 case $cc_basename in
11389 CC) 11638 CC*)
11390 # Sun C++ 4.2, 5.x and Centerline C++ 11639 # Sun C++ 4.2, 5.x and Centerline C++
11391 lt_prog_compiler_pic_CXX='-KPIC' 11640 lt_prog_compiler_pic_CXX='-KPIC'
11392 lt_prog_compiler_static_CXX='-Bstatic' 11641 lt_prog_compiler_static_CXX='-Bstatic'
11393 lt_prog_compiler_wl_CXX='-Qoption ld ' 11642 lt_prog_compiler_wl_CXX='-Qoption ld '
11394 ;; 11643 ;;
11395 gcx) 11644 gcx*)
11396 # Green Hills C++ Compiler 11645 # Green Hills C++ Compiler
11397 lt_prog_compiler_pic_CXX='-PIC' 11646 lt_prog_compiler_pic_CXX='-PIC'
11398 ;; 11647 ;;
@@ -11402,12 +11651,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11402 ;; 11651 ;;
11403 sunos4*) 11652 sunos4*)
11404 case $cc_basename in 11653 case $cc_basename in
11405 CC) 11654 CC*)
11406 # Sun C++ 4.x 11655 # Sun C++ 4.x
11407 lt_prog_compiler_pic_CXX='-pic' 11656 lt_prog_compiler_pic_CXX='-pic'
11408 lt_prog_compiler_static_CXX='-Bstatic' 11657 lt_prog_compiler_static_CXX='-Bstatic'
11409 ;; 11658 ;;
11410 lcc) 11659 lcc*)
11411 # Lucid 11660 # Lucid
11412 lt_prog_compiler_pic_CXX='-pic' 11661 lt_prog_compiler_pic_CXX='-pic'
11413 ;; 11662 ;;
@@ -11417,7 +11666,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
11417 ;; 11666 ;;
11418 tandem*) 11667 tandem*)
11419 case $cc_basename in 11668 case $cc_basename in
11420 NCC) 11669 NCC*)
11421 # NonStop-UX NCC 3.20 11670 # NonStop-UX NCC 3.20
11422 lt_prog_compiler_pic_CXX='-KPIC' 11671 lt_prog_compiler_pic_CXX='-KPIC'
11423 ;; 11672 ;;
@@ -11458,18 +11707,20 @@ else
11458 # with a dollar sign (not a hyphen), so the echo should work correctly. 11707 # with a dollar sign (not a hyphen), so the echo should work correctly.
11459 # The option is referenced via a variable to avoid confusing sed. 11708 # The option is referenced via a variable to avoid confusing sed.
11460 lt_compile=`echo "$ac_compile" | $SED \ 11709 lt_compile=`echo "$ac_compile" | $SED \
11461 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 11710 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11462 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 11711 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11463 -e 's:$: $lt_compiler_flag:'` 11712 -e 's:$: $lt_compiler_flag:'`
11464 (eval echo "\"\$as_me:11464: $lt_compile\"" >&5) 11713 (eval echo "\"\$as_me:11713: $lt_compile\"" >&5)
11465 (eval "$lt_compile" 2>conftest.err) 11714 (eval "$lt_compile" 2>conftest.err)
11466 ac_status=$? 11715 ac_status=$?
11467 cat conftest.err >&5 11716 cat conftest.err >&5
11468 echo "$as_me:11468: \$? = $ac_status" >&5 11717 echo "$as_me:11717: \$? = $ac_status" >&5
11469 if (exit $ac_status) && test -s "$ac_outfile"; then 11718 if (exit $ac_status) && test -s "$ac_outfile"; then
11470 # The compiler can only warn and ignore the option if not recognized 11719 # The compiler can only warn and ignore the option if not recognized
11471 # So say no if there are warnings 11720 # So say no if there are warnings other than the usual output.
11472 if test ! -s conftest.err; then 11721 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
11722 $SED '/^$/d' conftest.err >conftest.er2
11723 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
11473 lt_prog_compiler_pic_works_CXX=yes 11724 lt_prog_compiler_pic_works_CXX=yes
11474 fi 11725 fi
11475 fi 11726 fi
@@ -11490,7 +11741,7 @@ else
11490fi 11741fi
11491 11742
11492fi 11743fi
11493case "$host_os" in 11744case $host_os in
11494 # For platforms which do not support PIC, -DPIC is meaningless: 11745 # For platforms which do not support PIC, -DPIC is meaningless:
11495 *djgpp*) 11746 *djgpp*)
11496 lt_prog_compiler_pic_CXX= 11747 lt_prog_compiler_pic_CXX=
@@ -11518,23 +11769,25 @@ else
11518 # Note that $ac_compile itself does not contain backslashes and begins 11769 # Note that $ac_compile itself does not contain backslashes and begins
11519 # with a dollar sign (not a hyphen), so the echo should work correctly. 11770 # with a dollar sign (not a hyphen), so the echo should work correctly.
11520 lt_compile=`echo "$ac_compile" | $SED \ 11771 lt_compile=`echo "$ac_compile" | $SED \
11521 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 11772 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11522 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 11773 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11523 -e 's:$: $lt_compiler_flag:'` 11774 -e 's:$: $lt_compiler_flag:'`
11524 (eval echo "\"\$as_me:11524: $lt_compile\"" >&5) 11775 (eval echo "\"\$as_me:11775: $lt_compile\"" >&5)
11525 (eval "$lt_compile" 2>out/conftest.err) 11776 (eval "$lt_compile" 2>out/conftest.err)
11526 ac_status=$? 11777 ac_status=$?
11527 cat out/conftest.err >&5 11778 cat out/conftest.err >&5
11528 echo "$as_me:11528: \$? = $ac_status" >&5 11779 echo "$as_me:11779: \$? = $ac_status" >&5
11529 if (exit $ac_status) && test -s out/conftest2.$ac_objext 11780 if (exit $ac_status) && test -s out/conftest2.$ac_objext
11530 then 11781 then
11531 # The compiler can only warn and ignore the option if not recognized 11782 # The compiler can only warn and ignore the option if not recognized
11532 # So say no if there are warnings 11783 # So say no if there are warnings
11533 if test ! -s out/conftest.err; then 11784 $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
11785 $SED '/^$/d' out/conftest.err >out/conftest.er2
11786 if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
11534 lt_cv_prog_compiler_c_o_CXX=yes 11787 lt_cv_prog_compiler_c_o_CXX=yes
11535 fi 11788 fi
11536 fi 11789 fi
11537 chmod u+w . 11790 chmod u+w . 2>&5
11538 $rm conftest* 11791 $rm conftest*
11539 # SGI C++ compiler will create directory out/ii_files/ for 11792 # SGI C++ compiler will create directory out/ii_files/ for
11540 # template instantiation 11793 # template instantiation
@@ -11589,7 +11842,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
11589 export_symbols_cmds_CXX="$ltdll_cmds" 11842 export_symbols_cmds_CXX="$ltdll_cmds"
11590 ;; 11843 ;;
11591 cygwin* | mingw*) 11844 cygwin* | mingw*)
11592 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' 11845 export_symbols_cmds_CXX='$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'
11593 ;; 11846 ;;
11594 linux*) 11847 linux*)
11595 link_all_deplibs_CXX=no 11848 link_all_deplibs_CXX=no
@@ -11772,7 +12025,7 @@ beos*)
11772 shlibpath_var=LIBRARY_PATH 12025 shlibpath_var=LIBRARY_PATH
11773 ;; 12026 ;;
11774 12027
11775bsdi4*) 12028bsdi[45]*)
11776 version_type=linux 12029 version_type=linux
11777 need_version=no 12030 need_version=no
11778 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 12031 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11800,7 +12053,8 @@ cygwin* | mingw* | pw32*)
11800 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ 12053 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
11801 dldir=$destdir/`dirname \$dlpath`~ 12054 dldir=$destdir/`dirname \$dlpath`~
11802 test -d \$dldir || mkdir -p \$dldir~ 12055 test -d \$dldir || mkdir -p \$dldir~
11803 $install_prog $dir/$dlname \$dldir/$dlname' 12056 $install_prog $dir/$dlname \$dldir/$dlname~
12057 chmod a+x \$dldir/$dlname'
11804 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 12058 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
11805 dlpath=$dir/\$dldll~ 12059 dlpath=$dir/\$dldll~
11806 $rm \$dlpath' 12060 $rm \$dlpath'
@@ -11830,7 +12084,7 @@ cygwin* | mingw* | pw32*)
11830 ;; 12084 ;;
11831 pw32*) 12085 pw32*)
11832 # pw32 DLLs use 'pw' prefix rather than 'lib' 12086 # pw32 DLLs use 'pw' prefix rather than 'lib'
11833 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' 12087 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11834 ;; 12088 ;;
11835 esac 12089 esac
11836 ;; 12090 ;;
@@ -11853,7 +12107,7 @@ darwin* | rhapsody*)
11853 soname_spec='${libname}${release}${major}$shared_ext' 12107 soname_spec='${libname}${release}${major}$shared_ext'
11854 shlibpath_overrides_runpath=yes 12108 shlibpath_overrides_runpath=yes
11855 shlibpath_var=DYLD_LIBRARY_PATH 12109 shlibpath_var=DYLD_LIBRARY_PATH
11856 shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' 12110 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
11857 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 12111 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
11858 if test "$GCC" = yes; then 12112 if test "$GCC" = yes; then
11859 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"` 12113 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"`
@@ -11888,8 +12142,17 @@ kfreebsd*-gnu)
11888 dynamic_linker='GNU ld.so' 12142 dynamic_linker='GNU ld.so'
11889 ;; 12143 ;;
11890 12144
11891freebsd*) 12145freebsd* | dragonfly*)
11892 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 12146 # DragonFly does not have aout. When/if they implement a new
12147 # versioning mechanism, adjust this.
12148 if test -x /usr/bin/objformat; then
12149 objformat=`/usr/bin/objformat`
12150 else
12151 case $host_os in
12152 freebsd[123]*) objformat=aout ;;
12153 *) objformat=elf ;;
12154 esac
12155 fi
11893 version_type=freebsd-$objformat 12156 version_type=freebsd-$objformat
11894 case $version_type in 12157 case $version_type in
11895 freebsd-elf*) 12158 freebsd-elf*)
@@ -11907,7 +12170,7 @@ freebsd*)
11907 freebsd2*) 12170 freebsd2*)
11908 shlibpath_overrides_runpath=yes 12171 shlibpath_overrides_runpath=yes
11909 ;; 12172 ;;
11910 freebsd3.01* | freebsdelf3.01*) 12173 freebsd3.[01]* | freebsdelf3.[01]*)
11911 shlibpath_overrides_runpath=yes 12174 shlibpath_overrides_runpath=yes
11912 hardcode_into_libs=yes 12175 hardcode_into_libs=yes
11913 ;; 12176 ;;
@@ -11934,7 +12197,7 @@ hpux9* | hpux10* | hpux11*)
11934 version_type=sunos 12197 version_type=sunos
11935 need_lib_prefix=no 12198 need_lib_prefix=no
11936 need_version=no 12199 need_version=no
11937 case "$host_cpu" in 12200 case $host_cpu in
11938 ia64*) 12201 ia64*)
11939 shrext_cmds='.so' 12202 shrext_cmds='.so'
11940 hardcode_into_libs=yes 12203 hardcode_into_libs=yes
@@ -12033,7 +12296,7 @@ linux*)
12033 12296
12034 # Append ld.so.conf contents to the search path 12297 # Append ld.so.conf contents to the search path
12035 if test -f /etc/ld.so.conf; then 12298 if test -f /etc/ld.so.conf; then
12036 lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` 12299 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' ' '`
12037 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 12300 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
12038 fi 12301 fi
12039 12302
@@ -12108,7 +12371,11 @@ nto-qnx*)
12108openbsd*) 12371openbsd*)
12109 version_type=sunos 12372 version_type=sunos
12110 need_lib_prefix=no 12373 need_lib_prefix=no
12111 need_version=yes 12374 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
12375 case $host_os in
12376 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
12377 *) need_version=no ;;
12378 esac
12112 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 12379 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
12113 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 12380 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
12114 shlibpath_var=LD_LIBRARY_PATH 12381 shlibpath_var=LD_LIBRARY_PATH
@@ -12230,8 +12497,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
12230echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 12497echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
12231hardcode_action_CXX= 12498hardcode_action_CXX=
12232if test -n "$hardcode_libdir_flag_spec_CXX" || \ 12499if test -n "$hardcode_libdir_flag_spec_CXX" || \
12233 test -n "$runpath_var CXX" || \ 12500 test -n "$runpath_var_CXX" || \
12234 test "X$hardcode_automatic_CXX"="Xyes" ; then 12501 test "X$hardcode_automatic_CXX" = "Xyes" ; then
12235 12502
12236 # We can hardcode non-existant directories. 12503 # We can hardcode non-existant directories.
12237 if test "$hardcode_direct_CXX" != no && 12504 if test "$hardcode_direct_CXX" != no &&
@@ -12890,7 +13157,7 @@ else
12890 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 13157 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12891 lt_status=$lt_dlunknown 13158 lt_status=$lt_dlunknown
12892 cat > conftest.$ac_ext <<EOF 13159 cat > conftest.$ac_ext <<EOF
12893#line 12893 "configure" 13160#line 13160 "configure"
12894#include "confdefs.h" 13161#include "confdefs.h"
12895 13162
12896#if HAVE_DLFCN_H 13163#if HAVE_DLFCN_H
@@ -12956,7 +13223,7 @@ EOF
12956 ac_status=$? 13223 ac_status=$?
12957 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13224 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12958 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 13225 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
12959 (./conftest; exit; ) 2>/dev/null 13226 (./conftest; exit; ) >&5 2>/dev/null
12960 lt_status=$? 13227 lt_status=$?
12961 case x$lt_status in 13228 case x$lt_status in
12962 x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; 13229 x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -12988,7 +13255,7 @@ else
12988 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 13255 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12989 lt_status=$lt_dlunknown 13256 lt_status=$lt_dlunknown
12990 cat > conftest.$ac_ext <<EOF 13257 cat > conftest.$ac_ext <<EOF
12991#line 12991 "configure" 13258#line 13258 "configure"
12992#include "confdefs.h" 13259#include "confdefs.h"
12993 13260
12994#if HAVE_DLFCN_H 13261#if HAVE_DLFCN_H
@@ -13054,7 +13321,7 @@ EOF
13054 ac_status=$? 13321 ac_status=$?
13055 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13322 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13056 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 13323 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
13057 (./conftest; exit; ) 2>/dev/null 13324 (./conftest; exit; ) >&5 2>/dev/null
13058 lt_status=$? 13325 lt_status=$?
13059 case x$lt_status in 13326 case x$lt_status in
13060 x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; 13327 x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -13206,6 +13473,12 @@ fast_install=$enable_fast_install
13206# The host system. 13473# The host system.
13207host_alias=$host_alias 13474host_alias=$host_alias
13208host=$host 13475host=$host
13476host_os=$host_os
13477
13478# The build system.
13479build_alias=$build_alias
13480build=$build
13481build_os=$build_os
13209 13482
13210# An echo program that does not interpret backslashes. 13483# An echo program that does not interpret backslashes.
13211echo=$lt_echo 13484echo=$lt_echo
@@ -13282,7 +13555,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
13282# Does compiler simultaneously support -c and -o options? 13555# Does compiler simultaneously support -c and -o options?
13283compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX 13556compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
13284 13557
13285# Must we lock files when doing compilation ? 13558# Must we lock files when doing compilation?
13286need_locks=$lt_need_locks 13559need_locks=$lt_need_locks
13287 13560
13288# Do we need the lib prefix for modules? 13561# Do we need the lib prefix for modules?
@@ -13563,12 +13836,35 @@ LTCC=${LTCC-"$CC"}
13563compiler=$CC 13836compiler=$CC
13564 13837
13565 13838
13839# save warnings/boilerplate of simple test code
13840ac_outfile=conftest.$ac_objext
13841printf "$lt_simple_compile_test_code" >conftest.$ac_ext
13842eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
13843_lt_compiler_boilerplate=`cat conftest.err`
13844$rm conftest*
13845
13846ac_outfile=conftest.$ac_objext
13847printf "$lt_simple_link_test_code" >conftest.$ac_ext
13848eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
13849_lt_linker_boilerplate=`cat conftest.err`
13850$rm conftest*
13851
13852
13566# Allow CC to be a program name with arguments. 13853# Allow CC to be a program name with arguments.
13567lt_save_CC="$CC" 13854lt_save_CC="$CC"
13568CC=${F77-"f77"} 13855CC=${F77-"f77"}
13569compiler=$CC 13856compiler=$CC
13570compiler_F77=$CC 13857compiler_F77=$CC
13571cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` 13858for cc_temp in $compiler""; do
13859 case $cc_temp in
13860 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
13861 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
13862 \-*) ;;
13863 *) break;;
13864 esac
13865done
13866cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
13867
13572 13868
13573echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 13869echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
13574echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 13870echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
@@ -13581,7 +13877,7 @@ test "$can_build_shared" = "no" && enable_shared=no
13581 13877
13582# On AIX, shared libraries and static libraries use the same namespace, and 13878# On AIX, shared libraries and static libraries use the same namespace, and
13583# are all built from PIC. 13879# are all built from PIC.
13584case "$host_os" in 13880case $host_os in
13585aix3*) 13881aix3*)
13586 test "$enable_shared" = yes && enable_static=no 13882 test "$enable_shared" = yes && enable_static=no
13587 if test -n "$RANLIB"; then 13883 if test -n "$RANLIB"; then
@@ -13590,7 +13886,9 @@ aix3*)
13590 fi 13886 fi
13591 ;; 13887 ;;
13592aix4* | aix5*) 13888aix4* | aix5*)
13593 test "$enable_shared" = yes && enable_static=no 13889 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
13890 test "$enable_shared" = yes && enable_static=no
13891 fi
13594 ;; 13892 ;;
13595esac 13893esac
13596echo "$as_me:$LINENO: result: $enable_shared" >&5 13894echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -13667,7 +13965,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
13667 hpux*) 13965 hpux*)
13668 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 13966 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
13669 # not for PA HP-UX. 13967 # not for PA HP-UX.
13670 case "$host_cpu" in 13968 case $host_cpu in
13671 hppa*64*|ia64*) 13969 hppa*64*|ia64*)
13672 # +Z the default 13970 # +Z the default
13673 ;; 13971 ;;
@@ -13693,6 +13991,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
13693 lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' 13991 lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
13694 fi 13992 fi
13695 ;; 13993 ;;
13994 darwin*)
13995 # PIC is the default on this platform
13996 # Common symbols not allowed in MH_DYLIB files
13997 case $cc_basename in
13998 xlc*)
13999 lt_prog_compiler_pic_F77='-qnocommon'
14000 lt_prog_compiler_wl_F77='-Wl,'
14001 ;;
14002 esac
14003 ;;
13696 14004
13697 mingw* | pw32* | os2*) 14005 mingw* | pw32* | os2*)
13698 # This hack is so that the source file can tell whether it is being 14006 # This hack is so that the source file can tell whether it is being
@@ -13704,7 +14012,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
13704 lt_prog_compiler_wl_F77='-Wl,' 14012 lt_prog_compiler_wl_F77='-Wl,'
13705 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 14013 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
13706 # not for PA HP-UX. 14014 # not for PA HP-UX.
13707 case "$host_cpu" in 14015 case $host_cpu in
13708 hppa*64*|ia64*) 14016 hppa*64*|ia64*)
13709 # +Z the default 14017 # +Z the default
13710 ;; 14018 ;;
@@ -13728,12 +14036,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
13728 ;; 14036 ;;
13729 14037
13730 linux*) 14038 linux*)
13731 case $CC in 14039 case $cc_basename in
13732 icc* | ecc*) 14040 icc* | ecc*)
13733 lt_prog_compiler_wl_F77='-Wl,' 14041 lt_prog_compiler_wl_F77='-Wl,'
13734 lt_prog_compiler_pic_F77='-KPIC' 14042 lt_prog_compiler_pic_F77='-KPIC'
13735 lt_prog_compiler_static_F77='-static' 14043 lt_prog_compiler_static_F77='-static'
13736 ;; 14044 ;;
14045 pgcc* | pgf77* | pgf90* | pgf95*)
14046 # Portland Group compilers (*not* the Pentium gcc compiler,
14047 # which looks to be a dead project)
14048 lt_prog_compiler_wl_F77='-Wl,'
14049 lt_prog_compiler_pic_F77='-fpic'
14050 lt_prog_compiler_static_F77='-Bstatic'
14051 ;;
13737 ccc*) 14052 ccc*)
13738 lt_prog_compiler_wl_F77='-Wl,' 14053 lt_prog_compiler_wl_F77='-Wl,'
13739 # All Alpha code is PIC. 14054 # All Alpha code is PIC.
@@ -13754,9 +14069,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
13754 ;; 14069 ;;
13755 14070
13756 solaris*) 14071 solaris*)
13757 lt_prog_compiler_wl_F77='-Wl,'
13758 lt_prog_compiler_pic_F77='-KPIC' 14072 lt_prog_compiler_pic_F77='-KPIC'
13759 lt_prog_compiler_static_F77='-Bstatic' 14073 lt_prog_compiler_static_F77='-Bstatic'
14074 case $cc_basename in
14075 f77* | f90* | f95*)
14076 lt_prog_compiler_wl_F77='-Qoption ld ';;
14077 *)
14078 lt_prog_compiler_wl_F77='-Wl,';;
14079 esac
13760 ;; 14080 ;;
13761 14081
13762 sunos4*) 14082 sunos4*)
@@ -13778,6 +14098,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
13778 fi 14098 fi
13779 ;; 14099 ;;
13780 14100
14101 unicos*)
14102 lt_prog_compiler_wl_F77='-Wl,'
14103 lt_prog_compiler_can_build_shared_F77=no
14104 ;;
14105
13781 uts4*) 14106 uts4*)
13782 lt_prog_compiler_pic_F77='-pic' 14107 lt_prog_compiler_pic_F77='-pic'
13783 lt_prog_compiler_static_F77='-Bstatic' 14108 lt_prog_compiler_static_F77='-Bstatic'
@@ -13812,18 +14137,20 @@ else
13812 # with a dollar sign (not a hyphen), so the echo should work correctly. 14137 # with a dollar sign (not a hyphen), so the echo should work correctly.
13813 # The option is referenced via a variable to avoid confusing sed. 14138 # The option is referenced via a variable to avoid confusing sed.
13814 lt_compile=`echo "$ac_compile" | $SED \ 14139 lt_compile=`echo "$ac_compile" | $SED \
13815 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 14140 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
13816 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14141 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13817 -e 's:$: $lt_compiler_flag:'` 14142 -e 's:$: $lt_compiler_flag:'`
13818 (eval echo "\"\$as_me:13818: $lt_compile\"" >&5) 14143 (eval echo "\"\$as_me:14143: $lt_compile\"" >&5)
13819 (eval "$lt_compile" 2>conftest.err) 14144 (eval "$lt_compile" 2>conftest.err)
13820 ac_status=$? 14145 ac_status=$?
13821 cat conftest.err >&5 14146 cat conftest.err >&5
13822 echo "$as_me:13822: \$? = $ac_status" >&5 14147 echo "$as_me:14147: \$? = $ac_status" >&5
13823 if (exit $ac_status) && test -s "$ac_outfile"; then 14148 if (exit $ac_status) && test -s "$ac_outfile"; then
13824 # The compiler can only warn and ignore the option if not recognized 14149 # The compiler can only warn and ignore the option if not recognized
13825 # So say no if there are warnings 14150 # So say no if there are warnings other than the usual output.
13826 if test ! -s conftest.err; then 14151 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
14152 $SED '/^$/d' conftest.err >conftest.er2
14153 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
13827 lt_prog_compiler_pic_works_F77=yes 14154 lt_prog_compiler_pic_works_F77=yes
13828 fi 14155 fi
13829 fi 14156 fi
@@ -13844,7 +14171,7 @@ else
13844fi 14171fi
13845 14172
13846fi 14173fi
13847case "$host_os" in 14174case $host_os in
13848 # For platforms which do not support PIC, -DPIC is meaningless: 14175 # For platforms which do not support PIC, -DPIC is meaningless:
13849 *djgpp*) 14176 *djgpp*)
13850 lt_prog_compiler_pic_F77= 14177 lt_prog_compiler_pic_F77=
@@ -13872,23 +14199,25 @@ else
13872 # Note that $ac_compile itself does not contain backslashes and begins 14199 # Note that $ac_compile itself does not contain backslashes and begins
13873 # with a dollar sign (not a hyphen), so the echo should work correctly. 14200 # with a dollar sign (not a hyphen), so the echo should work correctly.
13874 lt_compile=`echo "$ac_compile" | $SED \ 14201 lt_compile=`echo "$ac_compile" | $SED \
13875 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 14202 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
13876 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14203 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13877 -e 's:$: $lt_compiler_flag:'` 14204 -e 's:$: $lt_compiler_flag:'`
13878 (eval echo "\"\$as_me:13878: $lt_compile\"" >&5) 14205 (eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
13879 (eval "$lt_compile" 2>out/conftest.err) 14206 (eval "$lt_compile" 2>out/conftest.err)
13880 ac_status=$? 14207 ac_status=$?
13881 cat out/conftest.err >&5 14208 cat out/conftest.err >&5
13882 echo "$as_me:13882: \$? = $ac_status" >&5 14209 echo "$as_me:14209: \$? = $ac_status" >&5
13883 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14210 if (exit $ac_status) && test -s out/conftest2.$ac_objext
13884 then 14211 then
13885 # The compiler can only warn and ignore the option if not recognized 14212 # The compiler can only warn and ignore the option if not recognized
13886 # So say no if there are warnings 14213 # So say no if there are warnings
13887 if test ! -s out/conftest.err; then 14214 $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
14215 $SED '/^$/d' out/conftest.err >out/conftest.er2
14216 if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
13888 lt_cv_prog_compiler_c_o_F77=yes 14217 lt_cv_prog_compiler_c_o_F77=yes
13889 fi 14218 fi
13890 fi 14219 fi
13891 chmod u+w . 14220 chmod u+w . 2>&5
13892 $rm conftest* 14221 $rm conftest*
13893 # SGI C++ compiler will create directory out/ii_files/ for 14222 # SGI C++ compiler will create directory out/ii_files/ for
13894 # template instantiation 14223 # template instantiation
@@ -13964,6 +14293,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
13964 # rely on this symbol name, it's probably fine to never include it in 14293 # rely on this symbol name, it's probably fine to never include it in
13965 # preloaded symbol tables. 14294 # preloaded symbol tables.
13966 extract_expsyms_cmds= 14295 extract_expsyms_cmds=
14296 # Just being paranoid about ensuring that cc_basename is set.
14297 for cc_temp in $compiler""; do
14298 case $cc_temp in
14299 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
14300 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
14301 \-*) ;;
14302 *) break;;
14303 esac
14304done
14305cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
13967 14306
13968 case $host_os in 14307 case $host_os in
13969 cygwin* | mingw* | pw32*) 14308 cygwin* | mingw* | pw32*)
@@ -13984,6 +14323,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
13984 # If archive_cmds runs LD, not CC, wlarc should be empty 14323 # If archive_cmds runs LD, not CC, wlarc should be empty
13985 wlarc='${wl}' 14324 wlarc='${wl}'
13986 14325
14326 # Set some defaults for GNU ld with shared library support. These
14327 # are reset later if shared libraries are not supported. Putting them
14328 # here allows them to be overridden if necessary.
14329 runpath_var=LD_RUN_PATH
14330 hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
14331 export_dynamic_flag_spec_F77='${wl}--export-dynamic'
14332 # ancient GNU ld didn't support --whole-archive et. al.
14333 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
14334 whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
14335 else
14336 whole_archive_flag_spec_F77=
14337 fi
14338 supports_anon_versioning=no
14339 case `$LD -v 2>/dev/null` in
14340 *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
14341 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
14342 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
14343 *\ 2.11.*) ;; # other 2.11 versions
14344 *) supports_anon_versioning=yes ;;
14345 esac
14346
13987 # See if GNU ld supports shared libraries. 14347 # See if GNU ld supports shared libraries.
13988 case $host_os in 14348 case $host_os in
13989 aix3* | aix4* | aix5*) 14349 aix3* | aix4* | aix5*)
@@ -14034,7 +14394,7 @@ EOF
14034 allow_undefined_flag_F77=unsupported 14394 allow_undefined_flag_F77=unsupported
14035 always_export_symbols_F77=no 14395 always_export_symbols_F77=no
14036 enable_shared_with_static_runtimes_F77=yes 14396 enable_shared_with_static_runtimes_F77=yes
14037 export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' 14397 export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
14038 14398
14039 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then 14399 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
14040 archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 14400 archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -14048,7 +14408,39 @@ EOF
14048 fi~ 14408 fi~
14049 $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 14409 $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
14050 else 14410 else
14051 ld_shlibs=no 14411 ld_shlibs_F77=no
14412 fi
14413 ;;
14414
14415 linux*)
14416 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
14417 tmp_addflag=
14418 case $cc_basename,$host_cpu in
14419 pgcc*) # Portland Group C compiler
14420 whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
14421 tmp_addflag=' $pic_flag'
14422 ;;
14423 pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
14424 whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
14425 tmp_addflag=' $pic_flag -Mnomain' ;;
14426 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
14427 tmp_addflag=' -i_dynamic' ;;
14428 efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
14429 tmp_addflag=' -i_dynamic -nofor_main' ;;
14430 ifc* | ifort*) # Intel Fortran compiler
14431 tmp_addflag=' -nofor_main' ;;
14432 esac
14433 archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14434
14435 if test $supports_anon_versioning = yes; then
14436 archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
14437 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
14438 $echo "local: *; };" >> $output_objdir/$libname.ver~
14439 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
14440 fi
14441 link_all_deplibs_F77=no
14442 else
14443 ld_shlibs_F77=no
14052 fi 14444 fi
14053 ;; 14445 ;;
14054 14446
@@ -14090,32 +14482,6 @@ EOF
14090 hardcode_shlibpath_var_F77=no 14482 hardcode_shlibpath_var_F77=no
14091 ;; 14483 ;;
14092 14484
14093 linux*)
14094 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
14095 tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
14096 archive_cmds_F77="$tmp_archive_cmds"
14097 supports_anon_versioning=no
14098 case `$LD -v 2>/dev/null` in
14099 *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
14100 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
14101 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
14102 *\ 2.11.*) ;; # other 2.11 versions
14103 *) supports_anon_versioning=yes ;;
14104 esac
14105 if test $supports_anon_versioning = yes; then
14106 archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
14107cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
14108$echo "local: *; };" >> $output_objdir/$libname.ver~
14109 $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
14110 else
14111 archive_expsym_cmds_F77="$tmp_archive_cmds"
14112 fi
14113 link_all_deplibs_F77=no
14114 else
14115 ld_shlibs_F77=no
14116 fi
14117 ;;
14118
14119 *) 14485 *)
14120 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 14486 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
14121 archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14487 archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -14126,16 +14492,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
14126 ;; 14492 ;;
14127 esac 14493 esac
14128 14494
14129 if test "$ld_shlibs_F77" = yes; then 14495 if test "$ld_shlibs_F77" = no; then
14130 runpath_var=LD_RUN_PATH 14496 runpath_var=
14131 hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' 14497 hardcode_libdir_flag_spec_F77=
14132 export_dynamic_flag_spec_F77='${wl}--export-dynamic' 14498 export_dynamic_flag_spec_F77=
14133 # ancient GNU ld didn't support --whole-archive et. al. 14499 whole_archive_flag_spec_F77=
14134 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
14135 whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
14136 else
14137 whole_archive_flag_spec_F77=
14138 fi
14139 fi 14500 fi
14140 else 14501 else
14141 # PORTME fill in a description of your system's linker (not GNU ld) 14502 # PORTME fill in a description of your system's linker (not GNU ld)
@@ -14199,7 +14560,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
14199 link_all_deplibs_F77=yes 14560 link_all_deplibs_F77=yes
14200 14561
14201 if test "$GCC" = yes; then 14562 if test "$GCC" = yes; then
14202 case $host_os in aix4.012|aix4.012.*) 14563 case $host_os in aix4.[012]|aix4.[012].*)
14203 # We only want to do this on AIX 4.2 and lower, the check 14564 # We only want to do this on AIX 4.2 and lower, the check
14204 # below for broken collect2 doesn't work under 4.3+ 14565 # below for broken collect2 doesn't work under 4.3+
14205 collect2name=`${CC} -print-prog-name=collect2` 14566 collect2name=`${CC} -print-prog-name=collect2`
@@ -14220,6 +14581,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
14220 fi 14581 fi
14221 esac 14582 esac
14222 shared_flag='-shared' 14583 shared_flag='-shared'
14584 if test "$aix_use_runtimelinking" = yes; then
14585 shared_flag="$shared_flag "'${wl}-G'
14586 fi
14223 else 14587 else
14224 # not using gcc 14588 # not using gcc
14225 if test "$host_cpu" = ia64; then 14589 if test "$host_cpu" = ia64; then
@@ -14344,7 +14708,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14344 # Exported symbols can be pulled into shared objects from archives 14708 # Exported symbols can be pulled into shared objects from archives
14345 whole_archive_flag_spec_F77=' ' 14709 whole_archive_flag_spec_F77=' '
14346 archive_cmds_need_lc_F77=yes 14710 archive_cmds_need_lc_F77=yes
14347 # This is similar to how AIX traditionally builds it's shared libraries. 14711 # This is similar to how AIX traditionally builds its shared libraries.
14348 archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 14712 archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
14349 fi 14713 fi
14350 fi 14714 fi
@@ -14358,7 +14722,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14358 ld_shlibs_F77=no 14722 ld_shlibs_F77=no
14359 ;; 14723 ;;
14360 14724
14361 bsdi4*) 14725 bsdi[45]*)
14362 export_dynamic_flag_spec_F77=-rdynamic 14726 export_dynamic_flag_spec_F77=-rdynamic
14363 ;; 14727 ;;
14364 14728
@@ -14379,57 +14743,57 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14379 old_archive_From_new_cmds_F77='true' 14743 old_archive_From_new_cmds_F77='true'
14380 # FIXME: Should let the user specify the lib program. 14744 # FIXME: Should let the user specify the lib program.
14381 old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' 14745 old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
14382 fix_srcfile_path='`cygpath -w "$srcfile"`' 14746 fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
14383 enable_shared_with_static_runtimes_F77=yes 14747 enable_shared_with_static_runtimes_F77=yes
14384 ;; 14748 ;;
14385 14749
14386 darwin* | rhapsody*) 14750 darwin* | rhapsody*)
14387 if test "$GXX" = yes ; then 14751 case $host_os in
14388 archive_cmds_need_lc_F77=no 14752 rhapsody* | darwin1.[012])
14389 case "$host_os" in 14753 allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
14390 rhapsody* | darwin1.[012]) 14754 ;;
14391 allow_undefined_flag_F77='-undefined suppress' 14755 *) # Darwin 1.3 on
14392 ;; 14756 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
14393 *) # Darwin 1.3 on 14757 allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
14394 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then 14758 else
14395 allow_undefined_flag_F77='-flat_namespace -undefined suppress' 14759 case ${MACOSX_DEPLOYMENT_TARGET} in
14396 else 14760 10.[012])
14397 case ${MACOSX_DEPLOYMENT_TARGET} in 14761 allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
14398 10.[012]) 14762 ;;
14399 allow_undefined_flag_F77='-flat_namespace -undefined suppress' 14763 10.*)
14400 ;; 14764 allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
14401 10.*) 14765 ;;
14402 allow_undefined_flag_F77='-undefined dynamic_lookup' 14766 esac
14403 ;; 14767 fi
14404 esac 14768 ;;
14405 fi
14406 ;;
14407 esac 14769 esac
14408 lt_int_apple_cc_single_mod=no 14770 archive_cmds_need_lc_F77=no
14409 output_verbose_link_cmd='echo'
14410 if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
14411 lt_int_apple_cc_single_mod=yes
14412 fi
14413 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
14414 archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
14415 else
14416 archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
14417 fi
14418 module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
14419 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
14420 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
14421 archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
14422 else
14423 archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
14424 fi
14425 module_expsym_cmds_F77='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}'
14426 hardcode_direct_F77=no 14771 hardcode_direct_F77=no
14427 hardcode_automatic_F77=yes 14772 hardcode_automatic_F77=yes
14428 hardcode_shlibpath_var_F77=unsupported 14773 hardcode_shlibpath_var_F77=unsupported
14429 whole_archive_flag_spec_F77='-all_load $convenience' 14774 whole_archive_flag_spec_F77=''
14430 link_all_deplibs_F77=yes 14775 link_all_deplibs_F77=yes
14776 if test "$GCC" = yes ; then
14777 output_verbose_link_cmd='echo'
14778 archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
14779 module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
14780 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
14781 archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
14782 module_expsym_cmds_F77='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}'
14431 else 14783 else
14432 ld_shlibs_F77=no 14784 case $cc_basename in
14785 xlc*)
14786 output_verbose_link_cmd='echo'
14787 archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
14788 module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
14789 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
14790 archive_expsym_cmds_F77='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}'
14791 module_expsym_cmds_F77='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}'
14792 ;;
14793 *)
14794 ld_shlibs_F77=no
14795 ;;
14796 esac
14433 fi 14797 fi
14434 ;; 14798 ;;
14435 14799
@@ -14463,7 +14827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14463 ;; 14827 ;;
14464 14828
14465 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 14829 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14466 freebsd* | kfreebsd*-gnu) 14830 freebsd* | kfreebsd*-gnu | dragonfly*)
14467 archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 14831 archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14468 hardcode_libdir_flag_spec_F77='-R$libdir' 14832 hardcode_libdir_flag_spec_F77='-R$libdir'
14469 hardcode_direct_F77=yes 14833 hardcode_direct_F77=yes
@@ -14488,7 +14852,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14488 14852
14489 hpux10* | hpux11*) 14853 hpux10* | hpux11*)
14490 if test "$GCC" = yes -a "$with_gnu_ld" = no; then 14854 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
14491 case "$host_cpu" in 14855 case $host_cpu in
14492 hppa*64*|ia64*) 14856 hppa*64*|ia64*)
14493 archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 14857 archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14494 ;; 14858 ;;
@@ -14497,7 +14861,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14497 ;; 14861 ;;
14498 esac 14862 esac
14499 else 14863 else
14500 case "$host_cpu" in 14864 case $host_cpu in
14501 hppa*64*|ia64*) 14865 hppa*64*|ia64*)
14502 archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' 14866 archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
14503 ;; 14867 ;;
@@ -14507,7 +14871,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14507 esac 14871 esac
14508 fi 14872 fi
14509 if test "$with_gnu_ld" = no; then 14873 if test "$with_gnu_ld" = no; then
14510 case "$host_cpu" in 14874 case $host_cpu in
14511 hppa*64*) 14875 hppa*64*)
14512 hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' 14876 hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
14513 hardcode_libdir_flag_spec_ld_F77='+b $libdir' 14877 hardcode_libdir_flag_spec_ld_F77='+b $libdir'
@@ -14574,6 +14938,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14574 hardcode_shlibpath_var_F77=no 14938 hardcode_shlibpath_var_F77=no
14575 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 14939 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
14576 archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 14940 archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
14941 archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
14577 hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' 14942 hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
14578 export_dynamic_flag_spec_F77='${wl}-E' 14943 export_dynamic_flag_spec_F77='${wl}-E'
14579 else 14944 else
@@ -14619,7 +14984,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14619 allow_undefined_flag_F77=' -expect_unresolved \*' 14984 allow_undefined_flag_F77=' -expect_unresolved \*'
14620 archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' 14985 archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
14621 archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ 14986 archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
14622 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' 14987 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
14623 14988
14624 # Both c and cxx compiler support -rpath directly 14989 # Both c and cxx compiler support -rpath directly
14625 hardcode_libdir_flag_spec_F77='-rpath $libdir' 14990 hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -14638,10 +15003,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14638 solaris*) 15003 solaris*)
14639 no_undefined_flag_F77=' -z text' 15004 no_undefined_flag_F77=' -z text'
14640 if test "$GCC" = yes; then 15005 if test "$GCC" = yes; then
15006 wlarc='${wl}'
14641 archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 15007 archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
14642 archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 15008 archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
14643 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' 15009 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
14644 else 15010 else
15011 wlarc=''
14645 archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' 15012 archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
14646 archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 15013 archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
14647 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' 15014 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -14650,8 +15017,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
14650 hardcode_shlibpath_var_F77=no 15017 hardcode_shlibpath_var_F77=no
14651 case $host_os in 15018 case $host_os in
14652 solaris2.[0-5] | solaris2.[0-5].*) ;; 15019 solaris2.[0-5] | solaris2.[0-5].*) ;;
14653 *) # Supported since Solaris 2.6 (maybe 2.5.1?) 15020 *)
14654 whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; 15021 # The compiler driver will combine linker options so we
15022 # cannot just pass the convience library names through
15023 # without $wl, iff we do not link with $LD.
15024 # Luckily, gcc supports the same syntax we need for Sun Studio.
15025 # Supported since Solaris 2.6 (maybe 2.5.1?)
15026 case $wlarc in
15027 '')
15028 whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
15029 *)
15030 whole_archive_flag_spec_F77='${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' ;;
15031 esac ;;
14655 esac 15032 esac
14656 link_all_deplibs_F77=yes 15033 link_all_deplibs_F77=yes
14657 ;; 15034 ;;
@@ -14925,7 +15302,7 @@ beos*)
14925 shlibpath_var=LIBRARY_PATH 15302 shlibpath_var=LIBRARY_PATH
14926 ;; 15303 ;;
14927 15304
14928bsdi4*) 15305bsdi[45]*)
14929 version_type=linux 15306 version_type=linux
14930 need_version=no 15307 need_version=no
14931 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 15308 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14953,7 +15330,8 @@ cygwin* | mingw* | pw32*)
14953 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ 15330 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
14954 dldir=$destdir/`dirname \$dlpath`~ 15331 dldir=$destdir/`dirname \$dlpath`~
14955 test -d \$dldir || mkdir -p \$dldir~ 15332 test -d \$dldir || mkdir -p \$dldir~
14956 $install_prog $dir/$dlname \$dldir/$dlname' 15333 $install_prog $dir/$dlname \$dldir/$dlname~
15334 chmod a+x \$dldir/$dlname'
14957 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 15335 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
14958 dlpath=$dir/\$dldll~ 15336 dlpath=$dir/\$dldll~
14959 $rm \$dlpath' 15337 $rm \$dlpath'
@@ -14983,7 +15361,7 @@ cygwin* | mingw* | pw32*)
14983 ;; 15361 ;;
14984 pw32*) 15362 pw32*)
14985 # pw32 DLLs use 'pw' prefix rather than 'lib' 15363 # pw32 DLLs use 'pw' prefix rather than 'lib'
14986 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' 15364 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14987 ;; 15365 ;;
14988 esac 15366 esac
14989 ;; 15367 ;;
@@ -15006,7 +15384,7 @@ darwin* | rhapsody*)
15006 soname_spec='${libname}${release}${major}$shared_ext' 15384 soname_spec='${libname}${release}${major}$shared_ext'
15007 shlibpath_overrides_runpath=yes 15385 shlibpath_overrides_runpath=yes
15008 shlibpath_var=DYLD_LIBRARY_PATH 15386 shlibpath_var=DYLD_LIBRARY_PATH
15009 shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' 15387 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
15010 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 15388 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
15011 if test "$GCC" = yes; then 15389 if test "$GCC" = yes; then
15012 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"` 15390 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"`
@@ -15041,8 +15419,17 @@ kfreebsd*-gnu)
15041 dynamic_linker='GNU ld.so' 15419 dynamic_linker='GNU ld.so'
15042 ;; 15420 ;;
15043 15421
15044freebsd*) 15422freebsd* | dragonfly*)
15045 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 15423 # DragonFly does not have aout. When/if they implement a new
15424 # versioning mechanism, adjust this.
15425 if test -x /usr/bin/objformat; then
15426 objformat=`/usr/bin/objformat`
15427 else
15428 case $host_os in
15429 freebsd[123]*) objformat=aout ;;
15430 *) objformat=elf ;;
15431 esac
15432 fi
15046 version_type=freebsd-$objformat 15433 version_type=freebsd-$objformat
15047 case $version_type in 15434 case $version_type in
15048 freebsd-elf*) 15435 freebsd-elf*)
@@ -15060,7 +15447,7 @@ freebsd*)
15060 freebsd2*) 15447 freebsd2*)
15061 shlibpath_overrides_runpath=yes 15448 shlibpath_overrides_runpath=yes
15062 ;; 15449 ;;
15063 freebsd3.01* | freebsdelf3.01*) 15450 freebsd3.[01]* | freebsdelf3.[01]*)
15064 shlibpath_overrides_runpath=yes 15451 shlibpath_overrides_runpath=yes
15065 hardcode_into_libs=yes 15452 hardcode_into_libs=yes
15066 ;; 15453 ;;
@@ -15087,7 +15474,7 @@ hpux9* | hpux10* | hpux11*)
15087 version_type=sunos 15474 version_type=sunos
15088 need_lib_prefix=no 15475 need_lib_prefix=no
15089 need_version=no 15476 need_version=no
15090 case "$host_cpu" in 15477 case $host_cpu in
15091 ia64*) 15478 ia64*)
15092 shrext_cmds='.so' 15479 shrext_cmds='.so'
15093 hardcode_into_libs=yes 15480 hardcode_into_libs=yes
@@ -15186,7 +15573,7 @@ linux*)
15186 15573
15187 # Append ld.so.conf contents to the search path 15574 # Append ld.so.conf contents to the search path
15188 if test -f /etc/ld.so.conf; then 15575 if test -f /etc/ld.so.conf; then
15189 lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` 15576 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' ' '`
15190 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 15577 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
15191 fi 15578 fi
15192 15579
@@ -15261,7 +15648,11 @@ nto-qnx*)
15261openbsd*) 15648openbsd*)
15262 version_type=sunos 15649 version_type=sunos
15263 need_lib_prefix=no 15650 need_lib_prefix=no
15264 need_version=yes 15651 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
15652 case $host_os in
15653 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
15654 *) need_version=no ;;
15655 esac
15265 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 15656 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
15266 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 15657 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
15267 shlibpath_var=LD_LIBRARY_PATH 15658 shlibpath_var=LD_LIBRARY_PATH
@@ -15383,8 +15774,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
15383echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 15774echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
15384hardcode_action_F77= 15775hardcode_action_F77=
15385if test -n "$hardcode_libdir_flag_spec_F77" || \ 15776if test -n "$hardcode_libdir_flag_spec_F77" || \
15386 test -n "$runpath_var F77" || \ 15777 test -n "$runpath_var_F77" || \
15387 test "X$hardcode_automatic_F77"="Xyes" ; then 15778 test "X$hardcode_automatic_F77" = "Xyes" ; then
15388 15779
15389 # We can hardcode non-existant directories. 15780 # We can hardcode non-existant directories.
15390 if test "$hardcode_direct_F77" != no && 15781 if test "$hardcode_direct_F77" != no &&
@@ -15561,6 +15952,12 @@ fast_install=$enable_fast_install
15561# The host system. 15952# The host system.
15562host_alias=$host_alias 15953host_alias=$host_alias
15563host=$host 15954host=$host
15955host_os=$host_os
15956
15957# The build system.
15958build_alias=$build_alias
15959build=$build
15960build_os=$build_os
15564 15961
15565# An echo program that does not interpret backslashes. 15962# An echo program that does not interpret backslashes.
15566echo=$lt_echo 15963echo=$lt_echo
@@ -15637,7 +16034,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
15637# Does compiler simultaneously support -c and -o options? 16034# Does compiler simultaneously support -c and -o options?
15638compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 16035compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
15639 16036
15640# Must we lock files when doing compilation ? 16037# Must we lock files when doing compilation?
15641need_locks=$lt_need_locks 16038need_locks=$lt_need_locks
15642 16039
15643# Do we need the lib prefix for modules? 16040# Do we need the lib prefix for modules?
@@ -15875,7 +16272,7 @@ objext_GCJ=$objext
15875lt_simple_compile_test_code="class foo {}\n" 16272lt_simple_compile_test_code="class foo {}\n"
15876 16273
15877# Code to be used in simple link tests 16274# Code to be used in simple link tests
15878lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' 16275lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
15879 16276
15880# ltmain only uses $CC for tagged configurations so make sure $CC is set. 16277# ltmain only uses $CC for tagged configurations so make sure $CC is set.
15881 16278
@@ -15886,15 +16283,41 @@ LTCC=${LTCC-"$CC"}
15886compiler=$CC 16283compiler=$CC
15887 16284
15888 16285
16286# save warnings/boilerplate of simple test code
16287ac_outfile=conftest.$ac_objext
16288printf "$lt_simple_compile_test_code" >conftest.$ac_ext
16289eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
16290_lt_compiler_boilerplate=`cat conftest.err`
16291$rm conftest*
16292
16293ac_outfile=conftest.$ac_objext
16294printf "$lt_simple_link_test_code" >conftest.$ac_ext
16295eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
16296_lt_linker_boilerplate=`cat conftest.err`
16297$rm conftest*
16298
16299
15889# Allow CC to be a program name with arguments. 16300# Allow CC to be a program name with arguments.
15890lt_save_CC="$CC" 16301lt_save_CC="$CC"
15891CC=${GCJ-"gcj"} 16302CC=${GCJ-"gcj"}
15892compiler=$CC 16303compiler=$CC
15893compiler_GCJ=$CC 16304compiler_GCJ=$CC
16305for cc_temp in $compiler""; do
16306 case $cc_temp in
16307 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
16308 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
16309 \-*) ;;
16310 *) break;;
16311 esac
16312done
16313cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
16314
15894 16315
15895# GCJ did not exist at the time GCC didn't implicitly link libc in. 16316# GCJ did not exist at the time GCC didn't implicitly link libc in.
15896archive_cmds_need_lc_GCJ=no 16317archive_cmds_need_lc_GCJ=no
15897 16318
16319old_archive_cmds_GCJ=$old_archive_cmds
16320
15898 16321
15899lt_prog_compiler_no_builtin_flag_GCJ= 16322lt_prog_compiler_no_builtin_flag_GCJ=
15900 16323
@@ -15917,18 +16340,20 @@ else
15917 # with a dollar sign (not a hyphen), so the echo should work correctly. 16340 # with a dollar sign (not a hyphen), so the echo should work correctly.
15918 # The option is referenced via a variable to avoid confusing sed. 16341 # The option is referenced via a variable to avoid confusing sed.
15919 lt_compile=`echo "$ac_compile" | $SED \ 16342 lt_compile=`echo "$ac_compile" | $SED \
15920 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 16343 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
15921 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16344 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15922 -e 's:$: $lt_compiler_flag:'` 16345 -e 's:$: $lt_compiler_flag:'`
15923 (eval echo "\"\$as_me:15923: $lt_compile\"" >&5) 16346 (eval echo "\"\$as_me:16346: $lt_compile\"" >&5)
15924 (eval "$lt_compile" 2>conftest.err) 16347 (eval "$lt_compile" 2>conftest.err)
15925 ac_status=$? 16348 ac_status=$?
15926 cat conftest.err >&5 16349 cat conftest.err >&5
15927 echo "$as_me:15927: \$? = $ac_status" >&5 16350 echo "$as_me:16350: \$? = $ac_status" >&5
15928 if (exit $ac_status) && test -s "$ac_outfile"; then 16351 if (exit $ac_status) && test -s "$ac_outfile"; then
15929 # The compiler can only warn and ignore the option if not recognized 16352 # The compiler can only warn and ignore the option if not recognized
15930 # So say no if there are warnings 16353 # So say no if there are warnings other than the usual output.
15931 if test ! -s conftest.err; then 16354 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
16355 $SED '/^$/d' conftest.err >conftest.er2
16356 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
15932 lt_cv_prog_compiler_rtti_exceptions=yes 16357 lt_cv_prog_compiler_rtti_exceptions=yes
15933 fi 16358 fi
15934 fi 16359 fi
@@ -16005,7 +16430,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
16005 hpux*) 16430 hpux*)
16006 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 16431 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
16007 # not for PA HP-UX. 16432 # not for PA HP-UX.
16008 case "$host_cpu" in 16433 case $host_cpu in
16009 hppa*64*|ia64*) 16434 hppa*64*|ia64*)
16010 # +Z the default 16435 # +Z the default
16011 ;; 16436 ;;
@@ -16031,6 +16456,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
16031 lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' 16456 lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
16032 fi 16457 fi
16033 ;; 16458 ;;
16459 darwin*)
16460 # PIC is the default on this platform
16461 # Common symbols not allowed in MH_DYLIB files
16462 case $cc_basename in
16463 xlc*)
16464 lt_prog_compiler_pic_GCJ='-qnocommon'
16465 lt_prog_compiler_wl_GCJ='-Wl,'
16466 ;;
16467 esac
16468 ;;
16034 16469
16035 mingw* | pw32* | os2*) 16470 mingw* | pw32* | os2*)
16036 # This hack is so that the source file can tell whether it is being 16471 # This hack is so that the source file can tell whether it is being
@@ -16042,7 +16477,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
16042 lt_prog_compiler_wl_GCJ='-Wl,' 16477 lt_prog_compiler_wl_GCJ='-Wl,'
16043 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 16478 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
16044 # not for PA HP-UX. 16479 # not for PA HP-UX.
16045 case "$host_cpu" in 16480 case $host_cpu in
16046 hppa*64*|ia64*) 16481 hppa*64*|ia64*)
16047 # +Z the default 16482 # +Z the default
16048 ;; 16483 ;;
@@ -16066,12 +16501,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
16066 ;; 16501 ;;
16067 16502
16068 linux*) 16503 linux*)
16069 case $CC in 16504 case $cc_basename in
16070 icc* | ecc*) 16505 icc* | ecc*)
16071 lt_prog_compiler_wl_GCJ='-Wl,' 16506 lt_prog_compiler_wl_GCJ='-Wl,'
16072 lt_prog_compiler_pic_GCJ='-KPIC' 16507 lt_prog_compiler_pic_GCJ='-KPIC'
16073 lt_prog_compiler_static_GCJ='-static' 16508 lt_prog_compiler_static_GCJ='-static'
16074 ;; 16509 ;;
16510 pgcc* | pgf77* | pgf90* | pgf95*)
16511 # Portland Group compilers (*not* the Pentium gcc compiler,
16512 # which looks to be a dead project)
16513 lt_prog_compiler_wl_GCJ='-Wl,'
16514 lt_prog_compiler_pic_GCJ='-fpic'
16515 lt_prog_compiler_static_GCJ='-Bstatic'
16516 ;;
16075 ccc*) 16517 ccc*)
16076 lt_prog_compiler_wl_GCJ='-Wl,' 16518 lt_prog_compiler_wl_GCJ='-Wl,'
16077 # All Alpha code is PIC. 16519 # All Alpha code is PIC.
@@ -16092,9 +16534,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
16092 ;; 16534 ;;
16093 16535
16094 solaris*) 16536 solaris*)
16095 lt_prog_compiler_wl_GCJ='-Wl,'
16096 lt_prog_compiler_pic_GCJ='-KPIC' 16537 lt_prog_compiler_pic_GCJ='-KPIC'
16097 lt_prog_compiler_static_GCJ='-Bstatic' 16538 lt_prog_compiler_static_GCJ='-Bstatic'
16539 case $cc_basename in
16540 f77* | f90* | f95*)
16541 lt_prog_compiler_wl_GCJ='-Qoption ld ';;
16542 *)
16543 lt_prog_compiler_wl_GCJ='-Wl,';;
16544 esac
16098 ;; 16545 ;;
16099 16546
16100 sunos4*) 16547 sunos4*)
@@ -16116,6 +16563,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
16116 fi 16563 fi
16117 ;; 16564 ;;
16118 16565
16566 unicos*)
16567 lt_prog_compiler_wl_GCJ='-Wl,'
16568 lt_prog_compiler_can_build_shared_GCJ=no
16569 ;;
16570
16119 uts4*) 16571 uts4*)
16120 lt_prog_compiler_pic_GCJ='-pic' 16572 lt_prog_compiler_pic_GCJ='-pic'
16121 lt_prog_compiler_static_GCJ='-Bstatic' 16573 lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16150,18 +16602,20 @@ else
16150 # with a dollar sign (not a hyphen), so the echo should work correctly. 16602 # with a dollar sign (not a hyphen), so the echo should work correctly.
16151 # The option is referenced via a variable to avoid confusing sed. 16603 # The option is referenced via a variable to avoid confusing sed.
16152 lt_compile=`echo "$ac_compile" | $SED \ 16604 lt_compile=`echo "$ac_compile" | $SED \
16153 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 16605 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16154 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16606 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16155 -e 's:$: $lt_compiler_flag:'` 16607 -e 's:$: $lt_compiler_flag:'`
16156 (eval echo "\"\$as_me:16156: $lt_compile\"" >&5) 16608 (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
16157 (eval "$lt_compile" 2>conftest.err) 16609 (eval "$lt_compile" 2>conftest.err)
16158 ac_status=$? 16610 ac_status=$?
16159 cat conftest.err >&5 16611 cat conftest.err >&5
16160 echo "$as_me:16160: \$? = $ac_status" >&5 16612 echo "$as_me:16612: \$? = $ac_status" >&5
16161 if (exit $ac_status) && test -s "$ac_outfile"; then 16613 if (exit $ac_status) && test -s "$ac_outfile"; then
16162 # The compiler can only warn and ignore the option if not recognized 16614 # The compiler can only warn and ignore the option if not recognized
16163 # So say no if there are warnings 16615 # So say no if there are warnings other than the usual output.
16164 if test ! -s conftest.err; then 16616 $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
16617 $SED '/^$/d' conftest.err >conftest.er2
16618 if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
16165 lt_prog_compiler_pic_works_GCJ=yes 16619 lt_prog_compiler_pic_works_GCJ=yes
16166 fi 16620 fi
16167 fi 16621 fi
@@ -16182,7 +16636,7 @@ else
16182fi 16636fi
16183 16637
16184fi 16638fi
16185case "$host_os" in 16639case $host_os in
16186 # For platforms which do not support PIC, -DPIC is meaningless: 16640 # For platforms which do not support PIC, -DPIC is meaningless:
16187 *djgpp*) 16641 *djgpp*)
16188 lt_prog_compiler_pic_GCJ= 16642 lt_prog_compiler_pic_GCJ=
@@ -16210,23 +16664,25 @@ else
16210 # Note that $ac_compile itself does not contain backslashes and begins 16664 # Note that $ac_compile itself does not contain backslashes and begins
16211 # with a dollar sign (not a hyphen), so the echo should work correctly. 16665 # with a dollar sign (not a hyphen), so the echo should work correctly.
16212 lt_compile=`echo "$ac_compile" | $SED \ 16666 lt_compile=`echo "$ac_compile" | $SED \
16213 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 16667 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16214 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16668 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16215 -e 's:$: $lt_compiler_flag:'` 16669 -e 's:$: $lt_compiler_flag:'`
16216 (eval echo "\"\$as_me:16216: $lt_compile\"" >&5) 16670 (eval echo "\"\$as_me:16670: $lt_compile\"" >&5)
16217 (eval "$lt_compile" 2>out/conftest.err) 16671 (eval "$lt_compile" 2>out/conftest.err)
16218 ac_status=$? 16672 ac_status=$?
16219 cat out/conftest.err >&5 16673 cat out/conftest.err >&5
16220 echo "$as_me:16220: \$? = $ac_status" >&5 16674 echo "$as_me:16674: \$? = $ac_status" >&5
16221 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16675 if (exit $ac_status) && test -s out/conftest2.$ac_objext
16222 then 16676 then
16223 # The compiler can only warn and ignore the option if not recognized 16677 # The compiler can only warn and ignore the option if not recognized
16224 # So say no if there are warnings 16678 # So say no if there are warnings
16225 if test ! -s out/conftest.err; then 16679 $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
16680 $SED '/^$/d' out/conftest.err >out/conftest.er2
16681 if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
16226 lt_cv_prog_compiler_c_o_GCJ=yes 16682 lt_cv_prog_compiler_c_o_GCJ=yes
16227 fi 16683 fi
16228 fi 16684 fi
16229 chmod u+w . 16685 chmod u+w . 2>&5
16230 $rm conftest* 16686 $rm conftest*
16231 # SGI C++ compiler will create directory out/ii_files/ for 16687 # SGI C++ compiler will create directory out/ii_files/ for
16232 # template instantiation 16688 # template instantiation
@@ -16302,6 +16758,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
16302 # rely on this symbol name, it's probably fine to never include it in 16758 # rely on this symbol name, it's probably fine to never include it in
16303 # preloaded symbol tables. 16759 # preloaded symbol tables.
16304 extract_expsyms_cmds= 16760 extract_expsyms_cmds=
16761 # Just being paranoid about ensuring that cc_basename is set.
16762 for cc_temp in $compiler""; do
16763 case $cc_temp in
16764 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
16765 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
16766 \-*) ;;
16767 *) break;;
16768 esac
16769done
16770cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
16305 16771
16306 case $host_os in 16772 case $host_os in
16307 cygwin* | mingw* | pw32*) 16773 cygwin* | mingw* | pw32*)
@@ -16322,6 +16788,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
16322 # If archive_cmds runs LD, not CC, wlarc should be empty 16788 # If archive_cmds runs LD, not CC, wlarc should be empty
16323 wlarc='${wl}' 16789 wlarc='${wl}'
16324 16790
16791 # Set some defaults for GNU ld with shared library support. These
16792 # are reset later if shared libraries are not supported. Putting them
16793 # here allows them to be overridden if necessary.
16794 runpath_var=LD_RUN_PATH
16795 hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
16796 export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
16797 # ancient GNU ld didn't support --whole-archive et. al.
16798 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
16799 whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
16800 else
16801 whole_archive_flag_spec_GCJ=
16802 fi
16803 supports_anon_versioning=no
16804 case `$LD -v 2>/dev/null` in
16805 *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
16806 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
16807 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
16808 *\ 2.11.*) ;; # other 2.11 versions
16809 *) supports_anon_versioning=yes ;;
16810 esac
16811
16325 # See if GNU ld supports shared libraries. 16812 # See if GNU ld supports shared libraries.
16326 case $host_os in 16813 case $host_os in
16327 aix3* | aix4* | aix5*) 16814 aix3* | aix4* | aix5*)
@@ -16372,7 +16859,7 @@ EOF
16372 allow_undefined_flag_GCJ=unsupported 16859 allow_undefined_flag_GCJ=unsupported
16373 always_export_symbols_GCJ=no 16860 always_export_symbols_GCJ=no
16374 enable_shared_with_static_runtimes_GCJ=yes 16861 enable_shared_with_static_runtimes_GCJ=yes
16375 export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' 16862 export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
16376 16863
16377 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then 16864 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
16378 archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 16865 archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -16386,7 +16873,39 @@ EOF
16386 fi~ 16873 fi~
16387 $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' 16874 $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
16388 else 16875 else
16389 ld_shlibs=no 16876 ld_shlibs_GCJ=no
16877 fi
16878 ;;
16879
16880 linux*)
16881 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
16882 tmp_addflag=
16883 case $cc_basename,$host_cpu in
16884 pgcc*) # Portland Group C compiler
16885 whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
16886 tmp_addflag=' $pic_flag'
16887 ;;
16888 pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
16889 whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
16890 tmp_addflag=' $pic_flag -Mnomain' ;;
16891 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
16892 tmp_addflag=' -i_dynamic' ;;
16893 efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
16894 tmp_addflag=' -i_dynamic -nofor_main' ;;
16895 ifc* | ifort*) # Intel Fortran compiler
16896 tmp_addflag=' -nofor_main' ;;
16897 esac
16898 archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
16899
16900 if test $supports_anon_versioning = yes; then
16901 archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
16902 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
16903 $echo "local: *; };" >> $output_objdir/$libname.ver~
16904 $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
16905 fi
16906 link_all_deplibs_GCJ=no
16907 else
16908 ld_shlibs_GCJ=no
16390 fi 16909 fi
16391 ;; 16910 ;;
16392 16911
@@ -16428,32 +16947,6 @@ EOF
16428 hardcode_shlibpath_var_GCJ=no 16947 hardcode_shlibpath_var_GCJ=no
16429 ;; 16948 ;;
16430 16949
16431 linux*)
16432 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
16433 tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
16434 archive_cmds_GCJ="$tmp_archive_cmds"
16435 supports_anon_versioning=no
16436 case `$LD -v 2>/dev/null` in
16437 *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
16438 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
16439 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
16440 *\ 2.11.*) ;; # other 2.11 versions
16441 *) supports_anon_versioning=yes ;;
16442 esac
16443 if test $supports_anon_versioning = yes; then
16444 archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
16445cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
16446$echo "local: *; };" >> $output_objdir/$libname.ver~
16447 $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
16448 else
16449 archive_expsym_cmds_GCJ="$tmp_archive_cmds"
16450 fi
16451 link_all_deplibs_GCJ=no
16452 else
16453 ld_shlibs_GCJ=no
16454 fi
16455 ;;
16456
16457 *) 16950 *)
16458 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 16951 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
16459 archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 16952 archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -16464,16 +16957,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
16464 ;; 16957 ;;
16465 esac 16958 esac
16466 16959
16467 if test "$ld_shlibs_GCJ" = yes; then 16960 if test "$ld_shlibs_GCJ" = no; then
16468 runpath_var=LD_RUN_PATH 16961 runpath_var=
16469 hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' 16962 hardcode_libdir_flag_spec_GCJ=
16470 export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' 16963 export_dynamic_flag_spec_GCJ=
16471 # ancient GNU ld didn't support --whole-archive et. al. 16964 whole_archive_flag_spec_GCJ=
16472 if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
16473 whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
16474 else
16475 whole_archive_flag_spec_GCJ=
16476 fi
16477 fi 16965 fi
16478 else 16966 else
16479 # PORTME fill in a description of your system's linker (not GNU ld) 16967 # PORTME fill in a description of your system's linker (not GNU ld)
@@ -16537,7 +17025,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
16537 link_all_deplibs_GCJ=yes 17025 link_all_deplibs_GCJ=yes
16538 17026
16539 if test "$GCC" = yes; then 17027 if test "$GCC" = yes; then
16540 case $host_os in aix4.012|aix4.012.*) 17028 case $host_os in aix4.[012]|aix4.[012].*)
16541 # We only want to do this on AIX 4.2 and lower, the check 17029 # We only want to do this on AIX 4.2 and lower, the check
16542 # below for broken collect2 doesn't work under 4.3+ 17030 # below for broken collect2 doesn't work under 4.3+
16543 collect2name=`${CC} -print-prog-name=collect2` 17031 collect2name=`${CC} -print-prog-name=collect2`
@@ -16558,6 +17046,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
16558 fi 17046 fi
16559 esac 17047 esac
16560 shared_flag='-shared' 17048 shared_flag='-shared'
17049 if test "$aix_use_runtimelinking" = yes; then
17050 shared_flag="$shared_flag "'${wl}-G'
17051 fi
16561 else 17052 else
16562 # not using gcc 17053 # not using gcc
16563 if test "$host_cpu" = ia64; then 17054 if test "$host_cpu" = ia64; then
@@ -16702,7 +17193,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16702 # Exported symbols can be pulled into shared objects from archives 17193 # Exported symbols can be pulled into shared objects from archives
16703 whole_archive_flag_spec_GCJ=' ' 17194 whole_archive_flag_spec_GCJ=' '
16704 archive_cmds_need_lc_GCJ=yes 17195 archive_cmds_need_lc_GCJ=yes
16705 # This is similar to how AIX traditionally builds it's shared libraries. 17196 # This is similar to how AIX traditionally builds its shared libraries.
16706 archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 17197 archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
16707 fi 17198 fi
16708 fi 17199 fi
@@ -16716,7 +17207,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16716 ld_shlibs_GCJ=no 17207 ld_shlibs_GCJ=no
16717 ;; 17208 ;;
16718 17209
16719 bsdi4*) 17210 bsdi[45]*)
16720 export_dynamic_flag_spec_GCJ=-rdynamic 17211 export_dynamic_flag_spec_GCJ=-rdynamic
16721 ;; 17212 ;;
16722 17213
@@ -16737,57 +17228,57 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16737 old_archive_From_new_cmds_GCJ='true' 17228 old_archive_From_new_cmds_GCJ='true'
16738 # FIXME: Should let the user specify the lib program. 17229 # FIXME: Should let the user specify the lib program.
16739 old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' 17230 old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
16740 fix_srcfile_path='`cygpath -w "$srcfile"`' 17231 fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
16741 enable_shared_with_static_runtimes_GCJ=yes 17232 enable_shared_with_static_runtimes_GCJ=yes
16742 ;; 17233 ;;
16743 17234
16744 darwin* | rhapsody*) 17235 darwin* | rhapsody*)
16745 if test "$GXX" = yes ; then 17236 case $host_os in
16746 archive_cmds_need_lc_GCJ=no 17237 rhapsody* | darwin1.[012])
16747 case "$host_os" in 17238 allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
16748 rhapsody* | darwin1.[012]) 17239 ;;
16749 allow_undefined_flag_GCJ='-undefined suppress' 17240 *) # Darwin 1.3 on
16750 ;; 17241 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
16751 *) # Darwin 1.3 on 17242 allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
16752 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then 17243 else
16753 allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' 17244 case ${MACOSX_DEPLOYMENT_TARGET} in
16754 else 17245 10.[012])
16755 case ${MACOSX_DEPLOYMENT_TARGET} in 17246 allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
16756 10.[012]) 17247 ;;
16757 allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' 17248 10.*)
16758 ;; 17249 allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
16759 10.*) 17250 ;;
16760 allow_undefined_flag_GCJ='-undefined dynamic_lookup' 17251 esac
16761 ;; 17252 fi
16762 esac 17253 ;;
16763 fi
16764 ;;
16765 esac 17254 esac
16766 lt_int_apple_cc_single_mod=no 17255 archive_cmds_need_lc_GCJ=no
16767 output_verbose_link_cmd='echo'
16768 if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
16769 lt_int_apple_cc_single_mod=yes
16770 fi
16771 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
16772 archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
16773 else
16774 archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
16775 fi
16776 module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
16777 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
16778 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
16779 archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16780 else
16781 archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16782 fi
16783 module_expsym_cmds_GCJ='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}'
16784 hardcode_direct_GCJ=no 17256 hardcode_direct_GCJ=no
16785 hardcode_automatic_GCJ=yes 17257 hardcode_automatic_GCJ=yes
16786 hardcode_shlibpath_var_GCJ=unsupported 17258 hardcode_shlibpath_var_GCJ=unsupported
16787 whole_archive_flag_spec_GCJ='-all_load $convenience' 17259 whole_archive_flag_spec_GCJ=''
16788 link_all_deplibs_GCJ=yes 17260 link_all_deplibs_GCJ=yes
17261 if test "$GCC" = yes ; then
17262 output_verbose_link_cmd='echo'
17263 archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
17264 module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
17265 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
17266 archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
17267 module_expsym_cmds_GCJ='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}'
16789 else 17268 else
16790 ld_shlibs_GCJ=no 17269 case $cc_basename in
17270 xlc*)
17271 output_verbose_link_cmd='echo'
17272 archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
17273 module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
17274 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
17275 archive_expsym_cmds_GCJ='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}'
17276 module_expsym_cmds_GCJ='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}'
17277 ;;
17278 *)
17279 ld_shlibs_GCJ=no
17280 ;;
17281 esac
16791 fi 17282 fi
16792 ;; 17283 ;;
16793 17284
@@ -16821,7 +17312,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16821 ;; 17312 ;;
16822 17313
16823 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 17314 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
16824 freebsd* | kfreebsd*-gnu) 17315 freebsd* | kfreebsd*-gnu | dragonfly*)
16825 archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 17316 archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
16826 hardcode_libdir_flag_spec_GCJ='-R$libdir' 17317 hardcode_libdir_flag_spec_GCJ='-R$libdir'
16827 hardcode_direct_GCJ=yes 17318 hardcode_direct_GCJ=yes
@@ -16846,7 +17337,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16846 17337
16847 hpux10* | hpux11*) 17338 hpux10* | hpux11*)
16848 if test "$GCC" = yes -a "$with_gnu_ld" = no; then 17339 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
16849 case "$host_cpu" in 17340 case $host_cpu in
16850 hppa*64*|ia64*) 17341 hppa*64*|ia64*)
16851 archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 17342 archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
16852 ;; 17343 ;;
@@ -16855,7 +17346,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16855 ;; 17346 ;;
16856 esac 17347 esac
16857 else 17348 else
16858 case "$host_cpu" in 17349 case $host_cpu in
16859 hppa*64*|ia64*) 17350 hppa*64*|ia64*)
16860 archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' 17351 archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
16861 ;; 17352 ;;
@@ -16865,7 +17356,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16865 esac 17356 esac
16866 fi 17357 fi
16867 if test "$with_gnu_ld" = no; then 17358 if test "$with_gnu_ld" = no; then
16868 case "$host_cpu" in 17359 case $host_cpu in
16869 hppa*64*) 17360 hppa*64*)
16870 hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' 17361 hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
16871 hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' 17362 hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
@@ -16932,6 +17423,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16932 hardcode_shlibpath_var_GCJ=no 17423 hardcode_shlibpath_var_GCJ=no
16933 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 17424 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
16934 archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 17425 archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17426 archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
16935 hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' 17427 hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
16936 export_dynamic_flag_spec_GCJ='${wl}-E' 17428 export_dynamic_flag_spec_GCJ='${wl}-E'
16937 else 17429 else
@@ -16977,7 +17469,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16977 allow_undefined_flag_GCJ=' -expect_unresolved \*' 17469 allow_undefined_flag_GCJ=' -expect_unresolved \*'
16978 archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' 17470 archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
16979 archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ 17471 archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
16980 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' 17472 $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
16981 17473
16982 # Both c and cxx compiler support -rpath directly 17474 # Both c and cxx compiler support -rpath directly
16983 hardcode_libdir_flag_spec_GCJ='-rpath $libdir' 17475 hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -16996,10 +17488,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16996 solaris*) 17488 solaris*)
16997 no_undefined_flag_GCJ=' -z text' 17489 no_undefined_flag_GCJ=' -z text'
16998 if test "$GCC" = yes; then 17490 if test "$GCC" = yes; then
17491 wlarc='${wl}'
16999 archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 17492 archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17000 archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 17493 archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
17001 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' 17494 $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
17002 else 17495 else
17496 wlarc=''
17003 archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' 17497 archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
17004 archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ 17498 archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
17005 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' 17499 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -17008,8 +17502,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17008 hardcode_shlibpath_var_GCJ=no 17502 hardcode_shlibpath_var_GCJ=no
17009 case $host_os in 17503 case $host_os in
17010 solaris2.[0-5] | solaris2.[0-5].*) ;; 17504 solaris2.[0-5] | solaris2.[0-5].*) ;;
17011 *) # Supported since Solaris 2.6 (maybe 2.5.1?) 17505 *)
17012 whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; 17506 # The compiler driver will combine linker options so we
17507 # cannot just pass the convience library names through
17508 # without $wl, iff we do not link with $LD.
17509 # Luckily, gcc supports the same syntax we need for Sun Studio.
17510 # Supported since Solaris 2.6 (maybe 2.5.1?)
17511 case $wlarc in
17512 '')
17513 whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
17514 *)
17515 whole_archive_flag_spec_GCJ='${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' ;;
17516 esac ;;
17013 esac 17517 esac
17014 link_all_deplibs_GCJ=yes 17518 link_all_deplibs_GCJ=yes
17015 ;; 17519 ;;
@@ -17283,7 +17787,7 @@ beos*)
17283 shlibpath_var=LIBRARY_PATH 17787 shlibpath_var=LIBRARY_PATH
17284 ;; 17788 ;;
17285 17789
17286bsdi4*) 17790bsdi[45]*)
17287 version_type=linux 17791 version_type=linux
17288 need_version=no 17792 need_version=no
17289 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 17793 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -17311,7 +17815,8 @@ cygwin* | mingw* | pw32*)
17311 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ 17815 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
17312 dldir=$destdir/`dirname \$dlpath`~ 17816 dldir=$destdir/`dirname \$dlpath`~
17313 test -d \$dldir || mkdir -p \$dldir~ 17817 test -d \$dldir || mkdir -p \$dldir~
17314 $install_prog $dir/$dlname \$dldir/$dlname' 17818 $install_prog $dir/$dlname \$dldir/$dlname~
17819 chmod a+x \$dldir/$dlname'
17315 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 17820 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
17316 dlpath=$dir/\$dldll~ 17821 dlpath=$dir/\$dldll~
17317 $rm \$dlpath' 17822 $rm \$dlpath'
@@ -17341,7 +17846,7 @@ cygwin* | mingw* | pw32*)
17341 ;; 17846 ;;
17342 pw32*) 17847 pw32*)
17343 # pw32 DLLs use 'pw' prefix rather than 'lib' 17848 # pw32 DLLs use 'pw' prefix rather than 'lib'
17344 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' 17849 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17345 ;; 17850 ;;
17346 esac 17851 esac
17347 ;; 17852 ;;
@@ -17364,7 +17869,7 @@ darwin* | rhapsody*)
17364 soname_spec='${libname}${release}${major}$shared_ext' 17869 soname_spec='${libname}${release}${major}$shared_ext'
17365 shlibpath_overrides_runpath=yes 17870 shlibpath_overrides_runpath=yes
17366 shlibpath_var=DYLD_LIBRARY_PATH 17871 shlibpath_var=DYLD_LIBRARY_PATH
17367 shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' 17872 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
17368 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. 17873 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
17369 if test "$GCC" = yes; then 17874 if test "$GCC" = yes; then
17370 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"` 17875 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"`
@@ -17399,8 +17904,17 @@ kfreebsd*-gnu)
17399 dynamic_linker='GNU ld.so' 17904 dynamic_linker='GNU ld.so'
17400 ;; 17905 ;;
17401 17906
17402freebsd*) 17907freebsd* | dragonfly*)
17403 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 17908 # DragonFly does not have aout. When/if they implement a new
17909 # versioning mechanism, adjust this.
17910 if test -x /usr/bin/objformat; then
17911 objformat=`/usr/bin/objformat`
17912 else
17913 case $host_os in
17914 freebsd[123]*) objformat=aout ;;
17915 *) objformat=elf ;;
17916 esac
17917 fi
17404 version_type=freebsd-$objformat 17918 version_type=freebsd-$objformat
17405 case $version_type in 17919 case $version_type in
17406 freebsd-elf*) 17920 freebsd-elf*)
@@ -17418,7 +17932,7 @@ freebsd*)
17418 freebsd2*) 17932 freebsd2*)
17419 shlibpath_overrides_runpath=yes 17933 shlibpath_overrides_runpath=yes
17420 ;; 17934 ;;
17421 freebsd3.01* | freebsdelf3.01*) 17935 freebsd3.[01]* | freebsdelf3.[01]*)
17422 shlibpath_overrides_runpath=yes 17936 shlibpath_overrides_runpath=yes
17423 hardcode_into_libs=yes 17937 hardcode_into_libs=yes
17424 ;; 17938 ;;
@@ -17445,7 +17959,7 @@ hpux9* | hpux10* | hpux11*)
17445 version_type=sunos 17959 version_type=sunos
17446 need_lib_prefix=no 17960 need_lib_prefix=no
17447 need_version=no 17961 need_version=no
17448 case "$host_cpu" in 17962 case $host_cpu in
17449 ia64*) 17963 ia64*)
17450 shrext_cmds='.so' 17964 shrext_cmds='.so'
17451 hardcode_into_libs=yes 17965 hardcode_into_libs=yes
@@ -17544,7 +18058,7 @@ linux*)
17544 18058
17545 # Append ld.so.conf contents to the search path 18059 # Append ld.so.conf contents to the search path
17546 if test -f /etc/ld.so.conf; then 18060 if test -f /etc/ld.so.conf; then
17547 lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` 18061 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' ' '`
17548 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 18062 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
17549 fi 18063 fi
17550 18064
@@ -17619,7 +18133,11 @@ nto-qnx*)
17619openbsd*) 18133openbsd*)
17620 version_type=sunos 18134 version_type=sunos
17621 need_lib_prefix=no 18135 need_lib_prefix=no
17622 need_version=yes 18136 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
18137 case $host_os in
18138 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
18139 *) need_version=no ;;
18140 esac
17623 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 18141 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
17624 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 18142 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
17625 shlibpath_var=LD_LIBRARY_PATH 18143 shlibpath_var=LD_LIBRARY_PATH
@@ -17741,8 +18259,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
17741echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 18259echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
17742hardcode_action_GCJ= 18260hardcode_action_GCJ=
17743if test -n "$hardcode_libdir_flag_spec_GCJ" || \ 18261if test -n "$hardcode_libdir_flag_spec_GCJ" || \
17744 test -n "$runpath_var GCJ" || \ 18262 test -n "$runpath_var_GCJ" || \
17745 test "X$hardcode_automatic_GCJ"="Xyes" ; then 18263 test "X$hardcode_automatic_GCJ" = "Xyes" ; then
17746 18264
17747 # We can hardcode non-existant directories. 18265 # We can hardcode non-existant directories.
17748 if test "$hardcode_direct_GCJ" != no && 18266 if test "$hardcode_direct_GCJ" != no &&
@@ -18401,7 +18919,7 @@ else
18401 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 18919 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18402 lt_status=$lt_dlunknown 18920 lt_status=$lt_dlunknown
18403 cat > conftest.$ac_ext <<EOF 18921 cat > conftest.$ac_ext <<EOF
18404#line 18404 "configure" 18922#line 18922 "configure"
18405#include "confdefs.h" 18923#include "confdefs.h"
18406 18924
18407#if HAVE_DLFCN_H 18925#if HAVE_DLFCN_H
@@ -18467,7 +18985,7 @@ EOF
18467 ac_status=$? 18985 ac_status=$?
18468 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18986 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18469 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 18987 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
18470 (./conftest; exit; ) 2>/dev/null 18988 (./conftest; exit; ) >&5 2>/dev/null
18471 lt_status=$? 18989 lt_status=$?
18472 case x$lt_status in 18990 case x$lt_status in
18473 x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; 18991 x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -18499,7 +19017,7 @@ else
18499 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 19017 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18500 lt_status=$lt_dlunknown 19018 lt_status=$lt_dlunknown
18501 cat > conftest.$ac_ext <<EOF 19019 cat > conftest.$ac_ext <<EOF
18502#line 18502 "configure" 19020#line 19020 "configure"
18503#include "confdefs.h" 19021#include "confdefs.h"
18504 19022
18505#if HAVE_DLFCN_H 19023#if HAVE_DLFCN_H
@@ -18565,7 +19083,7 @@ EOF
18565 ac_status=$? 19083 ac_status=$?
18566 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19084 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18567 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 19085 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
18568 (./conftest; exit; ) 2>/dev/null 19086 (./conftest; exit; ) >&5 2>/dev/null
18569 lt_status=$? 19087 lt_status=$?
18570 case x$lt_status in 19088 case x$lt_status in
18571 x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; 19089 x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -18717,6 +19235,12 @@ fast_install=$enable_fast_install
18717# The host system. 19235# The host system.
18718host_alias=$host_alias 19236host_alias=$host_alias
18719host=$host 19237host=$host
19238host_os=$host_os
19239
19240# The build system.
19241build_alias=$build_alias
19242build=$build
19243build_os=$build_os
18720 19244
18721# An echo program that does not interpret backslashes. 19245# An echo program that does not interpret backslashes.
18722echo=$lt_echo 19246echo=$lt_echo
@@ -18793,7 +19317,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
18793# Does compiler simultaneously support -c and -o options? 19317# Does compiler simultaneously support -c and -o options?
18794compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ 19318compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
18795 19319
18796# Must we lock files when doing compilation ? 19320# Must we lock files when doing compilation?
18797need_locks=$lt_need_locks 19321need_locks=$lt_need_locks
18798 19322
18799# Do we need the lib prefix for modules? 19323# Do we need the lib prefix for modules?
@@ -19041,11 +19565,35 @@ LTCC=${LTCC-"$CC"}
19041compiler=$CC 19565compiler=$CC
19042 19566
19043 19567
19568# save warnings/boilerplate of simple test code
19569ac_outfile=conftest.$ac_objext
19570printf "$lt_simple_compile_test_code" >conftest.$ac_ext
19571eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
19572_lt_compiler_boilerplate=`cat conftest.err`
19573$rm conftest*
19574
19575ac_outfile=conftest.$ac_objext
19576printf "$lt_simple_link_test_code" >conftest.$ac_ext
19577eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
19578_lt_linker_boilerplate=`cat conftest.err`
19579$rm conftest*
19580
19581
19044# Allow CC to be a program name with arguments. 19582# Allow CC to be a program name with arguments.
19045lt_save_CC="$CC" 19583lt_save_CC="$CC"
19046CC=${RC-"windres"} 19584CC=${RC-"windres"}
19047compiler=$CC 19585compiler=$CC
19048compiler_RC=$CC 19586compiler_RC=$CC
19587for cc_temp in $compiler""; do
19588 case $cc_temp in
19589 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
19590 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
19591 \-*) ;;
19592 *) break;;
19593 esac
19594done
19595cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
19596
19049lt_cv_prog_compiler_c_o_RC=yes 19597lt_cv_prog_compiler_c_o_RC=yes
19050 19598
19051# The else clause should only fire when bootstrapping the 19599# The else clause should only fire when bootstrapping the
@@ -19162,6 +19710,12 @@ fast_install=$enable_fast_install
19162# The host system. 19710# The host system.
19163host_alias=$host_alias 19711host_alias=$host_alias
19164host=$host 19712host=$host
19713host_os=$host_os
19714
19715# The build system.
19716build_alias=$build_alias
19717build=$build
19718build_os=$build_os
19165 19719
19166# An echo program that does not interpret backslashes. 19720# An echo program that does not interpret backslashes.
19167echo=$lt_echo 19721echo=$lt_echo
@@ -19238,7 +19792,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
19238# Does compiler simultaneously support -c and -o options? 19792# Does compiler simultaneously support -c and -o options?
19239compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC 19793compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
19240 19794
19241# Must we lock files when doing compilation ? 19795# Must we lock files when doing compilation?
19242need_locks=$lt_need_locks 19796need_locks=$lt_need_locks
19243 19797
19244# Do we need the lib prefix for modules? 19798# Do we need the lib prefix for modules?
@@ -20716,7 +21270,7 @@ else
20716 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 21270 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20717 lt_status=$lt_dlunknown 21271 lt_status=$lt_dlunknown
20718 cat > conftest.$ac_ext <<EOF 21272 cat > conftest.$ac_ext <<EOF
20719#line 20719 "configure" 21273#line 21273 "configure"
20720#include "confdefs.h" 21274#include "confdefs.h"
20721 21275
20722#if HAVE_DLFCN_H 21276#if HAVE_DLFCN_H
@@ -20782,7 +21336,7 @@ EOF
20782 ac_status=$? 21336 ac_status=$?
20783 echo "$as_me:$LINENO: \$? = $ac_status" >&5 21337 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20784 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 21338 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
20785 (./conftest; exit; ) 2>/dev/null 21339 (./conftest; exit; ) >&5 2>/dev/null
20786 lt_status=$? 21340 lt_status=$?
20787 case x$lt_status in 21341 case x$lt_status in
20788 x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;; 21342 x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
diff --git a/libltdl/ltmain.sh b/libltdl/ltmain.sh
index 1a224ac2..db4982d8 100644
--- a/libltdl/ltmain.sh
+++ b/libltdl/ltmain.sh
@@ -1,7 +1,7 @@
1# ltmain.sh - Provide generalized library-building support services. 1# ltmain.sh - Provide generalized library-building support services.
2# NOTE: Changing this file will not affect anything until you rerun configure. 2# NOTE: Changing this file will not affect anything until you rerun configure.
3# 3#
4# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 4# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 6# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
7# 7#
@@ -17,7 +17,7 @@
17# 17#
18# You should have received a copy of the GNU General Public License 18# You should have received a copy of the GNU General Public License
19# along with this program; if not, write to the Free Software 19# along with this program; if not, write to the Free Software
20# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21# 21#
22# As a special exception to the GNU General Public License, if you 22# As a special exception to the GNU General Public License, if you
23# distribute this file as part of a program that contains a 23# distribute this file as part of a program that contains a
@@ -43,9 +43,14 @@ EXIT_FAILURE=1
43 43
44PROGRAM=ltmain.sh 44PROGRAM=ltmain.sh
45PACKAGE=libtool 45PACKAGE=libtool
46VERSION=1.5.6 46VERSION="1.5.20 Debian 1.5.20-2"
47TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $" 47TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
48 48
49# See if we are running on zsh, and set the options which allow our
50# commands through without removal of \ escapes.
51if test -n "${ZSH_VERSION+set}" ; then
52 setopt NO_GLOB_SUBST
53fi
49 54
50# Check that we have a working $echo. 55# Check that we have a working $echo.
51if test "X$1" = X--no-reexec; then 56if test "X$1" = X--no-reexec; then
@@ -83,14 +88,15 @@ rm="rm -f"
83Xsed="${SED}"' -e 1s/^X//' 88Xsed="${SED}"' -e 1s/^X//'
84sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' 89sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
85# test EBCDIC or ASCII 90# test EBCDIC or ASCII
86case `echo A|tr A '\301'` in 91case `echo X|tr X '\101'` in
87 A) # EBCDIC based system 92 A) # ASCII based system
88 SP2NL="tr '\100' '\n'" 93 # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
89 NL2SP="tr '\r\n' '\100\100'" 94 SP2NL='tr \040 \012'
95 NL2SP='tr \015\012 \040\040'
90 ;; 96 ;;
91 *) # Assume ASCII based system 97 *) # EBCDIC based system
92 SP2NL="tr '\040' '\012'" 98 SP2NL='tr \100 \n'
93 NL2SP="tr '\015\012' '\040\040'" 99 NL2SP='tr \r\n \100\100'
94 ;; 100 ;;
95esac 101esac
96 102
@@ -107,8 +113,9 @@ if test "${LANG+set}" = set; then
107fi 113fi
108 114
109# Make sure IFS has a sensible default 115# Make sure IFS has a sensible default
110: ${IFS=" 116lt_nl='
111"} 117'
118IFS=" $lt_nl"
112 119
113if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then 120if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
114 $echo "$modename: not configured to build any kind of library" 1>&2 121 $echo "$modename: not configured to build any kind of library" 1>&2
@@ -138,7 +145,8 @@ o2lo="s/\\.${objext}\$/.lo/"
138# Need a lot of goo to handle *both* DLLs and import libs 145# Need a lot of goo to handle *both* DLLs and import libs
139# Has to be a shell function in order to 'eat' the argument 146# Has to be a shell function in order to 'eat' the argument
140# that is supplied when $file_magic_command is called. 147# that is supplied when $file_magic_command is called.
141func_win32_libid () { 148func_win32_libid ()
149{
142 win32_libid_type="unknown" 150 win32_libid_type="unknown"
143 win32_fileres=`file -L $1 2>/dev/null` 151 win32_fileres=`file -L $1 2>/dev/null`
144 case $win32_fileres in 152 case $win32_fileres in
@@ -178,7 +186,8 @@ func_win32_libid () {
178# Only attempt this if the compiler in the base compile 186# Only attempt this if the compiler in the base compile
179# command doesn't match the default compiler. 187# command doesn't match the default compiler.
180# arg is usually of the form 'gcc ...' 188# arg is usually of the form 'gcc ...'
181func_infer_tag () { 189func_infer_tag ()
190{
182 if test -n "$available_tags" && test -z "$tagname"; then 191 if test -n "$available_tags" && test -z "$tagname"; then
183 CC_quoted= 192 CC_quoted=
184 for arg in $CC; do 193 for arg in $CC; do
@@ -235,6 +244,108 @@ func_infer_tag () {
235 esac 244 esac
236 fi 245 fi
237} 246}
247
248
249# func_extract_an_archive dir oldlib
250func_extract_an_archive ()
251{
252 f_ex_an_ar_dir="$1"; shift
253 f_ex_an_ar_oldlib="$1"
254
255 $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
256 $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
257 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
258 :
259 else
260 $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
261 exit $EXIT_FAILURE
262 fi
263}
264
265# func_extract_archives gentop oldlib ...
266func_extract_archives ()
267{
268 my_gentop="$1"; shift
269 my_oldlibs=${1+"$@"}
270 my_oldobjs=""
271 my_xlib=""
272 my_xabs=""
273 my_xdir=""
274 my_status=""
275
276 $show "${rm}r $my_gentop"
277 $run ${rm}r "$my_gentop"
278 $show "$mkdir $my_gentop"
279 $run $mkdir "$my_gentop"
280 my_status=$?
281 if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
282 exit $my_status
283 fi
284
285 for my_xlib in $my_oldlibs; do
286 # Extract the objects.
287 case $my_xlib in
288 [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
289 *) my_xabs=`pwd`"/$my_xlib" ;;
290 esac
291 my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
292 my_xdir="$my_gentop/$my_xlib"
293
294 $show "${rm}r $my_xdir"
295 $run ${rm}r "$my_xdir"
296 $show "$mkdir $my_xdir"
297 $run $mkdir "$my_xdir"
298 status=$?
299 if test "$status" -ne 0 && test ! -d "$my_xdir"; then
300 exit $status
301 fi
302 case $host in
303 *-darwin*)
304 $show "Extracting $my_xabs"
305 # Do not bother doing anything if just a dry run
306 if test -z "$run"; then
307 darwin_orig_dir=`pwd`
308 cd $my_xdir || exit $?
309 darwin_archive=$my_xabs
310 darwin_curdir=`pwd`
311 darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
312 darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
313 if test -n "$darwin_arches"; then
314 darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
315 darwin_arch=
316 $show "$darwin_base_archive has multiple architectures $darwin_arches"
317 for darwin_arch in $darwin_arches ; do
318 mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
319 lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
320 cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
321 func_extract_an_archive "`pwd`" "${darwin_base_archive}"
322 cd "$darwin_curdir"
323 $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
324 done # $darwin_arches
325 ## Okay now we have a bunch of thin objects, gotta fatten them up :)
326 darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
327 darwin_file=
328 darwin_files=
329 for darwin_file in $darwin_filelist; do
330 darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
331 lipo -create -output "$darwin_file" $darwin_files
332 done # $darwin_filelist
333 ${rm}r unfat-$$
334 cd "$darwin_orig_dir"
335 else
336 cd "$darwin_orig_dir"
337 func_extract_an_archive "$my_xdir" "$my_xabs"
338 fi # $darwin_arches
339 fi # $run
340 ;;
341 *)
342 func_extract_an_archive "$my_xdir" "$my_xabs"
343 ;;
344 esac
345 my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
346 done
347 func_extract_archives_result="$my_oldobjs"
348}
238# End of Shell function definitions 349# End of Shell function definitions
239##################################### 350#####################################
240 351
@@ -305,10 +416,10 @@ do
305 --version) 416 --version)
306 $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" 417 $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
307 $echo 418 $echo
308 $echo "Copyright (C) 2003 Free Software Foundation, Inc." 419 $echo "Copyright (C) 2005 Free Software Foundation, Inc."
309 $echo "This is free software; see the source for copying conditions. There is NO" 420 $echo "This is free software; see the source for copying conditions. There is NO"
310 $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 421 $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
311 exit $EXIT_SUCCESS 422 exit $?
312 ;; 423 ;;
313 424
314 --config) 425 --config)
@@ -317,7 +428,7 @@ do
317 for tagname in $taglist; do 428 for tagname in $taglist; do
318 ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" 429 ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
319 done 430 done
320 exit $EXIT_SUCCESS 431 exit $?
321 ;; 432 ;;
322 433
323 --debug) 434 --debug)
@@ -342,7 +453,7 @@ do
342 else 453 else
343 $echo "disable static libraries" 454 $echo "disable static libraries"
344 fi 455 fi
345 exit $EXIT_SUCCESS 456 exit $?
346 ;; 457 ;;
347 458
348 --finish) mode="finish" ;; 459 --finish) mode="finish" ;;
@@ -399,7 +510,7 @@ if test -z "$show_help"; then
399 # Infer the operation mode. 510 # Infer the operation mode.
400 if test -z "$mode"; then 511 if test -z "$mode"; then
401 $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 512 $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
402 $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 513 $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
403 case $nonopt in 514 case $nonopt in
404 *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) 515 *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
405 mode=link 516 mode=link
@@ -465,7 +576,7 @@ if test -z "$show_help"; then
465 576
466 for arg 577 for arg
467 do 578 do
468 case "$arg_mode" in 579 case $arg_mode in
469 arg ) 580 arg )
470 # do not "continue". Instead, add this to base_compile 581 # do not "continue". Instead, add this to base_compile
471 lastarg="$arg" 582 lastarg="$arg"
@@ -547,7 +658,10 @@ if test -z "$show_help"; then
547 case $lastarg in 658 case $lastarg in
548 # Double-quote args containing other shell metacharacters. 659 # Double-quote args containing other shell metacharacters.
549 # Many Bourne shells cannot handle close brackets correctly 660 # Many Bourne shells cannot handle close brackets correctly
550 # in scan sets, so we specify it separately. 661 # in scan sets, and some SunOS ksh mistreat backslash-escaping
662 # in scan sets (worked around with variable expansion),
663 # and furthermore cannot handle '|' '&' '(' ')' in scan sets
664 # at all, so we specify them separately.
551 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") 665 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
552 lastarg="\"$lastarg\"" 666 lastarg="\"$lastarg\""
553 ;; 667 ;;
@@ -621,6 +735,14 @@ if test -z "$show_help"; then
621 esac 735 esac
622 done 736 done
623 737
738 qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
739 case $qlibobj in
740 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
741 qlibobj="\"$qlibobj\"" ;;
742 esac
743 test "X$libobj" != "X$qlibobj" \
744 && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
745 && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
624 objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` 746 objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
625 xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` 747 xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
626 if test "X$xdir" = "X$obj"; then 748 if test "X$xdir" = "X$obj"; then
@@ -693,12 +815,17 @@ compiler."
693 $run $rm $removelist 815 $run $rm $removelist
694 exit $EXIT_FAILURE 816 exit $EXIT_FAILURE
695 fi 817 fi
696 $echo $srcfile > "$lockfile" 818 $echo "$srcfile" > "$lockfile"
697 fi 819 fi
698 820
699 if test -n "$fix_srcfile_path"; then 821 if test -n "$fix_srcfile_path"; then
700 eval srcfile=\"$fix_srcfile_path\" 822 eval srcfile=\"$fix_srcfile_path\"
701 fi 823 fi
824 qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
825 case $qsrcfile in
826 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
827 qsrcfile="\"$qsrcfile\"" ;;
828 esac
702 829
703 $run $rm "$libobj" "${libobj}T" 830 $run $rm "$libobj" "${libobj}T"
704 831
@@ -720,10 +847,10 @@ EOF
720 fbsd_hideous_sh_bug=$base_compile 847 fbsd_hideous_sh_bug=$base_compile
721 848
722 if test "$pic_mode" != no; then 849 if test "$pic_mode" != no; then
723 command="$base_compile $srcfile $pic_flag" 850 command="$base_compile $qsrcfile $pic_flag"
724 else 851 else
725 # Don't build PIC code 852 # Don't build PIC code
726 command="$base_compile $srcfile" 853 command="$base_compile $qsrcfile"
727 fi 854 fi
728 855
729 if test ! -d "${xdir}$objdir"; then 856 if test ! -d "${xdir}$objdir"; then
@@ -803,9 +930,9 @@ EOF
803 if test "$build_old_libs" = yes; then 930 if test "$build_old_libs" = yes; then
804 if test "$pic_mode" != yes; then 931 if test "$pic_mode" != yes; then
805 # Don't build PIC code 932 # Don't build PIC code
806 command="$base_compile $srcfile" 933 command="$base_compile $qsrcfile"
807 else 934 else
808 command="$base_compile $srcfile $pic_flag" 935 command="$base_compile $qsrcfile $pic_flag"
809 fi 936 fi
810 if test "$compiler_c_o" = yes; then 937 if test "$compiler_c_o" = yes; then
811 command="$command -o $obj" 938 command="$command -o $obj"
@@ -1227,6 +1354,13 @@ EOF
1227 prev= 1354 prev=
1228 continue 1355 continue
1229 ;; 1356 ;;
1357 darwin_framework)
1358 compiler_flags="$compiler_flags $arg"
1359 compile_command="$compile_command $arg"
1360 finalize_command="$finalize_command $arg"
1361 prev=
1362 continue
1363 ;;
1230 *) 1364 *)
1231 eval "$prev=\"\$arg\"" 1365 eval "$prev=\"\$arg\""
1232 prev= 1366 prev=
@@ -1285,6 +1419,14 @@ EOF
1285 continue 1419 continue
1286 ;; 1420 ;;
1287 1421
1422 -framework|-arch)
1423 prev=darwin_framework
1424 compiler_flags="$compiler_flags $arg"
1425 compile_command="$compile_command $arg"
1426 finalize_command="$finalize_command $arg"
1427 continue
1428 ;;
1429
1288 -inst-prefix-dir) 1430 -inst-prefix-dir)
1289 prev=inst_prefix 1431 prev=inst_prefix
1290 continue 1432 continue
@@ -1345,7 +1487,7 @@ EOF
1345 # These systems don't actually have a C library (as such) 1487 # These systems don't actually have a C library (as such)
1346 test "X$arg" = "X-lc" && continue 1488 test "X$arg" = "X-lc" && continue
1347 ;; 1489 ;;
1348 *-*-openbsd* | *-*-freebsd*) 1490 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
1349 # Do not include libc due to us having libc/libc_r. 1491 # Do not include libc due to us having libc/libc_r.
1350 test "X$arg" = "X-lc" && continue 1492 test "X$arg" = "X-lc" && continue
1351 ;; 1493 ;;
@@ -1356,7 +1498,7 @@ EOF
1356 esac 1498 esac
1357 elif test "X$arg" = "X-lc_r"; then 1499 elif test "X$arg" = "X-lc_r"; then
1358 case $host in 1500 case $host in
1359 *-*-openbsd* | *-*-freebsd*) 1501 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
1360 # Do not include libc_r directly, use -pthread flag. 1502 # Do not include libc_r directly, use -pthread flag.
1361 continue 1503 continue
1362 ;; 1504 ;;
@@ -1366,8 +1508,20 @@ EOF
1366 continue 1508 continue
1367 ;; 1509 ;;
1368 1510
1511 # Tru64 UNIX uses -model [arg] to determine the layout of C++
1512 # classes, name mangling, and exception handling.
1513 -model)
1514 compile_command="$compile_command $arg"
1515 compiler_flags="$compiler_flags $arg"
1516 finalize_command="$finalize_command $arg"
1517 prev=xcompiler
1518 continue
1519 ;;
1520
1369 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) 1521 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
1370 deplibs="$deplibs $arg" 1522 compiler_flags="$compiler_flags $arg"
1523 compile_command="$compile_command $arg"
1524 finalize_command="$finalize_command $arg"
1371 continue 1525 continue
1372 ;; 1526 ;;
1373 1527
@@ -1376,13 +1530,14 @@ EOF
1376 continue 1530 continue
1377 ;; 1531 ;;
1378 1532
1379 # gcc -m* arguments should be passed to the linker via $compiler_flags 1533 # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
1380 # in order to pass architecture information to the linker 1534 # -r[0-9][0-9]* specifies the processor on the SGI compiler
1381 # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo 1535 # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
1382 # but this is not reliable with gcc because gcc may use -mfoo to 1536 # +DA*, +DD* enable 64-bit mode on the HP compiler
1383 # select a different linker, different libraries, etc, while 1537 # -q* pass through compiler args for the IBM compiler
1384 # -Wl,-mfoo simply passes -mfoo to the linker. 1538 # -m* pass through architecture-specific compiler args for GCC
1385 -m*) 1539 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
1540
1386 # Unknown arguments in both finalize_command and compile_command need 1541 # Unknown arguments in both finalize_command and compile_command need
1387 # to be aesthetically quoted because they are evaled later. 1542 # to be aesthetically quoted because they are evaled later.
1388 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` 1543 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -1858,7 +2013,7 @@ EOF
1858 compile_deplibs="$deplib $compile_deplibs" 2013 compile_deplibs="$deplib $compile_deplibs"
1859 finalize_deplibs="$deplib $finalize_deplibs" 2014 finalize_deplibs="$deplib $finalize_deplibs"
1860 else 2015 else
1861 deplibs="$deplib $deplibs" 2016 compiler_flags="$compiler_flags $deplib"
1862 fi 2017 fi
1863 continue 2018 continue
1864 ;; 2019 ;;
@@ -1977,7 +2132,22 @@ EOF
1977 fi 2132 fi
1978 case $linkmode in 2133 case $linkmode in
1979 lib) 2134 lib)
1980 if test "$deplibs_check_method" != pass_all; then 2135 valid_a_lib=no
2136 case $deplibs_check_method in
2137 match_pattern*)
2138 set dummy $deplibs_check_method
2139 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
2140 if eval $echo \"$deplib\" 2>/dev/null \
2141 | $SED 10q \
2142 | $EGREP "$match_pattern_regex" > /dev/null; then
2143 valid_a_lib=yes
2144 fi
2145 ;;
2146 pass_all)
2147 valid_a_lib=yes
2148 ;;
2149 esac
2150 if test "$valid_a_lib" != yes; then
1981 $echo 2151 $echo
1982 $echo "*** Warning: Trying to link with static lib archive $deplib." 2152 $echo "*** Warning: Trying to link with static lib archive $deplib."
1983 $echo "*** I have the capability to make that library automatically link in when" 2153 $echo "*** I have the capability to make that library automatically link in when"
@@ -2051,6 +2221,8 @@ EOF
2051 # it will not redefine variables installed, or shouldnotlink 2221 # it will not redefine variables installed, or shouldnotlink
2052 installed=yes 2222 installed=yes
2053 shouldnotlink=no 2223 shouldnotlink=no
2224 avoidtemprpath=
2225
2054 2226
2055 # Read the .la file 2227 # Read the .la file
2056 case $lib in 2228 case $lib in
@@ -2149,11 +2321,19 @@ EOF
2149 dir="$libdir" 2321 dir="$libdir"
2150 absdir="$libdir" 2322 absdir="$libdir"
2151 fi 2323 fi
2324 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
2152 else 2325 else
2153 dir="$ladir/$objdir" 2326 if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
2154 absdir="$abs_ladir/$objdir" 2327 dir="$ladir"
2155 # Remove this search path later 2328 absdir="$abs_ladir"
2156 notinst_path="$notinst_path $abs_ladir" 2329 # Remove this search path later
2330 notinst_path="$notinst_path $abs_ladir"
2331 else
2332 dir="$ladir/$objdir"
2333 absdir="$abs_ladir/$objdir"
2334 # Remove this search path later
2335 notinst_path="$notinst_path $abs_ladir"
2336 fi
2157 fi # $installed = yes 2337 fi # $installed = yes
2158 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` 2338 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
2159 2339
@@ -2226,12 +2406,12 @@ EOF
2226 if test -n "$library_names" && 2406 if test -n "$library_names" &&
2227 { test "$prefer_static_libs" = no || test -z "$old_library"; }; then 2407 { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
2228 # We need to hardcode the library path 2408 # We need to hardcode the library path
2229 if test -n "$shlibpath_var"; then 2409 if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
2230 # Make sure the rpath contains only unique directories. 2410 # Make sure the rpath contains only unique directories.
2231 case "$temp_rpath " in 2411 case "$temp_rpath " in
2232 *" $dir "*) ;; 2412 *" $dir "*) ;;
2233 *" $absdir "*) ;; 2413 *" $absdir "*) ;;
2234 *) temp_rpath="$temp_rpath $dir" ;; 2414 *) temp_rpath="$temp_rpath $absdir" ;;
2235 esac 2415 esac
2236 fi 2416 fi
2237 2417
@@ -2417,7 +2597,7 @@ EOF
2417 add_dir="-L$dir" 2597 add_dir="-L$dir"
2418 # Try looking first in the location we're being installed to. 2598 # Try looking first in the location we're being installed to.
2419 if test -n "$inst_prefix_dir"; then 2599 if test -n "$inst_prefix_dir"; then
2420 case "$libdir" in 2600 case $libdir in
2421 [\\/]*) 2601 [\\/]*)
2422 add_dir="$add_dir -L$inst_prefix_dir$libdir" 2602 add_dir="$add_dir -L$inst_prefix_dir$libdir"
2423 ;; 2603 ;;
@@ -2490,7 +2670,7 @@ EOF
2490 add_dir="-L$libdir" 2670 add_dir="-L$libdir"
2491 # Try looking first in the location we're being installed to. 2671 # Try looking first in the location we're being installed to.
2492 if test -n "$inst_prefix_dir"; then 2672 if test -n "$inst_prefix_dir"; then
2493 case "$libdir" in 2673 case $libdir in
2494 [\\/]*) 2674 [\\/]*)
2495 add_dir="$add_dir -L$inst_prefix_dir$libdir" 2675 add_dir="$add_dir -L$inst_prefix_dir$libdir"
2496 ;; 2676 ;;
@@ -2551,8 +2731,6 @@ EOF
2551 fi 2731 fi
2552 fi 2732 fi
2553 else 2733 else
2554 convenience="$convenience $dir/$old_library"
2555 old_convenience="$old_convenience $dir/$old_library"
2556 deplibs="$dir/$old_library $deplibs" 2734 deplibs="$dir/$old_library $deplibs"
2557 link_static=yes 2735 link_static=yes
2558 fi 2736 fi
@@ -2670,12 +2848,12 @@ EOF
2670 *) continue ;; 2848 *) continue ;;
2671 esac 2849 esac
2672 case " $deplibs " in 2850 case " $deplibs " in
2673 *" $depdepl "*) ;; 2851 *" $path "*) ;;
2674 *) deplibs="$depdepl $deplibs" ;; 2852 *) deplibs="$path $deplibs" ;;
2675 esac 2853 esac
2676 case " $deplibs " in 2854 case " $deplibs " in
2677 *" $path "*) ;; 2855 *" $depdepl "*) ;;
2678 *) deplibs="$deplibs $path" ;; 2856 *) deplibs="$depdepl $deplibs" ;;
2679 esac 2857 esac
2680 done 2858 done
2681 fi # link_all_deplibs != no 2859 fi # link_all_deplibs != no
@@ -2947,7 +3125,7 @@ EOF
2947 case $current in 3125 case $current in
2948 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 3126 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
2949 *) 3127 *)
2950 $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 3128 $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
2951 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 3129 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
2952 exit $EXIT_FAILURE 3130 exit $EXIT_FAILURE
2953 ;; 3131 ;;
@@ -2956,7 +3134,7 @@ EOF
2956 case $revision in 3134 case $revision in
2957 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 3135 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
2958 *) 3136 *)
2959 $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 3137 $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
2960 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 3138 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
2961 exit $EXIT_FAILURE 3139 exit $EXIT_FAILURE
2962 ;; 3140 ;;
@@ -2965,7 +3143,7 @@ EOF
2965 case $age in 3143 case $age in
2966 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 3144 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
2967 *) 3145 *)
2968 $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 3146 $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
2969 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 3147 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
2970 exit $EXIT_FAILURE 3148 exit $EXIT_FAILURE
2971 ;; 3149 ;;
@@ -2991,7 +3169,7 @@ EOF
2991 versuffix="$major.$age.$revision" 3169 versuffix="$major.$age.$revision"
2992 # Darwin ld doesn't like 0 for these options... 3170 # Darwin ld doesn't like 0 for these options...
2993 minor_current=`expr $current + 1` 3171 minor_current=`expr $current + 1`
2994 verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" 3172 verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
2995 ;; 3173 ;;
2996 3174
2997 freebsd-aout) 3175 freebsd-aout)
@@ -3197,7 +3375,7 @@ EOF
3197 *-*-netbsd*) 3375 *-*-netbsd*)
3198 # Don't link with libc until the a.out ld.so is fixed. 3376 # Don't link with libc until the a.out ld.so is fixed.
3199 ;; 3377 ;;
3200 *-*-openbsd* | *-*-freebsd*) 3378 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
3201 # Do not include libc due to us having libc/libc_r. 3379 # Do not include libc due to us having libc/libc_r.
3202 test "X$arg" = "X-lc" && continue 3380 test "X$arg" = "X-lc" && continue
3203 ;; 3381 ;;
@@ -3247,7 +3425,7 @@ EOF
3247 if test "$?" -eq 0 ; then 3425 if test "$?" -eq 0 ; then
3248 ldd_output=`ldd conftest` 3426 ldd_output=`ldd conftest`
3249 for i in $deplibs; do 3427 for i in $deplibs; do
3250 name="`expr $i : '-l\(.*\)'`" 3428 name=`expr $i : '-l\(.*\)'`
3251 # If $name is empty we are operating on a -L argument. 3429 # If $name is empty we are operating on a -L argument.
3252 if test "$name" != "" && test "$name" -ne "0"; then 3430 if test "$name" != "" && test "$name" -ne "0"; then
3253 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 3431 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3284,7 +3462,7 @@ EOF
3284 # Error occurred in the first compile. Let's try to salvage 3462 # Error occurred in the first compile. Let's try to salvage
3285 # the situation: Compile a separate program for each library. 3463 # the situation: Compile a separate program for each library.
3286 for i in $deplibs; do 3464 for i in $deplibs; do
3287 name="`expr $i : '-l\(.*\)'`" 3465 name=`expr $i : '-l\(.*\)'`
3288 # If $name is empty we are operating on a -L argument. 3466 # If $name is empty we are operating on a -L argument.
3289 if test "$name" != "" && test "$name" != "0"; then 3467 if test "$name" != "" && test "$name" != "0"; then
3290 $rm conftest 3468 $rm conftest
@@ -3336,7 +3514,7 @@ EOF
3336 set dummy $deplibs_check_method 3514 set dummy $deplibs_check_method
3337 file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` 3515 file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
3338 for a_deplib in $deplibs; do 3516 for a_deplib in $deplibs; do
3339 name="`expr $a_deplib : '-l\(.*\)'`" 3517 name=`expr $a_deplib : '-l\(.*\)'`
3340 # If $name is empty we are operating on a -L argument. 3518 # If $name is empty we are operating on a -L argument.
3341 if test "$name" != "" && test "$name" != "0"; then 3519 if test "$name" != "" && test "$name" != "0"; then
3342 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 3520 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3405,7 +3583,7 @@ EOF
3405 set dummy $deplibs_check_method 3583 set dummy $deplibs_check_method
3406 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` 3584 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
3407 for a_deplib in $deplibs; do 3585 for a_deplib in $deplibs; do
3408 name="`expr $a_deplib : '-l\(.*\)'`" 3586 name=`expr $a_deplib : '-l\(.*\)'`
3409 # If $name is empty we are operating on a -L argument. 3587 # If $name is empty we are operating on a -L argument.
3410 if test -n "$name" && test "$name" != "0"; then 3588 if test -n "$name" && test "$name" != "0"; then
3411 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 3589 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3646,6 +3824,9 @@ EOF
3646 # The command line is too long to execute in one step. 3824 # The command line is too long to execute in one step.
3647 $show "using reloadable object file for export list..." 3825 $show "using reloadable object file for export list..."
3648 skipped_export=: 3826 skipped_export=:
3827 # Break out early, otherwise skipped_export may be
3828 # set to false by a later but shorter cmd.
3829 break
3649 fi 3830 fi
3650 done 3831 done
3651 IFS="$save_ifs" 3832 IFS="$save_ifs"
@@ -3679,67 +3860,13 @@ EOF
3679 eval libobjs=\"\$libobjs $whole_archive_flag_spec\" 3860 eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
3680 else 3861 else
3681 gentop="$output_objdir/${outputname}x" 3862 gentop="$output_objdir/${outputname}x"
3682 $show "${rm}r $gentop"
3683 $run ${rm}r "$gentop"
3684 $show "$mkdir $gentop"
3685 $run $mkdir "$gentop"
3686 status=$?
3687 if test "$status" -ne 0 && test ! -d "$gentop"; then
3688 exit $status
3689 fi
3690 generated="$generated $gentop" 3863 generated="$generated $gentop"
3691 3864
3692 for xlib in $convenience; do 3865 func_extract_archives $gentop $convenience
3693 # Extract the objects. 3866 libobjs="$libobjs $func_extract_archives_result"
3694 case $xlib in
3695 [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
3696 *) xabs=`pwd`"/$xlib" ;;
3697 esac
3698 xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
3699 xdir="$gentop/$xlib"
3700
3701 $show "${rm}r $xdir"
3702 $run ${rm}r "$xdir"
3703 $show "$mkdir $xdir"
3704 $run $mkdir "$xdir"
3705 status=$?
3706 if test "$status" -ne 0 && test ! -d "$xdir"; then
3707 exit $status
3708 fi
3709 # We will extract separately just the conflicting names and we will no
3710 # longer touch any unique names. It is faster to leave these extract
3711 # automatically by $AR in one run.
3712 $show "(cd $xdir && $AR x $xabs)"
3713 $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
3714 if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
3715 :
3716 else
3717 $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
3718 $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
3719 $AR t "$xabs" | sort | uniq -cd | while read -r count name
3720 do
3721 i=1
3722 while test "$i" -le "$count"
3723 do
3724 # Put our $i before any first dot (extension)
3725 # Never overwrite any file
3726 name_to="$name"
3727 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
3728 do
3729 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
3730 done
3731 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
3732 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
3733 i=`expr $i + 1`
3734 done
3735 done
3736 fi
3737
3738 libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
3739 done
3740 fi 3867 fi
3741 fi 3868 fi
3742 3869
3743 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then 3870 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
3744 eval flag=\"$thread_safe_flag_spec\" 3871 eval flag=\"$thread_safe_flag_spec\"
3745 linker_flags="$linker_flags $flag" 3872 linker_flags="$linker_flags $flag"
@@ -3769,7 +3896,8 @@ EOF
3769 fi 3896 fi
3770 fi 3897 fi
3771 3898
3772 if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && 3899 if test "X$skipped_export" != "X:" &&
3900 len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
3773 test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then 3901 test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
3774 : 3902 :
3775 else 3903 else
@@ -3788,6 +3916,7 @@ EOF
3788 save_libobjs=$libobjs 3916 save_libobjs=$libobjs
3789 fi 3917 fi
3790 save_output=$output 3918 save_output=$output
3919 output_la=`$echo "X$output" | $Xsed -e "$basename"`
3791 3920
3792 # Clear the reloadable object creation command queue and 3921 # Clear the reloadable object creation command queue and
3793 # initialize k to one. 3922 # initialize k to one.
@@ -3797,13 +3926,13 @@ EOF
3797 delfiles= 3926 delfiles=
3798 last_robj= 3927 last_robj=
3799 k=1 3928 k=1
3800 output=$output_objdir/$save_output-${k}.$objext 3929 output=$output_objdir/$output_la-${k}.$objext
3801 # Loop over the list of objects to be linked. 3930 # Loop over the list of objects to be linked.
3802 for obj in $save_libobjs 3931 for obj in $save_libobjs
3803 do 3932 do
3804 eval test_cmds=\"$reload_cmds $objlist $last_robj\" 3933 eval test_cmds=\"$reload_cmds $objlist $last_robj\"
3805 if test "X$objlist" = X || 3934 if test "X$objlist" = X ||
3806 { len=`expr "X$test_cmds" : ".*"` && 3935 { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
3807 test "$len" -le "$max_cmd_len"; }; then 3936 test "$len" -le "$max_cmd_len"; }; then
3808 objlist="$objlist $obj" 3937 objlist="$objlist $obj"
3809 else 3938 else
@@ -3817,9 +3946,9 @@ EOF
3817 # the last one created. 3946 # the last one created.
3818 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" 3947 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
3819 fi 3948 fi
3820 last_robj=$output_objdir/$save_output-${k}.$objext 3949 last_robj=$output_objdir/$output_la-${k}.$objext
3821 k=`expr $k + 1` 3950 k=`expr $k + 1`
3822 output=$output_objdir/$save_output-${k}.$objext 3951 output=$output_objdir/$output_la-${k}.$objext
3823 objlist=$obj 3952 objlist=$obj
3824 len=1 3953 len=1
3825 fi 3954 fi
@@ -3839,13 +3968,13 @@ EOF
3839 eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" 3968 eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
3840 fi 3969 fi
3841 3970
3842 # Set up a command to remove the reloadale object files 3971 # Set up a command to remove the reloadable object files
3843 # after they are used. 3972 # after they are used.
3844 i=0 3973 i=0
3845 while test "$i" -lt "$k" 3974 while test "$i" -lt "$k"
3846 do 3975 do
3847 i=`expr $i + 1` 3976 i=`expr $i + 1`
3848 delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" 3977 delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
3849 done 3978 done
3850 3979
3851 $echo "creating a temporary reloadable object file: $output" 3980 $echo "creating a temporary reloadable object file: $output"
@@ -3893,13 +4022,30 @@ EOF
3893 IFS="$save_ifs" 4022 IFS="$save_ifs"
3894 eval cmd=\"$cmd\" 4023 eval cmd=\"$cmd\"
3895 $show "$cmd" 4024 $show "$cmd"
3896 $run eval "$cmd" || exit $? 4025 $run eval "$cmd" || {
4026 lt_exit=$?
4027
4028 # Restore the uninstalled library and exit
4029 if test "$mode" = relink; then
4030 $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
4031 fi
4032
4033 exit $lt_exit
4034 }
3897 done 4035 done
3898 IFS="$save_ifs" 4036 IFS="$save_ifs"
3899 4037
3900 # Restore the uninstalled library and exit 4038 # Restore the uninstalled library and exit
3901 if test "$mode" = relink; then 4039 if test "$mode" = relink; then
3902 $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? 4040 $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
4041
4042 if test -n "$convenience"; then
4043 if test -z "$whole_archive_flag_spec"; then
4044 $show "${rm}r $gentop"
4045 $run ${rm}r "$gentop"
4046 fi
4047 fi
4048
3903 exit $EXIT_SUCCESS 4049 exit $EXIT_SUCCESS
3904 fi 4050 fi
3905 4051
@@ -3977,64 +4123,10 @@ EOF
3977 eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" 4123 eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
3978 else 4124 else
3979 gentop="$output_objdir/${obj}x" 4125 gentop="$output_objdir/${obj}x"
3980 $show "${rm}r $gentop"
3981 $run ${rm}r "$gentop"
3982 $show "$mkdir $gentop"
3983 $run $mkdir "$gentop"
3984 status=$?
3985 if test "$status" -ne 0 && test ! -d "$gentop"; then
3986 exit $status
3987 fi
3988 generated="$generated $gentop" 4126 generated="$generated $gentop"
3989 4127
3990 for xlib in $convenience; do 4128 func_extract_archives $gentop $convenience
3991 # Extract the objects. 4129 reload_conv_objs="$reload_objs $func_extract_archives_result"
3992 case $xlib in
3993 [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
3994 *) xabs=`pwd`"/$xlib" ;;
3995 esac
3996 xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
3997 xdir="$gentop/$xlib"
3998
3999 $show "${rm}r $xdir"
4000 $run ${rm}r "$xdir"
4001 $show "$mkdir $xdir"
4002 $run $mkdir "$xdir"
4003 status=$?
4004 if test "$status" -ne 0 && test ! -d "$xdir"; then
4005 exit $status
4006 fi
4007 # We will extract separately just the conflicting names and we will no
4008 # longer touch any unique names. It is faster to leave these extract
4009 # automatically by $AR in one run.
4010 $show "(cd $xdir && $AR x $xabs)"
4011 $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
4012 if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
4013 :
4014 else
4015 $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
4016 $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
4017 $AR t "$xabs" | sort | uniq -cd | while read -r count name
4018 do
4019 i=1
4020 while test "$i" -le "$count"
4021 do
4022 # Put our $i before any first dot (extension)
4023 # Never overwrite any file
4024 name_to="$name"
4025 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
4026 do
4027 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
4028 done
4029 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
4030 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
4031 i=`expr $i + 1`
4032 done
4033 done
4034 fi
4035
4036 reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4037 done
4038 fi 4130 fi
4039 fi 4131 fi
4040 4132
@@ -4296,12 +4388,12 @@ extern \"C\" {
4296 4388
4297 # Prepare the list of exported symbols 4389 # Prepare the list of exported symbols
4298 if test -z "$export_symbols"; then 4390 if test -z "$export_symbols"; then
4299 export_symbols="$output_objdir/$output.exp" 4391 export_symbols="$output_objdir/$outputname.exp"
4300 $run $rm $export_symbols 4392 $run $rm $export_symbols
4301 $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' 4393 $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
4302 else 4394 else
4303 $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' 4395 $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
4304 $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' 4396 $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
4305 $run eval 'mv "$nlist"T "$nlist"' 4397 $run eval 'mv "$nlist"T "$nlist"'
4306 fi 4398 fi
4307 fi 4399 fi
@@ -4353,7 +4445,26 @@ extern \"C\" {
4353#endif 4445#endif
4354 4446
4355/* The mapping between symbol names and symbols. */ 4447/* The mapping between symbol names and symbols. */
4448"
4449
4450 case $host in
4451 *cygwin* | *mingw* )
4452 $echo >> "$output_objdir/$dlsyms" "\
4453/* DATA imports from DLLs on WIN32 can't be const, because
4454 runtime relocations are performed -- see ld's documentation
4455 on pseudo-relocs */
4456struct {
4457"
4458 ;;
4459 * )
4460 $echo >> "$output_objdir/$dlsyms" "\
4356const struct { 4461const struct {
4462"
4463 ;;
4464 esac
4465
4466
4467 $echo >> "$output_objdir/$dlsyms" "\
4357 const char *name; 4468 const char *name;
4358 lt_ptr address; 4469 lt_ptr address;
4359} 4470}
@@ -4582,7 +4693,7 @@ static const void *lt_preloaded_setup() {
4582 esac 4693 esac
4583 case $host in 4694 case $host in
4584 *cygwin* | *mingw* ) 4695 *cygwin* | *mingw* )
4585 cwrappersource=`$echo ${objdir}/lt-${output}.c` 4696 cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
4586 cwrapper=`$echo ${output}.exe` 4697 cwrapper=`$echo ${output}.exe`
4587 $rm $cwrappersource $cwrapper 4698 $rm $cwrappersource $cwrapper
4588 trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 4699 trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -4681,6 +4792,7 @@ EOF
4681EOF 4792EOF
4682 4793
4683 cat >> $cwrappersource <<"EOF" 4794 cat >> $cwrappersource <<"EOF"
4795 return 127;
4684} 4796}
4685 4797
4686void * 4798void *
@@ -4815,7 +4927,7 @@ sed_quote_subst='$sed_quote_subst'
4815 4927
4816# The HP-UX ksh and POSIX shell print the target directory to stdout 4928# The HP-UX ksh and POSIX shell print the target directory to stdout
4817# if CDPATH is set. 4929# if CDPATH is set.
4818if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi 4930(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
4819 4931
4820relink_command=\"$relink_command\" 4932relink_command=\"$relink_command\"
4821 4933
@@ -4944,13 +5056,13 @@ else
4944 # Backslashes separate directories on plain windows 5056 # Backslashes separate directories on plain windows
4945 *-*-mingw | *-*-os2*) 5057 *-*-mingw | *-*-os2*)
4946 $echo >> $output "\ 5058 $echo >> $output "\
4947 exec \$progdir\\\\\$program \${1+\"\$@\"} 5059 exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4948" 5060"
4949 ;; 5061 ;;
4950 5062
4951 *) 5063 *)
4952 $echo >> $output "\ 5064 $echo >> $output "\
4953 exec \$progdir/\$program \${1+\"\$@\"} 5065 exec \"\$progdir/\$program\" \${1+\"\$@\"}
4954" 5066"
4955 ;; 5067 ;;
4956 esac 5068 esac
@@ -4960,7 +5072,7 @@ else
4960 fi 5072 fi
4961 else 5073 else
4962 # The program doesn't exist. 5074 # The program doesn't exist.
4963 \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 5075 \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
4964 \$echo \"This script is just a wrapper for \$program.\" 1>&2 5076 \$echo \"This script is just a wrapper for \$program.\" 1>&2
4965 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 5077 $echo \"See the $PACKAGE documentation for more information.\" 1>&2
4966 exit $EXIT_FAILURE 5078 exit $EXIT_FAILURE
@@ -4992,71 +5104,73 @@ fi\
4992 5104
4993 if test -n "$addlibs"; then 5105 if test -n "$addlibs"; then
4994 gentop="$output_objdir/${outputname}x" 5106 gentop="$output_objdir/${outputname}x"
4995 $show "${rm}r $gentop"
4996 $run ${rm}r "$gentop"
4997 $show "$mkdir $gentop"
4998 $run $mkdir "$gentop"
4999 status=$?
5000 if test "$status" -ne 0 && test ! -d "$gentop"; then
5001 exit $status
5002 fi
5003 generated="$generated $gentop" 5107 generated="$generated $gentop"
5004 5108
5005 # Add in members from convenience archives. 5109 func_extract_archives $gentop $addlibs
5006 for xlib in $addlibs; do 5110 oldobjs="$oldobjs $func_extract_archives_result"
5007 # Extract the objects.
5008 case $xlib in
5009 [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
5010 *) xabs=`pwd`"/$xlib" ;;
5011 esac
5012 xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
5013 xdir="$gentop/$xlib"
5014
5015 $show "${rm}r $xdir"
5016 $run ${rm}r "$xdir"
5017 $show "$mkdir $xdir"
5018 $run $mkdir "$xdir"
5019 status=$?
5020 if test "$status" -ne 0 && test ! -d "$xdir"; then
5021 exit $status
5022 fi
5023 # We will extract separately just the conflicting names and we will no
5024 # longer touch any unique names. It is faster to leave these extract
5025 # automatically by $AR in one run.
5026 $show "(cd $xdir && $AR x $xabs)"
5027 $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
5028 if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
5029 :
5030 else
5031 $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
5032 $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
5033 $AR t "$xabs" | sort | uniq -cd | while read -r count name
5034 do
5035 i=1
5036 while test "$i" -le "$count"
5037 do
5038 # Put our $i before any first dot (extension)
5039 # Never overwrite any file
5040 name_to="$name"
5041 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
5042 do
5043 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
5044 done
5045 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
5046 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
5047 i=`expr $i + 1`
5048 done
5049 done
5050 fi
5051
5052 oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
5053 done
5054 fi 5111 fi
5055 5112
5056 # Do each command in the archive commands. 5113 # Do each command in the archive commands.
5057 if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then 5114 if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
5058 cmds=$old_archive_from_new_cmds 5115 cmds=$old_archive_from_new_cmds
5059 else 5116 else
5117 # POSIX demands no paths to be encoded in archives. We have
5118 # to avoid creating archives with duplicate basenames if we
5119 # might have to extract them afterwards, e.g., when creating a
5120 # static archive out of a convenience library, or when linking
5121 # the entirety of a libtool archive into another (currently
5122 # not supported by libtool).
5123 if (for obj in $oldobjs
5124 do
5125 $echo "X$obj" | $Xsed -e 's%^.*/%%'
5126 done | sort | sort -uc >/dev/null 2>&1); then
5127 :
5128 else
5129 $echo "copying selected object files to avoid basename conflicts..."
5130
5131 if test -z "$gentop"; then
5132 gentop="$output_objdir/${outputname}x"
5133 generated="$generated $gentop"
5134
5135 $show "${rm}r $gentop"
5136 $run ${rm}r "$gentop"
5137 $show "$mkdir $gentop"
5138 $run $mkdir "$gentop"
5139 status=$?
5140 if test "$status" -ne 0 && test ! -d "$gentop"; then
5141 exit $status
5142 fi
5143 fi
5144
5145 save_oldobjs=$oldobjs
5146 oldobjs=
5147 counter=1
5148 for obj in $save_oldobjs
5149 do
5150 objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
5151 case " $oldobjs " in
5152 " ") oldobjs=$obj ;;
5153 *[\ /]"$objbase "*)
5154 while :; do
5155 # Make sure we don't pick an alternate name that also
5156 # overlaps.
5157 newobj=lt$counter-$objbase
5158 counter=`expr $counter + 1`
5159 case " $oldobjs " in
5160 *[\ /]"$newobj "*) ;;
5161 *) if test ! -f "$gentop/$newobj"; then break; fi ;;
5162 esac
5163 done
5164 $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
5165 $run ln "$obj" "$gentop/$newobj" ||
5166 $run cp "$obj" "$gentop/$newobj"
5167 oldobjs="$oldobjs $gentop/$newobj"
5168 ;;
5169 *) oldobjs="$oldobjs $obj" ;;
5170 esac
5171 done
5172 fi
5173
5060 eval cmds=\"$old_archive_cmds\" 5174 eval cmds=\"$old_archive_cmds\"
5061 5175
5062 if len=`expr "X$cmds" : ".*"` && 5176 if len=`expr "X$cmds" : ".*"` &&
@@ -5070,20 +5184,7 @@ fi\
5070 objlist= 5184 objlist=
5071 concat_cmds= 5185 concat_cmds=
5072 save_oldobjs=$oldobjs 5186 save_oldobjs=$oldobjs
5073 # GNU ar 2.10+ was changed to match POSIX; thus no paths are 5187
5074 # encoded into archives. This makes 'ar r' malfunction in
5075 # this piecewise linking case whenever conflicting object
5076 # names appear in distinct ar calls; check, warn and compensate.
5077 if (for obj in $save_oldobjs
5078 do
5079 $echo "X$obj" | $Xsed -e 's%^.*/%%'
5080 done | sort | sort -uc >/dev/null 2>&1); then
5081 :
5082 else
5083 $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
5084 $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
5085 AR_FLAGS=cq
5086 fi
5087 # Is there a better way of finding the last object in the list? 5188 # Is there a better way of finding the last object in the list?
5088 for obj in $save_oldobjs 5189 for obj in $save_oldobjs
5089 do 5190 do
@@ -5094,7 +5195,7 @@ fi\
5094 oldobjs="$objlist $obj" 5195 oldobjs="$objlist $obj"
5095 objlist="$objlist $obj" 5196 objlist="$objlist $obj"
5096 eval test_cmds=\"$old_archive_cmds\" 5197 eval test_cmds=\"$old_archive_cmds\"
5097 if len=`expr "X$test_cmds" : ".*"` && 5198 if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
5098 test "$len" -le "$max_cmd_len"; then 5199 test "$len" -le "$max_cmd_len"; then
5099 : 5200 :
5100 else 5201 else
@@ -5291,11 +5392,11 @@ relink_command=\"$relink_command\""
5291 # install_prog (especially on Windows NT). 5392 # install_prog (especially on Windows NT).
5292 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || 5393 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
5293 # Allow the use of GNU shtool's install command. 5394 # Allow the use of GNU shtool's install command.
5294 $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then 5395 $echo "X$nonopt" | grep shtool > /dev/null; then
5295 # Aesthetically quote it. 5396 # Aesthetically quote it.
5296 arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` 5397 arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
5297 case $arg in 5398 case $arg in
5298 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) 5399 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
5299 arg="\"$arg\"" 5400 arg="\"$arg\""
5300 ;; 5401 ;;
5301 esac 5402 esac
@@ -5304,14 +5405,14 @@ relink_command=\"$relink_command\""
5304 shift 5405 shift
5305 else 5406 else
5306 install_prog= 5407 install_prog=
5307 arg="$nonopt" 5408 arg=$nonopt
5308 fi 5409 fi
5309 5410
5310 # The real first argument should be the name of the installation program. 5411 # The real first argument should be the name of the installation program.
5311 # Aesthetically quote it. 5412 # Aesthetically quote it.
5312 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` 5413 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
5313 case $arg in 5414 case $arg in
5314 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) 5415 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
5315 arg="\"$arg\"" 5416 arg="\"$arg\""
5316 ;; 5417 ;;
5317 esac 5418 esac
@@ -5329,28 +5430,31 @@ relink_command=\"$relink_command\""
5329 do 5430 do
5330 if test -n "$dest"; then 5431 if test -n "$dest"; then
5331 files="$files $dest" 5432 files="$files $dest"
5332 dest="$arg" 5433 dest=$arg
5333 continue 5434 continue
5334 fi 5435 fi
5335 5436
5336 case $arg in 5437 case $arg in
5337 -d) isdir=yes ;; 5438 -d) isdir=yes ;;
5338 -f) prev="-f" ;; 5439 -f)
5339 -g) prev="-g" ;; 5440 case " $install_prog " in
5340 -m) prev="-m" ;; 5441 *[\\\ /]cp\ *) ;;
5341 -o) prev="-o" ;; 5442 *) prev=$arg ;;
5443 esac
5444 ;;
5445 -g | -m | -o) prev=$arg ;;
5342 -s) 5446 -s)
5343 stripme=" -s" 5447 stripme=" -s"
5344 continue 5448 continue
5345 ;; 5449 ;;
5346 -*) ;; 5450 -*)
5347 5451 ;;
5348 *) 5452 *)
5349 # If the previous option needed an argument, then skip it. 5453 # If the previous option needed an argument, then skip it.
5350 if test -n "$prev"; then 5454 if test -n "$prev"; then
5351 prev= 5455 prev=
5352 else 5456 else
5353 dest="$arg" 5457 dest=$arg
5354 continue 5458 continue
5355 fi 5459 fi
5356 ;; 5460 ;;
@@ -5359,7 +5463,7 @@ relink_command=\"$relink_command\""
5359 # Aesthetically quote the argument. 5463 # Aesthetically quote the argument.
5360 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` 5464 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
5361 case $arg in 5465 case $arg in
5362 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) 5466 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
5363 arg="\"$arg\"" 5467 arg="\"$arg\""
5364 ;; 5468 ;;
5365 esac 5469 esac
@@ -5528,11 +5632,14 @@ relink_command=\"$relink_command\""
5528 5632
5529 if test "$#" -gt 0; then 5633 if test "$#" -gt 0; then
5530 # Delete the old symlinks, and create new ones. 5634 # Delete the old symlinks, and create new ones.
5635 # Try `ln -sf' first, because the `ln' binary might depend on
5636 # the symlink we replace! Solaris /bin/ln does not understand -f,
5637 # so we also need to try rm && ln -s.
5531 for linkname 5638 for linkname
5532 do 5639 do
5533 if test "$linkname" != "$realname"; then 5640 if test "$linkname" != "$realname"; then
5534 $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" 5641 $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
5535 $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" 5642 $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
5536 fi 5643 fi
5537 done 5644 done
5538 fi 5645 fi
@@ -5545,7 +5652,16 @@ relink_command=\"$relink_command\""
5545 IFS="$save_ifs" 5652 IFS="$save_ifs"
5546 eval cmd=\"$cmd\" 5653 eval cmd=\"$cmd\"
5547 $show "$cmd" 5654 $show "$cmd"
5548 $run eval "$cmd" || exit $? 5655 $run eval "$cmd" || {
5656 lt_exit=$?
5657
5658 # Restore the uninstalled library and exit
5659 if test "$mode" = relink; then
5660 $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
5661 fi
5662
5663 exit $lt_exit
5664 }
5549 done 5665 done
5550 IFS="$save_ifs" 5666 IFS="$save_ifs"
5551 fi 5667 fi
@@ -5639,17 +5755,15 @@ relink_command=\"$relink_command\""
5639 notinst_deplibs= 5755 notinst_deplibs=
5640 relink_command= 5756 relink_command=
5641 5757
5642 # To insure that "foo" is sourced, and not "foo.exe", 5758 # Note that it is not necessary on cygwin/mingw to append a dot to
5643 # finese the cygwin/MSYS system by explicitly sourcing "foo." 5759 # foo even if both foo and FILE.exe exist: automatic-append-.exe
5644 # which disallows the automatic-append-.exe behavior. 5760 # behavior happens only for exec(3), not for open(2)! Also, sourcing
5645 case $build in 5761 # `FILE.' does not work on cygwin managed mounts.
5646 *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; 5762 #
5647 *) wrapperdot=${wrapper} ;;
5648 esac
5649 # If there is no directory component, then add one. 5763 # If there is no directory component, then add one.
5650 case $file in 5764 case $wrapper in
5651 */* | *\\*) . ${wrapperdot} ;; 5765 */* | *\\*) . ${wrapper} ;;
5652 *) . ./${wrapperdot} ;; 5766 *) . ./${wrapper} ;;
5653 esac 5767 esac
5654 5768
5655 # Check the variables that should have been set. 5769 # Check the variables that should have been set.
@@ -5677,17 +5791,15 @@ relink_command=\"$relink_command\""
5677 done 5791 done
5678 5792
5679 relink_command= 5793 relink_command=
5680 # To insure that "foo" is sourced, and not "foo.exe", 5794 # Note that it is not necessary on cygwin/mingw to append a dot to
5681 # finese the cygwin/MSYS system by explicitly sourcing "foo." 5795 # foo even if both foo and FILE.exe exist: automatic-append-.exe
5682 # which disallows the automatic-append-.exe behavior. 5796 # behavior happens only for exec(3), not for open(2)! Also, sourcing
5683 case $build in 5797 # `FILE.' does not work on cygwin managed mounts.
5684 *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; 5798 #
5685 *) wrapperdot=${wrapper} ;;
5686 esac
5687 # If there is no directory component, then add one. 5799 # If there is no directory component, then add one.
5688 case $file in 5800 case $wrapper in
5689 */* | *\\*) . ${wrapperdot} ;; 5801 */* | *\\*) . ${wrapper} ;;
5690 *) . ./${wrapperdot} ;; 5802 *) . ./${wrapper} ;;
5691 esac 5803 esac
5692 5804
5693 outputname= 5805 outputname=
@@ -5728,7 +5840,7 @@ relink_command=\"$relink_command\""
5728 fi 5840 fi
5729 5841
5730 # remove .exe since cygwin /usr/bin/install will append another 5842 # remove .exe since cygwin /usr/bin/install will append another
5731 # one anyways 5843 # one anyway
5732 case $install_prog,$host in 5844 case $install_prog,$host in
5733 */usr/bin/install*,*cygwin*) 5845 */usr/bin/install*,*cygwin*)
5734 case $file:$destfile in 5846 case $file:$destfile in
@@ -6398,7 +6510,7 @@ esac
6398$echo 6510$echo
6399$echo "Try \`$modename --help' for more information about other modes." 6511$echo "Try \`$modename --help' for more information about other modes."
6400 6512
6401exit $EXIT_SUCCESS 6513exit $?
6402 6514
6403# The TAGs below are defined such that we never get into a situation 6515# The TAGs below are defined such that we never get into a situation
6404# in which we disable both kinds of libraries. Given conflicting 6516# in which we disable both kinds of libraries. Given conflicting
diff --git a/ltmain.sh b/ltmain.sh
index 1a224ac2..db4982d8 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,7 +1,7 @@
1# ltmain.sh - Provide generalized library-building support services. 1# ltmain.sh - Provide generalized library-building support services.
2# NOTE: Changing this file will not affect anything until you rerun configure. 2# NOTE: Changing this file will not affect anything until you rerun configure.
3# 3#
4# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 4# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 6# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
7# 7#
@@ -17,7 +17,7 @@
17# 17#
18# You should have received a copy of the GNU General Public License 18# You should have received a copy of the GNU General Public License
19# along with this program; if not, write to the Free Software 19# along with this program; if not, write to the Free Software
20# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21# 21#
22# As a special exception to the GNU General Public License, if you 22# As a special exception to the GNU General Public License, if you
23# distribute this file as part of a program that contains a 23# distribute this file as part of a program that contains a
@@ -43,9 +43,14 @@ EXIT_FAILURE=1
43 43
44PROGRAM=ltmain.sh 44PROGRAM=ltmain.sh
45PACKAGE=libtool 45PACKAGE=libtool
46VERSION=1.5.6 46VERSION="1.5.20 Debian 1.5.20-2"
47TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $" 47TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
48 48
49# See if we are running on zsh, and set the options which allow our
50# commands through without removal of \ escapes.
51if test -n "${ZSH_VERSION+set}" ; then
52 setopt NO_GLOB_SUBST
53fi
49 54
50# Check that we have a working $echo. 55# Check that we have a working $echo.
51if test "X$1" = X--no-reexec; then 56if test "X$1" = X--no-reexec; then
@@ -83,14 +88,15 @@ rm="rm -f"
83Xsed="${SED}"' -e 1s/^X//' 88Xsed="${SED}"' -e 1s/^X//'
84sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' 89sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
85# test EBCDIC or ASCII 90# test EBCDIC or ASCII
86case `echo A|tr A '\301'` in 91case `echo X|tr X '\101'` in
87 A) # EBCDIC based system 92 A) # ASCII based system
88 SP2NL="tr '\100' '\n'" 93 # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
89 NL2SP="tr '\r\n' '\100\100'" 94 SP2NL='tr \040 \012'
95 NL2SP='tr \015\012 \040\040'
90 ;; 96 ;;
91 *) # Assume ASCII based system 97 *) # EBCDIC based system
92 SP2NL="tr '\040' '\012'" 98 SP2NL='tr \100 \n'
93 NL2SP="tr '\015\012' '\040\040'" 99 NL2SP='tr \r\n \100\100'
94 ;; 100 ;;
95esac 101esac
96 102
@@ -107,8 +113,9 @@ if test "${LANG+set}" = set; then
107fi 113fi
108 114
109# Make sure IFS has a sensible default 115# Make sure IFS has a sensible default
110: ${IFS=" 116lt_nl='
111"} 117'
118IFS=" $lt_nl"
112 119
113if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then 120if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
114 $echo "$modename: not configured to build any kind of library" 1>&2 121 $echo "$modename: not configured to build any kind of library" 1>&2
@@ -138,7 +145,8 @@ o2lo="s/\\.${objext}\$/.lo/"
138# Need a lot of goo to handle *both* DLLs and import libs 145# Need a lot of goo to handle *both* DLLs and import libs
139# Has to be a shell function in order to 'eat' the argument 146# Has to be a shell function in order to 'eat' the argument
140# that is supplied when $file_magic_command is called. 147# that is supplied when $file_magic_command is called.
141func_win32_libid () { 148func_win32_libid ()
149{
142 win32_libid_type="unknown" 150 win32_libid_type="unknown"
143 win32_fileres=`file -L $1 2>/dev/null` 151 win32_fileres=`file -L $1 2>/dev/null`
144 case $win32_fileres in 152 case $win32_fileres in
@@ -178,7 +186,8 @@ func_win32_libid () {
178# Only attempt this if the compiler in the base compile 186# Only attempt this if the compiler in the base compile
179# command doesn't match the default compiler. 187# command doesn't match the default compiler.
180# arg is usually of the form 'gcc ...' 188# arg is usually of the form 'gcc ...'
181func_infer_tag () { 189func_infer_tag ()
190{
182 if test -n "$available_tags" && test -z "$tagname"; then 191 if test -n "$available_tags" && test -z "$tagname"; then
183 CC_quoted= 192 CC_quoted=
184 for arg in $CC; do 193 for arg in $CC; do
@@ -235,6 +244,108 @@ func_infer_tag () {
235 esac 244 esac
236 fi 245 fi
237} 246}
247
248
249# func_extract_an_archive dir oldlib
250func_extract_an_archive ()
251{
252 f_ex_an_ar_dir="$1"; shift
253 f_ex_an_ar_oldlib="$1"
254
255 $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
256 $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
257 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
258 :
259 else
260 $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
261 exit $EXIT_FAILURE
262 fi
263}
264
265# func_extract_archives gentop oldlib ...
266func_extract_archives ()
267{
268 my_gentop="$1"; shift
269 my_oldlibs=${1+"$@"}
270 my_oldobjs=""
271 my_xlib=""
272 my_xabs=""
273 my_xdir=""
274 my_status=""
275
276 $show "${rm}r $my_gentop"
277 $run ${rm}r "$my_gentop"
278 $show "$mkdir $my_gentop"
279 $run $mkdir "$my_gentop"
280 my_status=$?
281 if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
282 exit $my_status
283 fi
284
285 for my_xlib in $my_oldlibs; do
286 # Extract the objects.
287 case $my_xlib in
288 [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
289 *) my_xabs=`pwd`"/$my_xlib" ;;
290 esac
291 my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
292 my_xdir="$my_gentop/$my_xlib"
293
294 $show "${rm}r $my_xdir"
295 $run ${rm}r "$my_xdir"
296 $show "$mkdir $my_xdir"
297 $run $mkdir "$my_xdir"
298 status=$?
299 if test "$status" -ne 0 && test ! -d "$my_xdir"; then
300 exit $status
301 fi
302 case $host in
303 *-darwin*)
304 $show "Extracting $my_xabs"
305 # Do not bother doing anything if just a dry run
306 if test -z "$run"; then
307 darwin_orig_dir=`pwd`
308 cd $my_xdir || exit $?
309 darwin_archive=$my_xabs
310 darwin_curdir=`pwd`
311 darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
312 darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
313 if test -n "$darwin_arches"; then
314 darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
315 darwin_arch=
316 $show "$darwin_base_archive has multiple architectures $darwin_arches"
317 for darwin_arch in $darwin_arches ; do
318 mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
319 lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
320 cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
321 func_extract_an_archive "`pwd`" "${darwin_base_archive}"
322 cd "$darwin_curdir"
323 $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
324 done # $darwin_arches
325 ## Okay now we have a bunch of thin objects, gotta fatten them up :)
326 darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
327 darwin_file=
328 darwin_files=
329 for darwin_file in $darwin_filelist; do
330 darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
331 lipo -create -output "$darwin_file" $darwin_files
332 done # $darwin_filelist
333 ${rm}r unfat-$$
334 cd "$darwin_orig_dir"
335 else
336 cd "$darwin_orig_dir"
337 func_extract_an_archive "$my_xdir" "$my_xabs"
338 fi # $darwin_arches
339 fi # $run
340 ;;
341 *)
342 func_extract_an_archive "$my_xdir" "$my_xabs"
343 ;;
344 esac
345 my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
346 done
347 func_extract_archives_result="$my_oldobjs"
348}
238# End of Shell function definitions 349# End of Shell function definitions
239##################################### 350#####################################
240 351
@@ -305,10 +416,10 @@ do
305 --version) 416 --version)
306 $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" 417 $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
307 $echo 418 $echo
308 $echo "Copyright (C) 2003 Free Software Foundation, Inc." 419 $echo "Copyright (C) 2005 Free Software Foundation, Inc."
309 $echo "This is free software; see the source for copying conditions. There is NO" 420 $echo "This is free software; see the source for copying conditions. There is NO"
310 $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 421 $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
311 exit $EXIT_SUCCESS 422 exit $?
312 ;; 423 ;;
313 424
314 --config) 425 --config)
@@ -317,7 +428,7 @@ do
317 for tagname in $taglist; do 428 for tagname in $taglist; do
318 ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" 429 ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
319 done 430 done
320 exit $EXIT_SUCCESS 431 exit $?
321 ;; 432 ;;
322 433
323 --debug) 434 --debug)
@@ -342,7 +453,7 @@ do
342 else 453 else
343 $echo "disable static libraries" 454 $echo "disable static libraries"
344 fi 455 fi
345 exit $EXIT_SUCCESS 456 exit $?
346 ;; 457 ;;
347 458
348 --finish) mode="finish" ;; 459 --finish) mode="finish" ;;
@@ -399,7 +510,7 @@ if test -z "$show_help"; then
399 # Infer the operation mode. 510 # Infer the operation mode.
400 if test -z "$mode"; then 511 if test -z "$mode"; then
401 $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 512 $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
402 $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 513 $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
403 case $nonopt in 514 case $nonopt in
404 *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) 515 *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
405 mode=link 516 mode=link
@@ -465,7 +576,7 @@ if test -z "$show_help"; then
465 576
466 for arg 577 for arg
467 do 578 do
468 case "$arg_mode" in 579 case $arg_mode in
469 arg ) 580 arg )
470 # do not "continue". Instead, add this to base_compile 581 # do not "continue". Instead, add this to base_compile
471 lastarg="$arg" 582 lastarg="$arg"
@@ -547,7 +658,10 @@ if test -z "$show_help"; then
547 case $lastarg in 658 case $lastarg in
548 # Double-quote args containing other shell metacharacters. 659 # Double-quote args containing other shell metacharacters.
549 # Many Bourne shells cannot handle close brackets correctly 660 # Many Bourne shells cannot handle close brackets correctly
550 # in scan sets, so we specify it separately. 661 # in scan sets, and some SunOS ksh mistreat backslash-escaping
662 # in scan sets (worked around with variable expansion),
663 # and furthermore cannot handle '|' '&' '(' ')' in scan sets
664 # at all, so we specify them separately.
551 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") 665 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
552 lastarg="\"$lastarg\"" 666 lastarg="\"$lastarg\""
553 ;; 667 ;;
@@ -621,6 +735,14 @@ if test -z "$show_help"; then
621 esac 735 esac
622 done 736 done
623 737
738 qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
739 case $qlibobj in
740 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
741 qlibobj="\"$qlibobj\"" ;;
742 esac
743 test "X$libobj" != "X$qlibobj" \
744 && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
745 && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
624 objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` 746 objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
625 xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` 747 xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
626 if test "X$xdir" = "X$obj"; then 748 if test "X$xdir" = "X$obj"; then
@@ -693,12 +815,17 @@ compiler."
693 $run $rm $removelist 815 $run $rm $removelist
694 exit $EXIT_FAILURE 816 exit $EXIT_FAILURE
695 fi 817 fi
696 $echo $srcfile > "$lockfile" 818 $echo "$srcfile" > "$lockfile"
697 fi 819 fi
698 820
699 if test -n "$fix_srcfile_path"; then 821 if test -n "$fix_srcfile_path"; then
700 eval srcfile=\"$fix_srcfile_path\" 822 eval srcfile=\"$fix_srcfile_path\"
701 fi 823 fi
824 qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
825 case $qsrcfile in
826 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
827 qsrcfile="\"$qsrcfile\"" ;;
828 esac
702 829
703 $run $rm "$libobj" "${libobj}T" 830 $run $rm "$libobj" "${libobj}T"
704 831
@@ -720,10 +847,10 @@ EOF
720 fbsd_hideous_sh_bug=$base_compile 847 fbsd_hideous_sh_bug=$base_compile
721 848
722 if test "$pic_mode" != no; then 849 if test "$pic_mode" != no; then
723 command="$base_compile $srcfile $pic_flag" 850 command="$base_compile $qsrcfile $pic_flag"
724 else 851 else
725 # Don't build PIC code 852 # Don't build PIC code
726 command="$base_compile $srcfile" 853 command="$base_compile $qsrcfile"
727 fi 854 fi
728 855
729 if test ! -d "${xdir}$objdir"; then 856 if test ! -d "${xdir}$objdir"; then
@@ -803,9 +930,9 @@ EOF
803 if test "$build_old_libs" = yes; then 930 if test "$build_old_libs" = yes; then
804 if test "$pic_mode" != yes; then 931 if test "$pic_mode" != yes; then
805 # Don't build PIC code 932 # Don't build PIC code
806 command="$base_compile $srcfile" 933 command="$base_compile $qsrcfile"
807 else 934 else
808 command="$base_compile $srcfile $pic_flag" 935 command="$base_compile $qsrcfile $pic_flag"
809 fi 936 fi
810 if test "$compiler_c_o" = yes; then 937 if test "$compiler_c_o" = yes; then
811 command="$command -o $obj" 938 command="$command -o $obj"
@@ -1227,6 +1354,13 @@ EOF
1227 prev= 1354 prev=
1228 continue 1355 continue
1229 ;; 1356 ;;
1357 darwin_framework)
1358 compiler_flags="$compiler_flags $arg"
1359 compile_command="$compile_command $arg"
1360 finalize_command="$finalize_command $arg"
1361 prev=
1362 continue
1363 ;;
1230 *) 1364 *)
1231 eval "$prev=\"\$arg\"" 1365 eval "$prev=\"\$arg\""
1232 prev= 1366 prev=
@@ -1285,6 +1419,14 @@ EOF
1285 continue 1419 continue
1286 ;; 1420 ;;
1287 1421
1422 -framework|-arch)
1423 prev=darwin_framework
1424 compiler_flags="$compiler_flags $arg"
1425 compile_command="$compile_command $arg"
1426 finalize_command="$finalize_command $arg"
1427 continue
1428 ;;
1429
1288 -inst-prefix-dir) 1430 -inst-prefix-dir)
1289 prev=inst_prefix 1431 prev=inst_prefix
1290 continue 1432 continue
@@ -1345,7 +1487,7 @@ EOF
1345 # These systems don't actually have a C library (as such) 1487 # These systems don't actually have a C library (as such)
1346 test "X$arg" = "X-lc" && continue 1488 test "X$arg" = "X-lc" && continue
1347 ;; 1489 ;;
1348 *-*-openbsd* | *-*-freebsd*) 1490 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
1349 # Do not include libc due to us having libc/libc_r. 1491 # Do not include libc due to us having libc/libc_r.
1350 test "X$arg" = "X-lc" && continue 1492 test "X$arg" = "X-lc" && continue
1351 ;; 1493 ;;
@@ -1356,7 +1498,7 @@ EOF
1356 esac 1498 esac
1357 elif test "X$arg" = "X-lc_r"; then 1499 elif test "X$arg" = "X-lc_r"; then
1358 case $host in 1500 case $host in
1359 *-*-openbsd* | *-*-freebsd*) 1501 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
1360 # Do not include libc_r directly, use -pthread flag. 1502 # Do not include libc_r directly, use -pthread flag.
1361 continue 1503 continue
1362 ;; 1504 ;;
@@ -1366,8 +1508,20 @@ EOF
1366 continue 1508 continue
1367 ;; 1509 ;;
1368 1510
1511 # Tru64 UNIX uses -model [arg] to determine the layout of C++
1512 # classes, name mangling, and exception handling.
1513 -model)
1514 compile_command="$compile_command $arg"
1515 compiler_flags="$compiler_flags $arg"
1516 finalize_command="$finalize_command $arg"
1517 prev=xcompiler
1518 continue
1519 ;;
1520
1369 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) 1521 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
1370 deplibs="$deplibs $arg" 1522 compiler_flags="$compiler_flags $arg"
1523 compile_command="$compile_command $arg"
1524 finalize_command="$finalize_command $arg"
1371 continue 1525 continue
1372 ;; 1526 ;;
1373 1527
@@ -1376,13 +1530,14 @@ EOF
1376 continue 1530 continue
1377 ;; 1531 ;;
1378 1532
1379 # gcc -m* arguments should be passed to the linker via $compiler_flags 1533 # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
1380 # in order to pass architecture information to the linker 1534 # -r[0-9][0-9]* specifies the processor on the SGI compiler
1381 # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo 1535 # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
1382 # but this is not reliable with gcc because gcc may use -mfoo to 1536 # +DA*, +DD* enable 64-bit mode on the HP compiler
1383 # select a different linker, different libraries, etc, while 1537 # -q* pass through compiler args for the IBM compiler
1384 # -Wl,-mfoo simply passes -mfoo to the linker. 1538 # -m* pass through architecture-specific compiler args for GCC
1385 -m*) 1539 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
1540
1386 # Unknown arguments in both finalize_command and compile_command need 1541 # Unknown arguments in both finalize_command and compile_command need
1387 # to be aesthetically quoted because they are evaled later. 1542 # to be aesthetically quoted because they are evaled later.
1388 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` 1543 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -1858,7 +2013,7 @@ EOF
1858 compile_deplibs="$deplib $compile_deplibs" 2013 compile_deplibs="$deplib $compile_deplibs"
1859 finalize_deplibs="$deplib $finalize_deplibs" 2014 finalize_deplibs="$deplib $finalize_deplibs"
1860 else 2015 else
1861 deplibs="$deplib $deplibs" 2016 compiler_flags="$compiler_flags $deplib"
1862 fi 2017 fi
1863 continue 2018 continue
1864 ;; 2019 ;;
@@ -1977,7 +2132,22 @@ EOF
1977 fi 2132 fi
1978 case $linkmode in 2133 case $linkmode in
1979 lib) 2134 lib)
1980 if test "$deplibs_check_method" != pass_all; then 2135 valid_a_lib=no
2136 case $deplibs_check_method in
2137 match_pattern*)
2138 set dummy $deplibs_check_method
2139 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
2140 if eval $echo \"$deplib\" 2>/dev/null \
2141 | $SED 10q \
2142 | $EGREP "$match_pattern_regex" > /dev/null; then
2143 valid_a_lib=yes
2144 fi
2145 ;;
2146 pass_all)
2147 valid_a_lib=yes
2148 ;;
2149 esac
2150 if test "$valid_a_lib" != yes; then
1981 $echo 2151 $echo
1982 $echo "*** Warning: Trying to link with static lib archive $deplib." 2152 $echo "*** Warning: Trying to link with static lib archive $deplib."
1983 $echo "*** I have the capability to make that library automatically link in when" 2153 $echo "*** I have the capability to make that library automatically link in when"
@@ -2051,6 +2221,8 @@ EOF
2051 # it will not redefine variables installed, or shouldnotlink 2221 # it will not redefine variables installed, or shouldnotlink
2052 installed=yes 2222 installed=yes
2053 shouldnotlink=no 2223 shouldnotlink=no
2224 avoidtemprpath=
2225
2054 2226
2055 # Read the .la file 2227 # Read the .la file
2056 case $lib in 2228 case $lib in
@@ -2149,11 +2321,19 @@ EOF
2149 dir="$libdir" 2321 dir="$libdir"
2150 absdir="$libdir" 2322 absdir="$libdir"
2151 fi 2323 fi
2324 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
2152 else 2325 else
2153 dir="$ladir/$objdir" 2326 if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
2154 absdir="$abs_ladir/$objdir" 2327 dir="$ladir"
2155 # Remove this search path later 2328 absdir="$abs_ladir"
2156 notinst_path="$notinst_path $abs_ladir" 2329 # Remove this search path later
2330 notinst_path="$notinst_path $abs_ladir"
2331 else
2332 dir="$ladir/$objdir"
2333 absdir="$abs_ladir/$objdir"
2334 # Remove this search path later
2335 notinst_path="$notinst_path $abs_ladir"
2336 fi
2157 fi # $installed = yes 2337 fi # $installed = yes
2158 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` 2338 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
2159 2339
@@ -2226,12 +2406,12 @@ EOF
2226 if test -n "$library_names" && 2406 if test -n "$library_names" &&
2227 { test "$prefer_static_libs" = no || test -z "$old_library"; }; then 2407 { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
2228 # We need to hardcode the library path 2408 # We need to hardcode the library path
2229 if test -n "$shlibpath_var"; then 2409 if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
2230 # Make sure the rpath contains only unique directories. 2410 # Make sure the rpath contains only unique directories.
2231 case "$temp_rpath " in 2411 case "$temp_rpath " in
2232 *" $dir "*) ;; 2412 *" $dir "*) ;;
2233 *" $absdir "*) ;; 2413 *" $absdir "*) ;;
2234 *) temp_rpath="$temp_rpath $dir" ;; 2414 *) temp_rpath="$temp_rpath $absdir" ;;
2235 esac 2415 esac
2236 fi 2416 fi
2237 2417
@@ -2417,7 +2597,7 @@ EOF
2417 add_dir="-L$dir" 2597 add_dir="-L$dir"
2418 # Try looking first in the location we're being installed to. 2598 # Try looking first in the location we're being installed to.
2419 if test -n "$inst_prefix_dir"; then 2599 if test -n "$inst_prefix_dir"; then
2420 case "$libdir" in 2600 case $libdir in
2421 [\\/]*) 2601 [\\/]*)
2422 add_dir="$add_dir -L$inst_prefix_dir$libdir" 2602 add_dir="$add_dir -L$inst_prefix_dir$libdir"
2423 ;; 2603 ;;
@@ -2490,7 +2670,7 @@ EOF
2490 add_dir="-L$libdir" 2670 add_dir="-L$libdir"
2491 # Try looking first in the location we're being installed to. 2671 # Try looking first in the location we're being installed to.
2492 if test -n "$inst_prefix_dir"; then 2672 if test -n "$inst_prefix_dir"; then
2493 case "$libdir" in 2673 case $libdir in
2494 [\\/]*) 2674 [\\/]*)
2495 add_dir="$add_dir -L$inst_prefix_dir$libdir" 2675 add_dir="$add_dir -L$inst_prefix_dir$libdir"
2496 ;; 2676 ;;
@@ -2551,8 +2731,6 @@ EOF
2551 fi 2731 fi
2552 fi 2732 fi
2553 else 2733 else
2554 convenience="$convenience $dir/$old_library"
2555 old_convenience="$old_convenience $dir/$old_library"
2556 deplibs="$dir/$old_library $deplibs" 2734 deplibs="$dir/$old_library $deplibs"
2557 link_static=yes 2735 link_static=yes
2558 fi 2736 fi
@@ -2670,12 +2848,12 @@ EOF
2670 *) continue ;; 2848 *) continue ;;
2671 esac 2849 esac
2672 case " $deplibs " in 2850 case " $deplibs " in
2673 *" $depdepl "*) ;; 2851 *" $path "*) ;;
2674 *) deplibs="$depdepl $deplibs" ;; 2852 *) deplibs="$path $deplibs" ;;
2675 esac 2853 esac
2676 case " $deplibs " in 2854 case " $deplibs " in
2677 *" $path "*) ;; 2855 *" $depdepl "*) ;;
2678 *) deplibs="$deplibs $path" ;; 2856 *) deplibs="$depdepl $deplibs" ;;
2679 esac 2857 esac
2680 done 2858 done
2681 fi # link_all_deplibs != no 2859 fi # link_all_deplibs != no
@@ -2947,7 +3125,7 @@ EOF
2947 case $current in 3125 case $current in
2948 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 3126 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
2949 *) 3127 *)
2950 $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 3128 $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
2951 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 3129 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
2952 exit $EXIT_FAILURE 3130 exit $EXIT_FAILURE
2953 ;; 3131 ;;
@@ -2956,7 +3134,7 @@ EOF
2956 case $revision in 3134 case $revision in
2957 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 3135 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
2958 *) 3136 *)
2959 $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 3137 $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
2960 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 3138 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
2961 exit $EXIT_FAILURE 3139 exit $EXIT_FAILURE
2962 ;; 3140 ;;
@@ -2965,7 +3143,7 @@ EOF
2965 case $age in 3143 case $age in
2966 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 3144 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
2967 *) 3145 *)
2968 $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 3146 $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
2969 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 3147 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
2970 exit $EXIT_FAILURE 3148 exit $EXIT_FAILURE
2971 ;; 3149 ;;
@@ -2991,7 +3169,7 @@ EOF
2991 versuffix="$major.$age.$revision" 3169 versuffix="$major.$age.$revision"
2992 # Darwin ld doesn't like 0 for these options... 3170 # Darwin ld doesn't like 0 for these options...
2993 minor_current=`expr $current + 1` 3171 minor_current=`expr $current + 1`
2994 verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" 3172 verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
2995 ;; 3173 ;;
2996 3174
2997 freebsd-aout) 3175 freebsd-aout)
@@ -3197,7 +3375,7 @@ EOF
3197 *-*-netbsd*) 3375 *-*-netbsd*)
3198 # Don't link with libc until the a.out ld.so is fixed. 3376 # Don't link with libc until the a.out ld.so is fixed.
3199 ;; 3377 ;;
3200 *-*-openbsd* | *-*-freebsd*) 3378 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
3201 # Do not include libc due to us having libc/libc_r. 3379 # Do not include libc due to us having libc/libc_r.
3202 test "X$arg" = "X-lc" && continue 3380 test "X$arg" = "X-lc" && continue
3203 ;; 3381 ;;
@@ -3247,7 +3425,7 @@ EOF
3247 if test "$?" -eq 0 ; then 3425 if test "$?" -eq 0 ; then
3248 ldd_output=`ldd conftest` 3426 ldd_output=`ldd conftest`
3249 for i in $deplibs; do 3427 for i in $deplibs; do
3250 name="`expr $i : '-l\(.*\)'`" 3428 name=`expr $i : '-l\(.*\)'`
3251 # If $name is empty we are operating on a -L argument. 3429 # If $name is empty we are operating on a -L argument.
3252 if test "$name" != "" && test "$name" -ne "0"; then 3430 if test "$name" != "" && test "$name" -ne "0"; then
3253 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 3431 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3284,7 +3462,7 @@ EOF
3284 # Error occurred in the first compile. Let's try to salvage 3462 # Error occurred in the first compile. Let's try to salvage
3285 # the situation: Compile a separate program for each library. 3463 # the situation: Compile a separate program for each library.
3286 for i in $deplibs; do 3464 for i in $deplibs; do
3287 name="`expr $i : '-l\(.*\)'`" 3465 name=`expr $i : '-l\(.*\)'`
3288 # If $name is empty we are operating on a -L argument. 3466 # If $name is empty we are operating on a -L argument.
3289 if test "$name" != "" && test "$name" != "0"; then 3467 if test "$name" != "" && test "$name" != "0"; then
3290 $rm conftest 3468 $rm conftest
@@ -3336,7 +3514,7 @@ EOF
3336 set dummy $deplibs_check_method 3514 set dummy $deplibs_check_method
3337 file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` 3515 file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
3338 for a_deplib in $deplibs; do 3516 for a_deplib in $deplibs; do
3339 name="`expr $a_deplib : '-l\(.*\)'`" 3517 name=`expr $a_deplib : '-l\(.*\)'`
3340 # If $name is empty we are operating on a -L argument. 3518 # If $name is empty we are operating on a -L argument.
3341 if test "$name" != "" && test "$name" != "0"; then 3519 if test "$name" != "" && test "$name" != "0"; then
3342 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 3520 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3405,7 +3583,7 @@ EOF
3405 set dummy $deplibs_check_method 3583 set dummy $deplibs_check_method
3406 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` 3584 match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
3407 for a_deplib in $deplibs; do 3585 for a_deplib in $deplibs; do
3408 name="`expr $a_deplib : '-l\(.*\)'`" 3586 name=`expr $a_deplib : '-l\(.*\)'`
3409 # If $name is empty we are operating on a -L argument. 3587 # If $name is empty we are operating on a -L argument.
3410 if test -n "$name" && test "$name" != "0"; then 3588 if test -n "$name" && test "$name" != "0"; then
3411 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 3589 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3646,6 +3824,9 @@ EOF
3646 # The command line is too long to execute in one step. 3824 # The command line is too long to execute in one step.
3647 $show "using reloadable object file for export list..." 3825 $show "using reloadable object file for export list..."
3648 skipped_export=: 3826 skipped_export=:
3827 # Break out early, otherwise skipped_export may be
3828 # set to false by a later but shorter cmd.
3829 break
3649 fi 3830 fi
3650 done 3831 done
3651 IFS="$save_ifs" 3832 IFS="$save_ifs"
@@ -3679,67 +3860,13 @@ EOF
3679 eval libobjs=\"\$libobjs $whole_archive_flag_spec\" 3860 eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
3680 else 3861 else
3681 gentop="$output_objdir/${outputname}x" 3862 gentop="$output_objdir/${outputname}x"
3682 $show "${rm}r $gentop"
3683 $run ${rm}r "$gentop"
3684 $show "$mkdir $gentop"
3685 $run $mkdir "$gentop"
3686 status=$?
3687 if test "$status" -ne 0 && test ! -d "$gentop"; then
3688 exit $status
3689 fi
3690 generated="$generated $gentop" 3863 generated="$generated $gentop"
3691 3864
3692 for xlib in $convenience; do 3865 func_extract_archives $gentop $convenience
3693 # Extract the objects. 3866 libobjs="$libobjs $func_extract_archives_result"
3694 case $xlib in
3695 [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
3696 *) xabs=`pwd`"/$xlib" ;;
3697 esac
3698 xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
3699 xdir="$gentop/$xlib"
3700
3701 $show "${rm}r $xdir"
3702 $run ${rm}r "$xdir"
3703 $show "$mkdir $xdir"
3704 $run $mkdir "$xdir"
3705 status=$?
3706 if test "$status" -ne 0 && test ! -d "$xdir"; then
3707 exit $status
3708 fi
3709 # We will extract separately just the conflicting names and we will no
3710 # longer touch any unique names. It is faster to leave these extract
3711 # automatically by $AR in one run.
3712 $show "(cd $xdir && $AR x $xabs)"
3713 $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
3714 if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
3715 :
3716 else
3717 $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
3718 $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
3719 $AR t "$xabs" | sort | uniq -cd | while read -r count name
3720 do
3721 i=1
3722 while test "$i" -le "$count"
3723 do
3724 # Put our $i before any first dot (extension)
3725 # Never overwrite any file
3726 name_to="$name"
3727 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
3728 do
3729 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
3730 done
3731 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
3732 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
3733 i=`expr $i + 1`
3734 done
3735 done
3736 fi
3737
3738 libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
3739 done
3740 fi 3867 fi
3741 fi 3868 fi
3742 3869
3743 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then 3870 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
3744 eval flag=\"$thread_safe_flag_spec\" 3871 eval flag=\"$thread_safe_flag_spec\"
3745 linker_flags="$linker_flags $flag" 3872 linker_flags="$linker_flags $flag"
@@ -3769,7 +3896,8 @@ EOF
3769 fi 3896 fi
3770 fi 3897 fi
3771 3898
3772 if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && 3899 if test "X$skipped_export" != "X:" &&
3900 len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
3773 test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then 3901 test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
3774 : 3902 :
3775 else 3903 else
@@ -3788,6 +3916,7 @@ EOF
3788 save_libobjs=$libobjs 3916 save_libobjs=$libobjs
3789 fi 3917 fi
3790 save_output=$output 3918 save_output=$output
3919 output_la=`$echo "X$output" | $Xsed -e "$basename"`
3791 3920
3792 # Clear the reloadable object creation command queue and 3921 # Clear the reloadable object creation command queue and
3793 # initialize k to one. 3922 # initialize k to one.
@@ -3797,13 +3926,13 @@ EOF
3797 delfiles= 3926 delfiles=
3798 last_robj= 3927 last_robj=
3799 k=1 3928 k=1
3800 output=$output_objdir/$save_output-${k}.$objext 3929 output=$output_objdir/$output_la-${k}.$objext
3801 # Loop over the list of objects to be linked. 3930 # Loop over the list of objects to be linked.
3802 for obj in $save_libobjs 3931 for obj in $save_libobjs
3803 do 3932 do
3804 eval test_cmds=\"$reload_cmds $objlist $last_robj\" 3933 eval test_cmds=\"$reload_cmds $objlist $last_robj\"
3805 if test "X$objlist" = X || 3934 if test "X$objlist" = X ||
3806 { len=`expr "X$test_cmds" : ".*"` && 3935 { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
3807 test "$len" -le "$max_cmd_len"; }; then 3936 test "$len" -le "$max_cmd_len"; }; then
3808 objlist="$objlist $obj" 3937 objlist="$objlist $obj"
3809 else 3938 else
@@ -3817,9 +3946,9 @@ EOF
3817 # the last one created. 3946 # the last one created.
3818 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" 3947 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
3819 fi 3948 fi
3820 last_robj=$output_objdir/$save_output-${k}.$objext 3949 last_robj=$output_objdir/$output_la-${k}.$objext
3821 k=`expr $k + 1` 3950 k=`expr $k + 1`
3822 output=$output_objdir/$save_output-${k}.$objext 3951 output=$output_objdir/$output_la-${k}.$objext
3823 objlist=$obj 3952 objlist=$obj
3824 len=1 3953 len=1
3825 fi 3954 fi
@@ -3839,13 +3968,13 @@ EOF
3839 eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" 3968 eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
3840 fi 3969 fi
3841 3970
3842 # Set up a command to remove the reloadale object files 3971 # Set up a command to remove the reloadable object files
3843 # after they are used. 3972 # after they are used.
3844 i=0 3973 i=0
3845 while test "$i" -lt "$k" 3974 while test "$i" -lt "$k"
3846 do 3975 do
3847 i=`expr $i + 1` 3976 i=`expr $i + 1`
3848 delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" 3977 delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
3849 done 3978 done
3850 3979
3851 $echo "creating a temporary reloadable object file: $output" 3980 $echo "creating a temporary reloadable object file: $output"
@@ -3893,13 +4022,30 @@ EOF
3893 IFS="$save_ifs" 4022 IFS="$save_ifs"
3894 eval cmd=\"$cmd\" 4023 eval cmd=\"$cmd\"
3895 $show "$cmd" 4024 $show "$cmd"
3896 $run eval "$cmd" || exit $? 4025 $run eval "$cmd" || {
4026 lt_exit=$?
4027
4028 # Restore the uninstalled library and exit
4029 if test "$mode" = relink; then
4030 $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
4031 fi
4032
4033 exit $lt_exit
4034 }
3897 done 4035 done
3898 IFS="$save_ifs" 4036 IFS="$save_ifs"
3899 4037
3900 # Restore the uninstalled library and exit 4038 # Restore the uninstalled library and exit
3901 if test "$mode" = relink; then 4039 if test "$mode" = relink; then
3902 $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? 4040 $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
4041
4042 if test -n "$convenience"; then
4043 if test -z "$whole_archive_flag_spec"; then
4044 $show "${rm}r $gentop"
4045 $run ${rm}r "$gentop"
4046 fi
4047 fi
4048
3903 exit $EXIT_SUCCESS 4049 exit $EXIT_SUCCESS
3904 fi 4050 fi
3905 4051
@@ -3977,64 +4123,10 @@ EOF
3977 eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" 4123 eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
3978 else 4124 else
3979 gentop="$output_objdir/${obj}x" 4125 gentop="$output_objdir/${obj}x"
3980 $show "${rm}r $gentop"
3981 $run ${rm}r "$gentop"
3982 $show "$mkdir $gentop"
3983 $run $mkdir "$gentop"
3984 status=$?
3985 if test "$status" -ne 0 && test ! -d "$gentop"; then
3986 exit $status
3987 fi
3988 generated="$generated $gentop" 4126 generated="$generated $gentop"
3989 4127
3990 for xlib in $convenience; do 4128 func_extract_archives $gentop $convenience
3991 # Extract the objects. 4129 reload_conv_objs="$reload_objs $func_extract_archives_result"
3992 case $xlib in
3993 [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
3994 *) xabs=`pwd`"/$xlib" ;;
3995 esac
3996 xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
3997 xdir="$gentop/$xlib"
3998
3999 $show "${rm}r $xdir"
4000 $run ${rm}r "$xdir"
4001 $show "$mkdir $xdir"
4002 $run $mkdir "$xdir"
4003 status=$?
4004 if test "$status" -ne 0 && test ! -d "$xdir"; then
4005 exit $status
4006 fi
4007 # We will extract separately just the conflicting names and we will no
4008 # longer touch any unique names. It is faster to leave these extract
4009 # automatically by $AR in one run.
4010 $show "(cd $xdir && $AR x $xabs)"
4011 $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
4012 if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
4013 :
4014 else
4015 $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
4016 $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
4017 $AR t "$xabs" | sort | uniq -cd | while read -r count name
4018 do
4019 i=1
4020 while test "$i" -le "$count"
4021 do
4022 # Put our $i before any first dot (extension)
4023 # Never overwrite any file
4024 name_to="$name"
4025 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
4026 do
4027 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
4028 done
4029 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
4030 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
4031 i=`expr $i + 1`
4032 done
4033 done
4034 fi
4035
4036 reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4037 done
4038 fi 4130 fi
4039 fi 4131 fi
4040 4132
@@ -4296,12 +4388,12 @@ extern \"C\" {
4296 4388
4297 # Prepare the list of exported symbols 4389 # Prepare the list of exported symbols
4298 if test -z "$export_symbols"; then 4390 if test -z "$export_symbols"; then
4299 export_symbols="$output_objdir/$output.exp" 4391 export_symbols="$output_objdir/$outputname.exp"
4300 $run $rm $export_symbols 4392 $run $rm $export_symbols
4301 $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' 4393 $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
4302 else 4394 else
4303 $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' 4395 $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
4304 $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' 4396 $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
4305 $run eval 'mv "$nlist"T "$nlist"' 4397 $run eval 'mv "$nlist"T "$nlist"'
4306 fi 4398 fi
4307 fi 4399 fi
@@ -4353,7 +4445,26 @@ extern \"C\" {
4353#endif 4445#endif
4354 4446
4355/* The mapping between symbol names and symbols. */ 4447/* The mapping between symbol names and symbols. */
4448"
4449
4450 case $host in
4451 *cygwin* | *mingw* )
4452 $echo >> "$output_objdir/$dlsyms" "\
4453/* DATA imports from DLLs on WIN32 can't be const, because
4454 runtime relocations are performed -- see ld's documentation
4455 on pseudo-relocs */
4456struct {
4457"
4458 ;;
4459 * )
4460 $echo >> "$output_objdir/$dlsyms" "\
4356const struct { 4461const struct {
4462"
4463 ;;
4464 esac
4465
4466
4467 $echo >> "$output_objdir/$dlsyms" "\
4357 const char *name; 4468 const char *name;
4358 lt_ptr address; 4469 lt_ptr address;
4359} 4470}
@@ -4582,7 +4693,7 @@ static const void *lt_preloaded_setup() {
4582 esac 4693 esac
4583 case $host in 4694 case $host in
4584 *cygwin* | *mingw* ) 4695 *cygwin* | *mingw* )
4585 cwrappersource=`$echo ${objdir}/lt-${output}.c` 4696 cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
4586 cwrapper=`$echo ${output}.exe` 4697 cwrapper=`$echo ${output}.exe`
4587 $rm $cwrappersource $cwrapper 4698 $rm $cwrappersource $cwrapper
4588 trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 4699 trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -4681,6 +4792,7 @@ EOF
4681EOF 4792EOF
4682 4793
4683 cat >> $cwrappersource <<"EOF" 4794 cat >> $cwrappersource <<"EOF"
4795 return 127;
4684} 4796}
4685 4797
4686void * 4798void *
@@ -4815,7 +4927,7 @@ sed_quote_subst='$sed_quote_subst'
4815 4927
4816# The HP-UX ksh and POSIX shell print the target directory to stdout 4928# The HP-UX ksh and POSIX shell print the target directory to stdout
4817# if CDPATH is set. 4929# if CDPATH is set.
4818if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi 4930(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
4819 4931
4820relink_command=\"$relink_command\" 4932relink_command=\"$relink_command\"
4821 4933
@@ -4944,13 +5056,13 @@ else
4944 # Backslashes separate directories on plain windows 5056 # Backslashes separate directories on plain windows
4945 *-*-mingw | *-*-os2*) 5057 *-*-mingw | *-*-os2*)
4946 $echo >> $output "\ 5058 $echo >> $output "\
4947 exec \$progdir\\\\\$program \${1+\"\$@\"} 5059 exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4948" 5060"
4949 ;; 5061 ;;
4950 5062
4951 *) 5063 *)
4952 $echo >> $output "\ 5064 $echo >> $output "\
4953 exec \$progdir/\$program \${1+\"\$@\"} 5065 exec \"\$progdir/\$program\" \${1+\"\$@\"}
4954" 5066"
4955 ;; 5067 ;;
4956 esac 5068 esac
@@ -4960,7 +5072,7 @@ else
4960 fi 5072 fi
4961 else 5073 else
4962 # The program doesn't exist. 5074 # The program doesn't exist.
4963 \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 5075 \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
4964 \$echo \"This script is just a wrapper for \$program.\" 1>&2 5076 \$echo \"This script is just a wrapper for \$program.\" 1>&2
4965 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 5077 $echo \"See the $PACKAGE documentation for more information.\" 1>&2
4966 exit $EXIT_FAILURE 5078 exit $EXIT_FAILURE
@@ -4992,71 +5104,73 @@ fi\
4992 5104
4993 if test -n "$addlibs"; then 5105 if test -n "$addlibs"; then
4994 gentop="$output_objdir/${outputname}x" 5106 gentop="$output_objdir/${outputname}x"
4995 $show "${rm}r $gentop"
4996 $run ${rm}r "$gentop"
4997 $show "$mkdir $gentop"
4998 $run $mkdir "$gentop"
4999 status=$?
5000 if test "$status" -ne 0 && test ! -d "$gentop"; then
5001 exit $status
5002 fi
5003 generated="$generated $gentop" 5107 generated="$generated $gentop"
5004 5108
5005 # Add in members from convenience archives. 5109 func_extract_archives $gentop $addlibs
5006 for xlib in $addlibs; do 5110 oldobjs="$oldobjs $func_extract_archives_result"
5007 # Extract the objects.
5008 case $xlib in
5009 [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
5010 *) xabs=`pwd`"/$xlib" ;;
5011 esac
5012 xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
5013 xdir="$gentop/$xlib"
5014
5015 $show "${rm}r $xdir"
5016 $run ${rm}r "$xdir"
5017 $show "$mkdir $xdir"
5018 $run $mkdir "$xdir"
5019 status=$?
5020 if test "$status" -ne 0 && test ! -d "$xdir"; then
5021 exit $status
5022 fi
5023 # We will extract separately just the conflicting names and we will no
5024 # longer touch any unique names. It is faster to leave these extract
5025 # automatically by $AR in one run.
5026 $show "(cd $xdir && $AR x $xabs)"
5027 $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
5028 if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
5029 :
5030 else
5031 $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
5032 $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
5033 $AR t "$xabs" | sort | uniq -cd | while read -r count name
5034 do
5035 i=1
5036 while test "$i" -le "$count"
5037 do
5038 # Put our $i before any first dot (extension)
5039 # Never overwrite any file
5040 name_to="$name"
5041 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
5042 do
5043 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
5044 done
5045 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
5046 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
5047 i=`expr $i + 1`
5048 done
5049 done
5050 fi
5051
5052 oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
5053 done
5054 fi 5111 fi
5055 5112
5056 # Do each command in the archive commands. 5113 # Do each command in the archive commands.
5057 if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then 5114 if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
5058 cmds=$old_archive_from_new_cmds 5115 cmds=$old_archive_from_new_cmds
5059 else 5116 else
5117 # POSIX demands no paths to be encoded in archives. We have
5118 # to avoid creating archives with duplicate basenames if we
5119 # might have to extract them afterwards, e.g., when creating a
5120 # static archive out of a convenience library, or when linking
5121 # the entirety of a libtool archive into another (currently
5122 # not supported by libtool).
5123 if (for obj in $oldobjs
5124 do
5125 $echo "X$obj" | $Xsed -e 's%^.*/%%'
5126 done | sort | sort -uc >/dev/null 2>&1); then
5127 :
5128 else
5129 $echo "copying selected object files to avoid basename conflicts..."
5130
5131 if test -z "$gentop"; then
5132 gentop="$output_objdir/${outputname}x"
5133 generated="$generated $gentop"
5134
5135 $show "${rm}r $gentop"
5136 $run ${rm}r "$gentop"
5137 $show "$mkdir $gentop"
5138 $run $mkdir "$gentop"
5139 status=$?
5140 if test "$status" -ne 0 && test ! -d "$gentop"; then
5141 exit $status
5142 fi
5143 fi
5144
5145 save_oldobjs=$oldobjs
5146 oldobjs=
5147 counter=1
5148 for obj in $save_oldobjs
5149 do
5150 objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
5151 case " $oldobjs " in
5152 " ") oldobjs=$obj ;;
5153 *[\ /]"$objbase "*)
5154 while :; do
5155 # Make sure we don't pick an alternate name that also
5156 # overlaps.
5157 newobj=lt$counter-$objbase
5158 counter=`expr $counter + 1`
5159 case " $oldobjs " in
5160 *[\ /]"$newobj "*) ;;
5161 *) if test ! -f "$gentop/$newobj"; then break; fi ;;
5162 esac
5163 done
5164 $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
5165 $run ln "$obj" "$gentop/$newobj" ||
5166 $run cp "$obj" "$gentop/$newobj"
5167 oldobjs="$oldobjs $gentop/$newobj"
5168 ;;
5169 *) oldobjs="$oldobjs $obj" ;;
5170 esac
5171 done
5172 fi
5173
5060 eval cmds=\"$old_archive_cmds\" 5174 eval cmds=\"$old_archive_cmds\"
5061 5175
5062 if len=`expr "X$cmds" : ".*"` && 5176 if len=`expr "X$cmds" : ".*"` &&
@@ -5070,20 +5184,7 @@ fi\
5070 objlist= 5184 objlist=
5071 concat_cmds= 5185 concat_cmds=
5072 save_oldobjs=$oldobjs 5186 save_oldobjs=$oldobjs
5073 # GNU ar 2.10+ was changed to match POSIX; thus no paths are 5187
5074 # encoded into archives. This makes 'ar r' malfunction in
5075 # this piecewise linking case whenever conflicting object
5076 # names appear in distinct ar calls; check, warn and compensate.
5077 if (for obj in $save_oldobjs
5078 do
5079 $echo "X$obj" | $Xsed -e 's%^.*/%%'
5080 done | sort | sort -uc >/dev/null 2>&1); then
5081 :
5082 else
5083 $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
5084 $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
5085 AR_FLAGS=cq
5086 fi
5087 # Is there a better way of finding the last object in the list? 5188 # Is there a better way of finding the last object in the list?
5088 for obj in $save_oldobjs 5189 for obj in $save_oldobjs
5089 do 5190 do
@@ -5094,7 +5195,7 @@ fi\
5094 oldobjs="$objlist $obj" 5195 oldobjs="$objlist $obj"
5095 objlist="$objlist $obj" 5196 objlist="$objlist $obj"
5096 eval test_cmds=\"$old_archive_cmds\" 5197 eval test_cmds=\"$old_archive_cmds\"
5097 if len=`expr "X$test_cmds" : ".*"` && 5198 if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
5098 test "$len" -le "$max_cmd_len"; then 5199 test "$len" -le "$max_cmd_len"; then
5099 : 5200 :
5100 else 5201 else
@@ -5291,11 +5392,11 @@ relink_command=\"$relink_command\""
5291 # install_prog (especially on Windows NT). 5392 # install_prog (especially on Windows NT).
5292 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || 5393 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
5293 # Allow the use of GNU shtool's install command. 5394 # Allow the use of GNU shtool's install command.
5294 $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then 5395 $echo "X$nonopt" | grep shtool > /dev/null; then
5295 # Aesthetically quote it. 5396 # Aesthetically quote it.
5296 arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` 5397 arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
5297 case $arg in 5398 case $arg in
5298 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) 5399 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
5299 arg="\"$arg\"" 5400 arg="\"$arg\""
5300 ;; 5401 ;;
5301 esac 5402 esac
@@ -5304,14 +5405,14 @@ relink_command=\"$relink_command\""
5304 shift 5405 shift
5305 else 5406 else
5306 install_prog= 5407 install_prog=
5307 arg="$nonopt" 5408 arg=$nonopt
5308 fi 5409 fi
5309 5410
5310 # The real first argument should be the name of the installation program. 5411 # The real first argument should be the name of the installation program.
5311 # Aesthetically quote it. 5412 # Aesthetically quote it.
5312 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` 5413 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
5313 case $arg in 5414 case $arg in
5314 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) 5415 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
5315 arg="\"$arg\"" 5416 arg="\"$arg\""
5316 ;; 5417 ;;
5317 esac 5418 esac
@@ -5329,28 +5430,31 @@ relink_command=\"$relink_command\""
5329 do 5430 do
5330 if test -n "$dest"; then 5431 if test -n "$dest"; then
5331 files="$files $dest" 5432 files="$files $dest"
5332 dest="$arg" 5433 dest=$arg
5333 continue 5434 continue
5334 fi 5435 fi
5335 5436
5336 case $arg in 5437 case $arg in
5337 -d) isdir=yes ;; 5438 -d) isdir=yes ;;
5338 -f) prev="-f" ;; 5439 -f)
5339 -g) prev="-g" ;; 5440 case " $install_prog " in
5340 -m) prev="-m" ;; 5441 *[\\\ /]cp\ *) ;;
5341 -o) prev="-o" ;; 5442 *) prev=$arg ;;
5443 esac
5444 ;;
5445 -g | -m | -o) prev=$arg ;;
5342 -s) 5446 -s)
5343 stripme=" -s" 5447 stripme=" -s"
5344 continue 5448 continue
5345 ;; 5449 ;;
5346 -*) ;; 5450 -*)
5347 5451 ;;
5348 *) 5452 *)
5349 # If the previous option needed an argument, then skip it. 5453 # If the previous option needed an argument, then skip it.
5350 if test -n "$prev"; then 5454 if test -n "$prev"; then
5351 prev= 5455 prev=
5352 else 5456 else
5353 dest="$arg" 5457 dest=$arg
5354 continue 5458 continue
5355 fi 5459 fi
5356 ;; 5460 ;;
@@ -5359,7 +5463,7 @@ relink_command=\"$relink_command\""
5359 # Aesthetically quote the argument. 5463 # Aesthetically quote the argument.
5360 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` 5464 arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
5361 case $arg in 5465 case $arg in
5362 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) 5466 *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
5363 arg="\"$arg\"" 5467 arg="\"$arg\""
5364 ;; 5468 ;;
5365 esac 5469 esac
@@ -5528,11 +5632,14 @@ relink_command=\"$relink_command\""
5528 5632
5529 if test "$#" -gt 0; then 5633 if test "$#" -gt 0; then
5530 # Delete the old symlinks, and create new ones. 5634 # Delete the old symlinks, and create new ones.
5635 # Try `ln -sf' first, because the `ln' binary might depend on
5636 # the symlink we replace! Solaris /bin/ln does not understand -f,
5637 # so we also need to try rm && ln -s.
5531 for linkname 5638 for linkname
5532 do 5639 do
5533 if test "$linkname" != "$realname"; then 5640 if test "$linkname" != "$realname"; then
5534 $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" 5641 $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
5535 $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" 5642 $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
5536 fi 5643 fi
5537 done 5644 done
5538 fi 5645 fi
@@ -5545,7 +5652,16 @@ relink_command=\"$relink_command\""
5545 IFS="$save_ifs" 5652 IFS="$save_ifs"
5546 eval cmd=\"$cmd\" 5653 eval cmd=\"$cmd\"
5547 $show "$cmd" 5654 $show "$cmd"
5548 $run eval "$cmd" || exit $? 5655 $run eval "$cmd" || {
5656 lt_exit=$?
5657
5658 # Restore the uninstalled library and exit
5659 if test "$mode" = relink; then
5660 $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
5661 fi
5662
5663 exit $lt_exit
5664 }
5549 done 5665 done
5550 IFS="$save_ifs" 5666 IFS="$save_ifs"
5551 fi 5667 fi
@@ -5639,17 +5755,15 @@ relink_command=\"$relink_command\""
5639 notinst_deplibs= 5755 notinst_deplibs=
5640 relink_command= 5756 relink_command=
5641 5757
5642 # To insure that "foo" is sourced, and not "foo.exe", 5758 # Note that it is not necessary on cygwin/mingw to append a dot to
5643 # finese the cygwin/MSYS system by explicitly sourcing "foo." 5759 # foo even if both foo and FILE.exe exist: automatic-append-.exe
5644 # which disallows the automatic-append-.exe behavior. 5760 # behavior happens only for exec(3), not for open(2)! Also, sourcing
5645 case $build in 5761 # `FILE.' does not work on cygwin managed mounts.
5646 *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; 5762 #
5647 *) wrapperdot=${wrapper} ;;
5648 esac
5649 # If there is no directory component, then add one. 5763 # If there is no directory component, then add one.
5650 case $file in 5764 case $wrapper in
5651 */* | *\\*) . ${wrapperdot} ;; 5765 */* | *\\*) . ${wrapper} ;;
5652 *) . ./${wrapperdot} ;; 5766 *) . ./${wrapper} ;;
5653 esac 5767 esac
5654 5768
5655 # Check the variables that should have been set. 5769 # Check the variables that should have been set.
@@ -5677,17 +5791,15 @@ relink_command=\"$relink_command\""
5677 done 5791 done
5678 5792
5679 relink_command= 5793 relink_command=
5680 # To insure that "foo" is sourced, and not "foo.exe", 5794 # Note that it is not necessary on cygwin/mingw to append a dot to
5681 # finese the cygwin/MSYS system by explicitly sourcing "foo." 5795 # foo even if both foo and FILE.exe exist: automatic-append-.exe
5682 # which disallows the automatic-append-.exe behavior. 5796 # behavior happens only for exec(3), not for open(2)! Also, sourcing
5683 case $build in 5797 # `FILE.' does not work on cygwin managed mounts.
5684 *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; 5798 #
5685 *) wrapperdot=${wrapper} ;;
5686 esac
5687 # If there is no directory component, then add one. 5799 # If there is no directory component, then add one.
5688 case $file in 5800 case $wrapper in
5689 */* | *\\*) . ${wrapperdot} ;; 5801 */* | *\\*) . ${wrapper} ;;
5690 *) . ./${wrapperdot} ;; 5802 *) . ./${wrapper} ;;
5691 esac 5803 esac
5692 5804
5693 outputname= 5805 outputname=
@@ -5728,7 +5840,7 @@ relink_command=\"$relink_command\""
5728 fi 5840 fi
5729 5841
5730 # remove .exe since cygwin /usr/bin/install will append another 5842 # remove .exe since cygwin /usr/bin/install will append another
5731 # one anyways 5843 # one anyway
5732 case $install_prog,$host in 5844 case $install_prog,$host in
5733 */usr/bin/install*,*cygwin*) 5845 */usr/bin/install*,*cygwin*)
5734 case $file:$destfile in 5846 case $file:$destfile in
@@ -6398,7 +6510,7 @@ esac
6398$echo 6510$echo
6399$echo "Try \`$modename --help' for more information about other modes." 6511$echo "Try \`$modename --help' for more information about other modes."
6400 6512
6401exit $EXIT_SUCCESS 6513exit $?
6402 6514
6403# The TAGs below are defined such that we never get into a situation 6515# The TAGs below are defined such that we never get into a situation
6404# in which we disable both kinds of libraries. Given conflicting 6516# in which we disable both kinds of libraries. Given conflicting
diff --git a/po/Makefile.in b/po/Makefile.in
index a6ff029a..1b2f4c15 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
11# Origin: gettext-0.13 11# Origin: gettext-0.13
12 12
13PACKAGE = gnunet-gtk 13PACKAGE = gnunet-gtk
14VERSION = 0.7.0a 14VERSION = 0.7.0b
15 15
16SHELL = /bin/sh 16SHELL = /bin/sh
17 17
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index fea5103a..176dc5fe 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -225,7 +225,7 @@ static int updateView(const ECRS_FileInfo * fi,
225 else { 225 else {
226 char *dotdot; 226 char *dotdot;
227 227
228 while(dotdot = strstr(filename, "..")) 228 while ( NULL != (dotdot = strstr(filename, "..")))
229 dotdot[0] = dotdot[1] = '_'; 229 dotdot[0] = dotdot[1] = '_';
230 } 230 }
231 231
@@ -341,7 +341,7 @@ static int addNamespaceContentToModel(void * cls,
341 else { 341 else {
342 char *dotdot; 342 char *dotdot;
343 343
344 while(dotdot = strstr(filename, "..")) 344 while (NULL != (dotdot = strstr(filename, "..")))
345 dotdot[0] = dotdot[1] = '_'; 345 dotdot[0] = dotdot[1] = '_';
346 } 346 }
347 desc = ECRS_getFirstFromMetaData(fi->meta, 347 desc = ECRS_getFirstFromMetaData(fi->meta,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 48df09ff..9985c4c3 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -102,7 +102,7 @@ void addEntryToSearchTree(GtkTreeStore * model,
102 else { 102 else {
103 char *dotdot; 103 char *dotdot;
104 104
105 while(dotdot = strstr(name, "..")) 105 while (NULL != (dotdot = strstr(name, "..")))
106 dotdot[0] = dotdot[1] = '_'; 106 dotdot[0] = dotdot[1] = '_';
107 } 107 }
108 108
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 19:43:30 +0000