From: Ralf Wildenhues Date: Tue, 1 Feb 2005 07:35:38 +0000 (+0000) Subject: * config/ltmain.m4sh (func_win32_libid, func_infer_tag) X-Git-Tag: release-1-5-12~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b5084ed6e38b01fca2349170900bf59f8021b74;p=thirdparty%2Flibtool.git * config/ltmain.m4sh (func_win32_libid, func_infer_tag) (func_extract_an_archive, func_extract_archives): adjust to preferred function header layout. --- diff --git a/ChangeLog b/ChangeLog index bd6afdeec..53c1acf9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-01 Ralf Wildenhues + + * config/ltmain.m4sh (func_win32_libid, func_infer_tag) + (func_extract_an_archive, func_extract_archives): + adjust to preferred function header layout. + 2005-01-31 Ralf Wildenhues * libtool.m4 (AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): Unicos 9 sed rejects diff --git a/ltmain.in b/ltmain.in index 6b50bbd4e..792481185 100644 --- a/ltmain.in +++ b/ltmain.in @@ -144,7 +144,8 @@ quote_scanset='[[~#^*{};<>?'"'"' ]' # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -func_win32_libid () { +func_win32_libid () +{ win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -184,7 +185,8 @@ func_win32_libid () { # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. # arg is usually of the form 'gcc ...' -func_infer_tag () { +func_infer_tag () +{ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -244,7 +246,8 @@ func_infer_tag () { # func_extract_an_archive dir oldlib -func_extract_an_archive () { +func_extract_an_archive () +{ f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" f_ex_an_ar_lib=`$echo "X$f_ex_an_ar_oldlib" | $Xsed -e 's%^.*/%%'` @@ -282,7 +285,8 @@ func_extract_an_archive () { } # func_extract_archives gentop oldlib ... -func_extract_archives () { +func_extract_archives () +{ my_gentop="$1"; shift my_oldlibs=${1+"$@"} my_oldobjs=""