diff options
author | Christian Grothoff <christian@grothoff.org> | 2005-12-23 23:34:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2005-12-23 23:34:27 +0000 |
commit | ecaaed0f0973a4a178c5d630f459699e24116e58 (patch) | |
tree | 48c7633bee72bc35837e04223bfa574f3a7e485f | |
parent | 64826ef5ecd0921641b2507d7a1e5ce0be243214 (diff) | |
download | gnunet-gtk-ecaaed0f0973a4a178c5d630f459699e24116e58.tar.gz gnunet-gtk-ecaaed0f0973a4a178c5d630f459699e24116e58.zip |
version bump and some warnings'
'
-rw-r--r-- | libltdl/aclocal.m4 | 951 | ||||
-rwxr-xr-x | libltdl/config.guess | 525 | ||||
-rwxr-xr-x | libltdl/config.sub | 50 | ||||
-rwxr-xr-x | libltdl/configure | 1764 | ||||
-rw-r--r-- | libltdl/ltmain.sh | 716 | ||||
-rw-r--r-- | ltmain.sh | 716 | ||||
-rw-r--r-- | po/Makefile.in | 2 | ||||
-rw-r--r-- | src/plugins/fs/namespace.c | 4 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 2 |
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. |
127 | Xsed='sed -e s/^X//' | 126 | Xsed='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" | |||
144 | default_ofile=libtool | 143 | default_ofile=libtool |
145 | can_build_shared=yes | 144 | can_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'). |
149 | libext=a | 148 | libext=a |
150 | ltmain="$ac_aux_dir/ltmain.sh" | 149 | ltmain="$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" |
193 | fi | 192 | fi |
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 |
196 | case $deplibs_check_method in | 197 | case $deplibs_check_method in |
197 | file_magic*) | 198 | file_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. | ||
244 | AC_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 | ||
252 | done | ||
253 | cc_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. | ||
261 | AC_DEFUN([_LT_COMPILER_BOILERPLATE], | ||
262 | [ac_outfile=conftest.$ac_objext | ||
263 | printf "$lt_simple_compile_test_code" >conftest.$ac_ext | ||
264 | eval "$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. | ||
274 | AC_DEFUN([_LT_LINKER_BOILERPLATE], | ||
275 | [ac_outfile=conftest.$ac_objext | ||
276 | printf "$lt_simple_link_test_code" >conftest.$ac_ext | ||
277 | eval "$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. |
312 | if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi | 355 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
313 | 356 | ||
314 | if test -z "$ECHO"; then | 357 | if test -z "$ECHO"; then |
315 | if test "X${echo_test_string+set}" != Xset; then | 358 | if 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 | }] |
778 | EOF | 855 | EOF |
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)= |
1008 | if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ | 1087 | if 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 | ||
1177 | bsdi4*) | 1256 | bsdi[[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 | ||
1293 | freebsd*) | 1373 | freebsd* | 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*) | |||
1510 | openbsd*) | 1599 | openbsd*) |
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 |
1742 | AC_DEFUN([AC_LIBTOOL_WIN32_DLL], | 1837 | AC_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 | |||
2054 | AC_DEFUN([AC_PROG_LD_GNU], | 2149 | AC_DEFUN([AC_PROG_LD_GNU], |
2055 | [AC_REQUIRE([AC_PROG_EGREP])dnl | 2150 | [AC_REQUIRE([AC_PROG_EGREP])dnl |
2056 | AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, | 2151 | AC_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. |
2058 | case `$LD -v 2>&1 </dev/null` in | 2153 | case `$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" ;; |
2082 | esac | 2177 | esac |
2083 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 2178 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2179 | case $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 | ;; | ||
2187 | esac | ||
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 | ||
2117 | bsdi4*) | 2221 | bsdi[[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 | ||
2140 | freebsd* | kfreebsd*-gnu) | 2244 | freebsd* | 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 | ||
2160 | hpux10.20* | hpux11*) | 2264 | hpux10.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 | ||
2211 | openbsd*) | 2315 | openbsd*) |
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. |
2345 | AC_DEFUN([AC_LIBLTDL_CONVENIENCE], | 2447 | AC_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. |
2371 | AC_DEFUN([AC_LIBLTDL_INSTALLABLE], | 2473 | AC_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 | # --------------- |
2405 | AC_DEFUN([_LT_AC_LANG_CXX], | 2507 | AC_DEFUN([_LT_AC_LANG_CXX], |
2406 | [AC_REQUIRE([AC_PROG_CXX]) | 2508 | [AC_REQUIRE([AC_PROG_CXX]) |
2407 | AC_REQUIRE([AC_PROG_CXXCPP]) | 2509 | AC_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 | # --------------- | ||
2515 | AC_DEFUN([_LT_AC_PROG_CXXCPP], | ||
2516 | [ | ||
2517 | AC_REQUIRE([AC_PROG_CXX]) | ||
2518 | if 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 | ||
2522 | fi | ||
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. |
2533 | case "$host_os" in | 2650 | case $host_os in |
2534 | aix3*) | 2651 | aix3*) |
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 | ;; |
2584 | esac | 2664 | esac |
2585 | AC_MSG_RESULT([$enable_shared]) | 2665 | AC_MSG_RESULT([$enable_shared]) |
@@ -2605,7 +2685,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) | |||
2605 | AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], | 2685 | AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], |
2606 | [AC_LANG_PUSH(C++) | 2686 | [AC_LANG_PUSH(C++) |
2607 | AC_REQUIRE([AC_PROG_CXX]) | 2687 | AC_REQUIRE([AC_PROG_CXX]) |
2608 | AC_REQUIRE([AC_PROG_CXXCPP]) | 2688 | AC_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. |
2637 | ac_ext=cc | 2717 | ac_ext=cpp |
2638 | 2718 | ||
2639 | # Object file extension for compiled C++ test sources. | 2719 | # Object file extension for compiled C++ test sources. |
2640 | objext=o | 2720 | objext=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. |
2653 | lt_save_CC=$CC | 2737 | lt_save_CC=$CC |
2654 | lt_save_LD=$LD | 2738 | lt_save_LD=$LD |
@@ -2670,7 +2754,7 @@ test -z "${LDCXX+set}" || LD=$LDCXX | |||
2670 | CC=${CXX-"c++"} | 2754 | CC=${CXX-"c++"} |
2671 | compiler=$CC | 2755 | compiler=$CC |
2672 | _LT_AC_TAGVAR(compiler, $1)=$CC | 2756 | _LT_AC_TAGVAR(compiler, $1)=$CC |
2673 | cc_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 | ||
3757 | ifelse([$1],[CXX], | ||
3758 | [case $host_os in | ||
3759 | solaris*) | ||
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 | ||
3768 | esac | ||
3769 | ]) | ||
3770 | |||
3620 | case " $_LT_AC_TAGVAR(postdeps, $1) " in | 3771 | case " $_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 ;; |
3622 | esac | 3773 | esac |
@@ -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. |
3671 | lt_save_CC="$CC" | 3826 | lt_save_CC="$CC" |
3672 | CC=${F77-"f77"} | 3827 | CC=${F77-"f77"} |
3673 | compiler=$CC | 3828 | compiler=$CC |
3674 | _LT_AC_TAGVAR(compiler, $1)=$CC | 3829 | _LT_AC_TAGVAR(compiler, $1)=$CC |
3675 | cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` | 3830 | _LT_CC_BASENAME([$compiler]) |
3676 | 3831 | ||
3677 | AC_MSG_CHECKING([if libtool supports shared libraries]) | 3832 | AC_MSG_CHECKING([if libtool supports shared libraries]) |
3678 | AC_MSG_RESULT([$can_build_shared]) | 3833 | AC_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. |
3685 | case "$host_os" in | 3840 | case $host_os in |
3686 | aix3*) | 3841 | aix3*) |
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 | ;; |
3693 | aix4* | aix5*) | 3848 | aix4* | 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 | ;; |
3696 | esac | 3853 | esac |
3697 | AC_MSG_RESULT([$enable_shared]) | 3854 | AC_MSG_RESULT([$enable_shared]) |
@@ -3742,20 +3899,27 @@ _LT_AC_TAGVAR(objext, $1)=$objext | |||
3742 | lt_simple_compile_test_code="class foo {}\n" | 3899 | lt_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 |
3745 | lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' | 3902 | lt_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. |
3751 | lt_save_CC="$CC" | 3912 | lt_save_CC="$CC" |
3752 | CC=${GCJ-"gcj"} | 3913 | CC=${GCJ-"gcj"} |
3753 | compiler=$CC | 3914 | compiler=$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 | |||
3759 | AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) | 3923 | AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) |
3760 | AC_LIBTOOL_PROG_COMPILER_PIC($1) | 3924 | AC_LIBTOOL_PROG_COMPILER_PIC($1) |
3761 | AC_LIBTOOL_PROG_CC_C_O($1) | 3925 | AC_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. |
3802 | lt_save_CC="$CC" | 3970 | lt_save_CC="$CC" |
3803 | CC=${RC-"windres"} | 3971 | CC=${RC-"windres"} |
3804 | compiler=$CC | 3972 | compiler=$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 | ||
3808 | AC_LIBTOOL_CONFIG($1) | 3977 | AC_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], [], | |||
3949 | SED=$lt_SED | 4118 | SED=$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. |
3952 | Xsed="$SED -e s/^X//" | 4121 | Xsed="$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. |
3956 | if 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. |
3959 | available_tags= | 4128 | available_tags= |
@@ -3984,6 +4153,12 @@ fast_install=$enable_fast_install | |||
3984 | # The host system. | 4153 | # The host system. |
3985 | host_alias=$host_alias | 4154 | host_alias=$host_alias |
3986 | host=$host | 4155 | host=$host |
4156 | host_os=$host_os | ||
4157 | |||
4158 | # The build system. | ||
4159 | build_alias=$build_alias | ||
4160 | build=$build | ||
4161 | build_os=$build_os | ||
3987 | 4162 | ||
3988 | # An echo program that does not interpret backslashes. | 4163 | # An echo program that does not interpret backslashes. |
3989 | echo=$lt_echo | 4164 | echo=$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? |
4061 | compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) | 4236 | compiler_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? |
4064 | need_locks=$lt_need_locks | 4239 | need_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. |
4335 | sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' | 4510 | sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' |
4336 | 4511 | ||
4337 | # Transform the above into a raw symbol and a C symbol. | ||
4338 | symxfrm='\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 |
4341 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" | 4513 | lt_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 | ;; |
4533 | linux*) | ||
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 | ;; | ||
4361 | irix* | nonstopux*) | 4540 | irix* | 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. |
4390 | for ac_symprfx in "" "_"; do | 4569 | for 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]) |
4952 | fi | 5177 | fi |
4953 | case "$host_os" in | 5178 | case $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~ | ||
5172 | cat $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. |
5899 | for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do | 6163 | for 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 |
5924 | done | 6188 | done |
5925 | SED=$lt_cv_path_SED | ||
5926 | ]) | 6189 | ]) |
6190 | SED=$lt_cv_path_SED | ||
5927 | AC_MSG_RESULT([$SED]) | 6191 | AC_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 | |||
5966 | if test "x$with_included_ltdl" = xno; then | 6229 | if 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 |
5972 | fi | 6235 | fi |
@@ -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 | |||
6119 | eval libltdl_cv_shlibext=$shrext_cmds | 6382 | eval libltdl_cv_shlibext=$shrext_cmds |
6120 | ]) | 6383 | ]) |
6121 | if test -n "$libltdl_cv_shlibext"; then | 6384 | if 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".]) |
6124 | fi | 6387 | fi |
6125 | ])# AC_LTDL_SHLIBEXT | 6388 | ])# AC_LTDL_SHLIBEXT |
@@ -6132,7 +6395,7 @@ AC_DEFUN([AC_LTDL_SHLIBPATH], | |||
6132 | AC_CACHE_CHECK([which variable specifies run-time library path], | 6395 | AC_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"]) |
6134 | if test -n "$libltdl_cv_shlibpath_var"; then | 6397 | if 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.]) |
6137 | fi | 6400 | fi |
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.]) |
6159 | fi | 6422 | fi |
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 | ]) |
6183 | AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/", | 6446 | AC_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 | ]) |
6200 | if test x"$libltdl_cv_preloaded_symbols" = xyes; then | 6463 | if 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.]) |
6203 | fi | 6466 | fi |
6204 | ])# AC_LTDL_DLPREOPEN | 6467 | ])# AC_LTDL_DLPREOPEN |
@@ -6317,7 +6580,7 @@ if test x"$ac_cv_sys_symbol_underscore" = xyes; then | |||
6317 | fi | 6580 | fi |
6318 | 6581 | ||
6319 | if test x"$libltdl_cv_need_uscore" = xyes; then | 6582 | if 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.]) |
6322 | fi | 6585 | fi |
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 | ||
6 | timestamp='2005-04-22' | 6 | timestamp='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." | |||
66 | while test $# -gt 0 ; do | 68 | while 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 ;; |
126 | esac ;' | 128 | esac ; 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 | } |
460 | EOF | 430 | EOF |
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 | } |
546 | EOF | 517 | EOF |
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 | } |
692 | EOF | 677 | EOF |
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 |
863 | EOF | 853 | EOF |
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 |
882 | EOF | 872 | EOF |
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 |
983 | EOF | 976 | EOF |
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 ;; | ||
1267 | esac | 1267 | esac |
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 | } |
1385 | EOF | 1385 | EOF |
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 | ||
1391 | test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } | 1392 | test -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 |
1417 | fi | 1418 | fi |
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 | ||
6 | timestamp='2005-04-22' | 6 | timestamp='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." | |||
83 | while test $# -gt 0 ; do | 84 | while 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. |