From 31126404b73ab4446db72787b36bdac4c463d1ba Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Sun, 14 Apr 2002 21:41:36 +0000 Subject: [PATCH] * libtool.m4: Update support for Fujistu-Siemens Computers (FSC). * ltmain.in: Add support for EBCDIC based systems. --- ChangeLog | 5 +++++ exe/base-txt.tpl | 13 +++++++++++-- libtool.m4 | 39 +++++++++++++++++++++++++++------------ ltmain.in | 13 +++++++++++-- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 391554f48..cf40f651c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-14 Jean-Frederic Clere + + * libtool.m4: Update support for Fujistu-Siemens Computers (FSC). + * ltmain.in: Add support for EBCDIC based systems. + 2002-04-03 Robert Boehne * exe/compile-txt.tpl: Handle the case when no tag is explicitly set, diff --git a/exe/base-txt.tpl b/exe/base-txt.tpl index c65c489cc..6a9e02dee 100644 --- a/exe/base-txt.tpl +++ b/exe/base-txt.tpl @@ -11,8 +11,17 @@ rm="rm -f" # metacharacters that are still active within double-quoted strings. Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -SP2NL='tr \040 \012' -NL2SP='tr \015\012 \040\040' +# test EBCDIC or ASCII +case `echo A|od -x` in + *[Cc]1*) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" + ;; + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" + ;; +esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. diff --git a/libtool.m4 b/libtool.m4 index 2ba05336b..3ff2f7f13 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1396,6 +1396,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -2028,6 +2034,9 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; @@ -4294,11 +4303,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - if test "x$host_vendor" = xsni; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-LD' - else - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - fi + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; @@ -5021,13 +5026,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsni; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; diff --git a/ltmain.in b/ltmain.in index fc4412395..58214f858 100644 --- a/ltmain.in +++ b/ltmain.in @@ -69,8 +69,17 @@ rm="rm -f" # metacharacters that are still active within double-quoted strings. Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -SP2NL='tr \040 \012' -NL2SP='tr \015\012 \040\040' +# test EBCDIC or ASCII +case `echo A|od -x` in + *[Cc]1*) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" + ;; + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" + ;; +esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. -- 2.47.2