X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=libtool;h=7465f0076d7a43259884adfc1ab01995578b7bae;hp=1b5444e99abf1bd1ebb0ee0e88c544842d684303;hb=278f2cbeca65df1413530d116afa84b592da517a;hpb=77d91029549d9d526572966a0884c015acd2727e diff --git a/libtool b/libtool old mode 100644 new mode 100755 index 1b5444e..7465f00 --- a/libtool +++ b/libtool @@ -2,7 +2,7 @@ # libtool - Provide generalized library-building support services. # Generated automatically by config.status (lcr) 1.14 -# Libtool was configured on host freeswitch: +# Libtool was configured on host netbook: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -110,42 +110,19 @@ SP2NL="tr \\040 \\012" # turn newlines into spaces. NL2SP="tr \\015\\012 \\040\\040" -# convert $build file names to $host format. -to_host_file_cmd=func_convert_file_noop - -# convert $build files to toolchain format. -to_tool_file_cmd=func_convert_file_noop - # An object symbol dumper. OBJDUMP="objdump" # Method to check whether dependent libraries are shared objects. deplibs_check_method="pass_all" -# Command to use when deplibs_check_method = "file_magic". +# Command to use when deplibs_check_method == "file_magic". file_magic_cmd="\$MAGIC_CMD" -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob="" - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob="no" - -# DLL creation program. -DLLTOOL="false" - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd="printf %s\\n" - # The archiver. AR="ar" - -# Flags to create an archive. AR_FLAGS="cru" -# How to feed a file listing to the archiver. -archiver_list_spec="@" - # A symbol stripping program. STRIP="strip" @@ -164,22 +141,16 @@ LTCC="gcc" LTCFLAGS="-g -O2" # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" +global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'" # Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'" +global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'" # Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'" - -# Specify filename containing input files for $NM. -nm_file_list_spec="@" - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot= +global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'" # The name of the directory that contains temporary libtool files. objdir=.libs @@ -190,9 +161,6 @@ MAGIC_CMD=file # Must we lock files when doing compilation? need_locks="no" -# Manifest tool. -MANIFEST_TOOL=":" - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL="" @@ -269,10 +237,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.5.3 /usr/i686-pc-linux-gnu/lib /usr/lib /lib " +sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.4.5 /usr/i686-pc-linux-gnu/lib /usr/lib /lib " # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i486-pc-linux-gnu/4.5.3 /usr/lib/gcc/i686-pc-linux-gnu/4.5.3 /usr/local/freeswitch/lib " +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /usr/i686-pc-linux-gnu/lib /opt/uhd/lib //usr/lib/opengl/xorg-x11/lib /usr/lib/gcc/i686-pc-linux-gnu/4.4.5 /usr/lib/qt4 " # Whether dlopen is supported. dlopen_support=unknown @@ -307,12 +275,12 @@ with_gcc=yes # Compiler flag to turn off builtin functions. no_builtin_flag=" -fno-builtin" -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" - # How to pass a linker flag through the compiler. wl="-Wl," +# Additional compiler flags for building library objects. +pic_flag=" -fPIC -DPIC" + # Compiler flag to prevent dynamic linking. link_static_flag="-static" @@ -341,11 +309,11 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build a shared archive. -archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" +archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ - \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" + \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" # Commands used to build a loadable module if different from building # a shared archive. @@ -402,6 +370,9 @@ inherit_rpath=no # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=unknown +# Fix the shell variable $srcfile for the compiler. +fix_srcfile_path="" + # Set to "yes" if exported symbols are required. always_export_symbols=no @@ -417,9 +388,6 @@ include_expsyms="" # Commands necessary for linking programs (against libraries) with templates. prelink_cmds="" -# Commands necessary for finishing linking programs. -postlink_cmds="" - # Specify filename containing input files. file_list_spec="" @@ -613,18 +581,20 @@ basename="s,^.*/,," # otherwise set result to NONDIR_REPLACEMENT. func_dirname () { - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} # Extended-shell func_dirname implementation + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation # func_basename file func_basename () { - func_basename_result="${1##*/}" -} # Extended-shell func_basename implementation + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation # func_dirname_and_basename file append nondir_replacement @@ -641,12 +611,15 @@ func_basename () # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} # Extended-shell func_dirname_and_basename implementation + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation # func_stripname prefix suffix name @@ -657,12 +630,11 @@ func_dirname_and_basename () # func_strip_suffix prefix name func_stripname () { - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} # Extended-shell func_stripname implementation + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation # These SED scripts presuppose an absolute path with a trailing slash. @@ -1242,9 +1214,12 @@ func_missing_arg () # variables after splitting SHORTOPT after the 2nd character. func_split_short_opt () { - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"} -} # Extended-shell func_split_short_opt implementation + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation # func_split_long_opt longopt @@ -1252,9 +1227,12 @@ func_split_short_opt () # variables after splitting LONGOPT at the `=' sign. func_split_long_opt () { - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=} -} # Extended-shell func_split_long_opt implementation + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation exit_cmd=: @@ -1282,8 +1260,8 @@ exec_cmd= # Append VALUE to the end of shell variable VAR. func_append () { - eval "${1}+=\${2}" -} # Extended-shell func_append implementation + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation # func_append_quoted var value # Quote VALUE and append to the end of shell variable VAR, separated @@ -1291,40 +1269,37 @@ func_append () func_append_quoted () { func_quote_for_eval "${2}" - eval "${1}+=\\ \$func_quote_for_eval_result" -} # Extended-shell func_append_quoted implementation + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation # func_arith arithmetic-term... func_arith () { - func_arith_result=$(( $* )) -} # Extended-shell func_arith implementation + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation # func_len string # STRING may not start with a hyphen. func_len () { - func_len_result=${#1} -} # Extended-shell func_len implementation + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation # func_lo2o object func_lo2o () { - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} # Extended-shell func_lo2o implementation + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation # func_xform libobj-or-source func_xform () { - func_xform_result=${1%.*}.lo -} # Extended-shell func_xform implementation + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation # func_fatal_configuration arg... @@ -1555,27 +1530,27 @@ esac ;; --no-silent|--no-quiet) opt_silent=false -preserve_args+=" $opt" +func_append preserve_args " $opt" ;; --no-verbose) opt_verbose=false -preserve_args+=" $opt" +func_append preserve_args " $opt" ;; --silent|--quiet) opt_silent=: -preserve_args+=" $opt" +func_append preserve_args " $opt" opt_verbose=false ;; --verbose|-v) opt_verbose=: -preserve_args+=" $opt" +func_append preserve_args " $opt" opt_silent=false ;; --tag) test $# = 0 && func_missing_arg $opt && break optarg="$1" opt_tag="$optarg" -preserve_args+=" $opt $optarg" +func_append preserve_args " $opt $optarg" func_enable_tag "$optarg" shift ;; @@ -1613,7 +1588,7 @@ func_enable_tag "$optarg" fi # preserve --debug - test "$opt_debug" = : || preserve_args+=" --debug" + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -2072,7 +2047,7 @@ func_convert_path_front_back_pathsep () ;; esac case $4 in - $2 ) func_to_host_path_result+="$3" + $2 ) func_append func_to_host_path_result "$3" ;; esac } @@ -2422,12 +2397,12 @@ func_mode_compile () ;; -pie | -fpie | -fPIE) - pie_flag+=" $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later+=" $arg" + func_append later " $arg" continue ;; @@ -2455,7 +2430,7 @@ func_mode_compile () lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile+=" $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -2602,12 +2577,12 @@ compiler." $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist+=" $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist+=" $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 @@ -2631,7 +2606,7 @@ compiler." if test -z "$output_obj"; then # Place PIC objects in $objdir - command+=" -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -2678,11 +2653,11 @@ compiler." command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command+=" -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command+="$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -2990,7 +2965,7 @@ func_mode_execute () dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir+="/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -3093,11 +3068,11 @@ func_mode_finish () for opt in "$nonopt" ${1+"$@"} do if test -d "$opt"; then - libdirs+=" $opt" + func_append libdirs " $opt" elif test -f "$opt"; then if func_lalib_unsafe_p "$opt"; then - libs+=" $opt" + func_append libs " $opt" else func_warning "\`$opt' is not a valid libtool archive" fi @@ -3141,7 +3116,7 @@ func_mode_finish () if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds+=" + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -3223,7 +3198,7 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog+="$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -3243,7 +3218,7 @@ func_mode_install () do arg2= if test -n "$dest"; then - files+=" $dest" + func_append files " $dest" dest=$arg continue fi @@ -3281,11 +3256,11 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog+=" $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then func_quote_for_eval "$arg2" fi - install_shared_prog+=" $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -3297,7 +3272,7 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else func_quote_for_eval "$install_override_mode" - install_shared_prog+=" -m $func_quote_for_eval_result" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -3355,7 +3330,7 @@ func_mode_install () case $file in *.$libext) # Do the static libraries later. - staticlibs+=" $file" + func_append staticlibs " $file" ;; *.la) @@ -3375,19 +3350,19 @@ func_mode_install () if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs+=" $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs+=" $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir+="$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. @@ -3464,7 +3439,7 @@ func_mode_install () func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs+=" $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -3923,7 +3898,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags+=" $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -5639,14 +5614,14 @@ func_mode_link () shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result - libtool_args+=" $func_quote_for_eval_result" + func_append libtool_args " $func_quote_for_eval_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then case $prev in output) - compile_command+=" @OUTPUT@" - finalize_command+=" @OUTPUT@" + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" ;; esac @@ -5659,8 +5634,8 @@ func_mode_link () dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. - compile_command+=" @SYMFILE@" - finalize_command+=" @SYMFILE@" + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" preload=yes fi case $arg in @@ -5687,9 +5662,9 @@ func_mode_link () ;; *) if test "$prev" = dlfiles; then - dlfiles+=" $arg" + func_append dlfiles " $arg" else - dlprefiles+=" $arg" + func_append dlprefiles " $arg" fi prev= continue @@ -5713,7 +5688,7 @@ func_mode_link () *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) deplibs+=" $qarg.ltframework" # this is fixed later + *) func_append deplibs " $qarg.ltframework" # this is fixed later ;; esac ;; @@ -5732,7 +5707,7 @@ func_mode_link () moreargs= for fil in `cat "$save_arg"` do -# moreargs+=" $fil" +# func_append moreargs " $fil" arg=$fil # A libtool-controlled object. @@ -5761,7 +5736,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles+=" $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -5773,12 +5748,12 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles+=" $pic_object" + func_append dlprefiles " $pic_object" prev= fi # A PIC object. - libobjs+=" $pic_object" + func_append libobjs " $pic_object" arg="$pic_object" fi @@ -5788,7 +5763,7 @@ func_mode_link () non_pic_object="$xdir$non_pic_object" # A standard non-PIC object - non_pic_objects+=" $non_pic_object" + func_append non_pic_objects " $non_pic_object" if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi @@ -5796,7 +5771,7 @@ func_mode_link () # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. non_pic_object="$pic_object" - non_pic_objects+=" $non_pic_object" + func_append non_pic_objects " $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -5808,8 +5783,8 @@ func_mode_link () func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result non_pic_object=$xdir$func_lo2o_result - libobjs+=" $pic_object" - non_pic_objects+=" $non_pic_object" + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" else func_fatal_error "\`$arg' is not a valid libtool object" fi @@ -5843,12 +5818,12 @@ func_mode_link () if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) rpath+=" $arg" ;; + *) func_append rpath " $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) xrpath+=" $arg" ;; + *) func_append xrpath " $arg" ;; esac fi prev= @@ -5860,31 +5835,31 @@ func_mode_link () continue ;; weak) - weak_libs+=" $arg" + func_append weak_libs " $arg" prev= continue ;; xcclinker) - linker_flags+=" $qarg" - compiler_flags+=" $qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" prev= - compile_command+=" $qarg" - finalize_command+=" $qarg" + func_append compile_command " $qarg" + func_append finalize_command " $qarg" continue ;; xcompiler) - compiler_flags+=" $qarg" + func_append compiler_flags " $qarg" prev= - compile_command+=" $qarg" - finalize_command+=" $qarg" + func_append compile_command " $qarg" + func_append finalize_command " $qarg" continue ;; xlinker) - linker_flags+=" $qarg" - compiler_flags+=" $wl$qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" prev= - compile_command+=" $wl$qarg" - finalize_command+=" $wl$qarg" + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" continue ;; *) @@ -5901,8 +5876,8 @@ func_mode_link () -all-static) if test -n "$link_static_flag"; then # See comment for -static flag below, for more details. - compile_command+=" $link_static_flag" - finalize_command+=" $link_static_flag" + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" fi continue ;; @@ -5964,8 +5939,8 @@ func_mode_link () -L[A-Z][A-Z]*:*) case $with_gcc/$host in no/*-*-irix* | /*-*-irix*) - compile_command+=" $arg" - finalize_command+=" $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" ;; esac continue @@ -5999,10 +5974,10 @@ func_mode_link () *) # Preserve sysroot, but never include relative directories case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) deplibs+=" $arg" ;; - *) deplibs+=" -L$dir" ;; + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; esac - lib_search_path+=" $dir" + func_append lib_search_path " $dir" ;; esac case $host in @@ -6011,12 +5986,12 @@ func_mode_link () case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) dllsearchpath+=":$dir";; + *) func_append dllsearchpath ":$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath+=":$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -6040,7 +6015,7 @@ func_mode_link () ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs+=" System.ltframework" + func_append deplibs " System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -6060,7 +6035,7 @@ func_mode_link () ;; esac fi - deplibs+=" $arg" + func_append deplibs " $arg" continue ;; @@ -6073,20 +6048,20 @@ func_mode_link () # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. -model|-arch|-isysroot|--sysroot) - compiler_flags+=" $arg" - compile_command+=" $arg" - finalize_command+=" $arg" + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" prev=xcompiler continue ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags+=" $arg" - compile_command+=" $arg" - finalize_command+=" $arg" + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) new_inherited_linker_flags+=" $arg" ;; + * ) func_append new_inherited_linker_flags " $arg" ;; esac continue ;; @@ -6163,7 +6138,7 @@ func_mode_link () esac case "$xrpath " in *" $dir "*) ;; - *) xrpath+=" $dir" ;; + *) func_append xrpath " $dir" ;; esac continue ;; @@ -6216,8 +6191,8 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg+=" $func_quote_for_eval_result" - compiler_flags+=" $func_quote_for_eval_result" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -6232,9 +6207,9 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg+=" $wl$func_quote_for_eval_result" - compiler_flags+=" $wl$func_quote_for_eval_result" - linker_flags+=" $func_quote_for_eval_result" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -6280,9 +6255,9 @@ func_mode_link () -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" - compile_command+=" $arg" - finalize_command+=" $arg" - compiler_flags+=" $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" continue ;; @@ -6294,7 +6269,7 @@ func_mode_link () *.$objext) # A standard object. - objs+=" $arg" + func_append objs " $arg" ;; *.lo) @@ -6325,7 +6300,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles+=" $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -6337,12 +6312,12 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles+=" $pic_object" + func_append dlprefiles " $pic_object" prev= fi # A PIC object. - libobjs+=" $pic_object" + func_append libobjs " $pic_object" arg="$pic_object" fi @@ -6352,7 +6327,7 @@ func_mode_link () non_pic_object="$xdir$non_pic_object" # A standard non-PIC object - non_pic_objects+=" $non_pic_object" + func_append non_pic_objects " $non_pic_object" if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi @@ -6360,7 +6335,7 @@ func_mode_link () # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. non_pic_object="$pic_object" - non_pic_objects+=" $non_pic_object" + func_append non_pic_objects " $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -6372,8 +6347,8 @@ func_mode_link () func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result non_pic_object=$xdir$func_lo2o_result - libobjs+=" $pic_object" - non_pic_objects+=" $non_pic_object" + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" else func_fatal_error "\`$arg' is not a valid libtool object" fi @@ -6382,8 +6357,8 @@ func_mode_link () *.$libext) # An archive. - deplibs+=" $arg" - old_deplibs+=" $arg" + func_append deplibs " $arg" + func_append old_deplibs " $arg" continue ;; @@ -6393,14 +6368,14 @@ func_mode_link () func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - dlfiles+=" $func_resolve_sysroot_result" + func_append dlfiles " $func_resolve_sysroot_result" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - dlprefiles+=" $func_resolve_sysroot_result" + func_append dlprefiles " $func_resolve_sysroot_result" prev= else - deplibs+=" $func_resolve_sysroot_result" + func_append deplibs " $func_resolve_sysroot_result" fi continue ;; @@ -6416,8 +6391,8 @@ func_mode_link () # Now actually substitute the argument into the commands. if test -n "$arg"; then - compile_command+=" $arg" - finalize_command+=" $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" fi done # argument parsing loop @@ -6426,8 +6401,8 @@ func_mode_link () if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" - compile_command+=" $arg" - finalize_command+=" $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" fi oldlibs= @@ -6471,10 +6446,10 @@ func_mode_link () for deplib in $deplibs; do if $opt_preserve_dup_deps ; then case "$libs " in - *" $deplib "*) specialdeplibs+=" $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - libs+=" $deplib" + func_append libs " $deplib" done if test "$linkmode" = lib; then @@ -6487,9 +6462,9 @@ func_mode_link () if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs+=" $pre_post_deps" ;; + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; esac - pre_post_deps+=" $pre_post_dep" + func_append pre_post_deps " $pre_post_dep" done fi pre_post_deps= @@ -6568,7 +6543,7 @@ func_mode_link () deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; - *) deplibs+=" $deplib" ;; + *) func_append deplibs " $deplib" ;; esac done done @@ -6589,11 +6564,11 @@ func_mode_link () compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags+=" $deplib" + func_append compiler_flags " $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags+=" $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -6678,7 +6653,7 @@ func_mode_link () if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags+=" $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -6692,7 +6667,7 @@ func_mode_link () newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" - newlib_search_path+=" $func_resolve_sysroot_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) if test "$pass" = conv; then @@ -6707,7 +6682,7 @@ func_mode_link () fi func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" - newlib_search_path+=" $func_resolve_sysroot_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -6723,7 +6698,7 @@ func_mode_link () # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) xrpath+=" $dir" ;; + *) func_append xrpath " $dir" ;; esac fi deplibs="$deplib $deplibs" @@ -6795,11 +6770,11 @@ func_mode_link () if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - newdlprefiles+=" $deplib" + func_append newdlprefiles " $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - newdlfiles+=" $deplib" + func_append newdlfiles " $deplib" fi fi continue @@ -6845,7 +6820,7 @@ func_mode_link () for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags+=" $tmp_inherited_linker_flag";; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; esac done fi @@ -6853,8 +6828,8 @@ func_mode_link () if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles+=" $dlopen" - test -n "$dlpreopen" && dlprefiles+=" $dlpreopen" + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi if test "$pass" = conv; then @@ -6865,8 +6840,8 @@ func_mode_link () func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - convenience+=" $ladir/$objdir/$old_library" - old_convenience+=" $ladir/$objdir/$old_library" + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi @@ -6875,10 +6850,10 @@ func_mode_link () deplibs="$deplib $deplibs" if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs+=" $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs+=" $deplib" + func_append tmp_libs " $deplib" done continue fi # $pass = conv @@ -6911,9 +6886,9 @@ func_mode_link () # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - dlprefiles+=" $lib $dependency_libs" + func_append dlprefiles " $lib $dependency_libs" else - newdlfiles+=" $lib" + func_append newdlfiles " $lib" fi continue fi # $pass = dlopen @@ -6950,12 +6925,12 @@ func_mode_link () dir="$ladir" absdir="$abs_ladir" # Remove this search path later - notinst_path+=" $abs_ladir" + func_append notinst_path " $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - notinst_path+=" $abs_ladir" + func_append notinst_path " $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -6980,29 +6955,29 @@ func_mode_link () if test -n "$dlname"; then func_tr_sh "$dir/$linklib" eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - newdlprefiles+=" $dir/$linklib" + func_append newdlprefiles " $dir/$linklib" else - newdlprefiles+=" $dir/$old_library" + func_append newdlprefiles " $dir/$old_library" # Keep a list of preopened convenience libraries to check # that they are being used correctly in the link pass. test -z "$libdir" && \ - dlpreconveniencelibs+=" $dir/$old_library" + func_append dlpreconveniencelibs " $dir/$old_library" fi ;; * ) # Prefer using a static library (so that no silly _DYNAMIC symbols # are required to link). if test -n "$old_library"; then - newdlprefiles+=" $dir/$old_library" + func_append newdlprefiles " $dir/$old_library" # Keep a list of preopened convenience libraries to check # that they are being used correctly in the link pass. test -z "$libdir" && \ - dlpreconveniencelibs+=" $dir/$old_library" + func_append dlpreconveniencelibs " $dir/$old_library" # Otherwise, use the dlname, so that lt_dlopen finds it. elif test -n "$dlname"; then - newdlprefiles+=" $dir/$dlname" + func_append newdlprefiles " $dir/$dlname" else - newdlprefiles+=" $dir/$linklib" + func_append newdlprefiles " $dir/$linklib" fi ;; esac @@ -7023,7 +6998,7 @@ func_mode_link () if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path+=" $ladir" + func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -7037,7 +7012,7 @@ func_mode_link () case $deplib in -L*) func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" - newlib_search_path+=" $func_resolve_sysroot_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; esac # Need to link against all dependency_libs? @@ -7050,10 +7025,10 @@ func_mode_link () fi if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs+=" $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs+=" $deplib" + func_append tmp_libs " $deplib" done # for deplib continue fi # $linkmode = prog... @@ -7068,7 +7043,7 @@ func_mode_link () # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) temp_rpath+="$absdir:" ;; + *) func_append temp_rpath "$absdir:" ;; esac fi @@ -7080,7 +7055,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath+=" $absdir" ;; + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -7089,7 +7064,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath+=" $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -7114,12 +7089,12 @@ func_mode_link () case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs+=" $lib" + func_append notinst_deplibs " $lib" need_relink=no ;; *) if test "$installed" = no; then - notinst_deplibs+=" $lib" + func_append notinst_deplibs " $lib" need_relink=yes fi ;; @@ -7154,7 +7129,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath+=" $absdir" ;; + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -7163,7 +7138,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath+=" $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -7273,7 +7248,7 @@ func_mode_link () if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir+=" -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -7295,7 +7270,7 @@ func_mode_link () if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) compile_shlibpath+="$add_shlibpath:" ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -7309,7 +7284,7 @@ func_mode_link () test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath+="$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac fi fi @@ -7329,7 +7304,7 @@ func_mode_link () elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath+="$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -7346,7 +7321,7 @@ func_mode_link () if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir+=" -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -7423,15 +7398,15 @@ func_mode_link () temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) xrpath+=" $temp_xrpath";; + *) func_append xrpath " $temp_xrpath";; esac;; - *) temp_deplibs+=" $libdir";; + *) func_append temp_deplibs " $libdir";; esac done dependency_libs="$temp_deplibs" fi - newlib_search_path+=" $absdir" + func_append newlib_search_path " $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs @@ -7446,10 +7421,10 @@ func_mode_link () if $opt_preserve_dup_deps ; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) - specialdeplibs+=" $func_resolve_sysroot_result" ;; + func_append specialdeplibs " $func_resolve_sysroot_result" ;; esac fi - tmp_libs+=" $func_resolve_sysroot_result" + func_append tmp_libs " $func_resolve_sysroot_result" done if test "$link_all_deplibs" != no; then @@ -7489,8 +7464,8 @@ func_mode_link () if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - compiler_flags+=" ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags+=" -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -7540,7 +7515,7 @@ func_mode_link () for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) lib_search_path+=" $dir" ;; + *) func_append lib_search_path " $dir" ;; esac done newlib_search_path= @@ -7598,10 +7573,10 @@ func_mode_link () -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) tmp_libs+=" $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac ;; - *) tmp_libs+=" $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -7617,7 +7592,7 @@ func_mode_link () ;; esac if test -n "$i" ; then - tmp_libs+=" $i" + func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs @@ -7658,7 +7633,7 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - objs+="$old_deplibs" + func_append objs "$old_deplibs" ;; lib) @@ -7694,7 +7669,7 @@ func_mode_link () echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - libobjs+=" $objs" + func_append libobjs " $objs" fi fi @@ -7892,7 +7867,7 @@ func_mode_link () done # Make executables depend on our current version. - verstring+=":${current}.0" + func_append verstring ":${current}.0" ;; qnx) @@ -7960,7 +7935,7 @@ func_mode_link () fi func_generate_dlsyms "$libname" "$libname" "yes" - libobjs+=" $symfileobj" + func_append libobjs " $symfileobj" test "X$libobjs" = "X " && libobjs= if test "$opt_mode" != relink; then @@ -7979,7 +7954,7 @@ func_mode_link () continue fi fi - removelist+=" $p" + func_append removelist " $p" ;; *) ;; esac @@ -7990,7 +7965,7 @@ func_mode_link () # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs+=" $output_objdir/$libname.$libext" + func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` @@ -8008,10 +7983,10 @@ func_mode_link () temp_xrpath= for libdir in $xrpath; do func_replace_sysroot "$libdir" - temp_xrpath+=" -R$func_replace_sysroot_result" + func_append temp_xrpath " -R$func_replace_sysroot_result" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath+=" $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -8025,7 +8000,7 @@ func_mode_link () for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) dlfiles+=" $lib" ;; + *) func_append dlfiles " $lib" ;; esac done @@ -8035,7 +8010,7 @@ func_mode_link () for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) dlprefiles+=" $lib" ;; + *) func_append dlprefiles " $lib" ;; esac done @@ -8047,7 +8022,7 @@ func_mode_link () ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - deplibs+=" System.ltframework" + func_append deplibs " System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -8064,7 +8039,7 @@ func_mode_link () *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - deplibs+=" -lc" + func_append deplibs " -lc" fi ;; esac @@ -8113,7 +8088,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs+=" $i" + func_append newdeplibs " $i" i="" ;; esac @@ -8124,7 +8099,7 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs+=" $i" + func_append newdeplibs " $i" else droppeddeps=yes echo @@ -8138,7 +8113,7 @@ EOF fi ;; *) - newdeplibs+=" $i" + func_append newdeplibs " $i" ;; esac done @@ -8156,7 +8131,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs+=" $i" + func_append newdeplibs " $i" i="" ;; esac @@ -8167,7 +8142,7 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs+=" $i" + func_append newdeplibs " $i" else droppeddeps=yes echo @@ -8189,7 +8164,7 @@ EOF fi ;; *) - newdeplibs+=" $i" + func_append newdeplibs " $i" ;; esac done @@ -8206,7 +8181,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs+=" $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -8249,7 +8224,7 @@ EOF if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs+=" $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -8274,7 +8249,7 @@ EOF ;; *) # Add a -L argument. - newdeplibs+=" $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -8290,7 +8265,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs+=" $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -8303,7 +8278,7 @@ EOF potlib="$potent_lib" # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs+=" $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -8328,7 +8303,7 @@ EOF ;; *) # Add a -L argument. - newdeplibs+=" $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -8432,7 +8407,7 @@ EOF *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs+=" -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -8442,10 +8417,10 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs+=" $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs+=" $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -8476,13 +8451,13 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs+="$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath+=" $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in @@ -8505,7 +8480,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath+="$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -8539,7 +8514,7 @@ EOF linknames= for link do - linknames+=" $link" + func_append linknames " $link" done # Use standard objects if they are pic @@ -8550,7 +8525,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles+=" $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -8610,7 +8585,7 @@ EOF output=${output_objdir}/${output_la}.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result - delfiles+=" $output" + func_append delfiles " $output" func_verbose "creating $NM input file list: $output" for obj in $save_libobjs; do func_to_tool_file "$obj" @@ -8653,7 +8628,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles+=" $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8663,7 +8638,7 @@ EOF case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs+=" $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -8683,17 +8658,17 @@ EOF test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated+=" $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs+=" $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags+=" $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking @@ -8763,7 +8738,7 @@ EOF $ECHO "$func_to_tool_file_result" >> $output done echo ')' >> $output - delfiles+=" $output" + func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then @@ -8782,7 +8757,7 @@ EOF func_to_tool_file "$obj" $ECHO "$func_to_tool_file_result" >> $output done - delfiles+=" $output" + func_append delfiles " $output" func_to_tool_file "$output" output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else @@ -8802,7 +8777,7 @@ EOF len=$func_arith_result if test "X$objlist" = X || test "$len" -lt "$max_cmd_len"; then - objlist+=" $obj" + func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. @@ -8835,7 +8810,7 @@ EOF if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles+=" $output" + func_append delfiles " $output" else output= @@ -8902,7 +8877,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles+=" $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8943,10 +8918,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated+=" $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs+=" $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -9058,7 +9033,7 @@ EOF reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated+=" $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" @@ -9141,8 +9116,8 @@ EOF if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command+=" ${wl}-bind_at_load" - finalize_command+=" ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi @@ -9162,7 +9137,7 @@ EOF *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs+=" -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -9172,17 +9147,17 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs+=" $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs+=" $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command+=" $compile_deplibs" - finalize_command+=" $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -9190,7 +9165,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath+=" $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -9209,18 +9184,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs+="$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath+=" $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath+=" $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -9229,12 +9204,12 @@ EOF case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath+=":$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath+=":$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -9260,18 +9235,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs+="$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath+=" $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath+=" $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -9350,7 +9325,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath+="$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -9358,7 +9333,7 @@ EOF # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath+="$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -9516,7 +9491,7 @@ EOF else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs+=" $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -9524,10 +9499,10 @@ EOF if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated+=" $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs+=" $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -9538,10 +9513,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated+=" $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs+=" $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -9559,7 +9534,7 @@ EOF else echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated+=" $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -9583,9 +9558,9 @@ EOF esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs+=" $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs+=" $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi @@ -9628,7 +9603,7 @@ EOF func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - objlist+=" $obj" + func_append objlist " $obj" if test "$len" -lt "$max_cmd_len"; then : else @@ -9701,19 +9676,19 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs+=" ${lt_sysroot:+=}$libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) func_stripname -L '' "$deplib" func_replace_sysroot "$func_stripname_result" - newdependency_libs+=" -L$func_replace_sysroot_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" ;; -R*) func_stripname -R '' "$deplib" func_replace_sysroot "$func_stripname_result" - newdependency_libs+=" -R$func_replace_sysroot_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" ;; - *) newdependency_libs+=" $deplib" ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -9727,9 +9702,9 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles+=" ${lt_sysroot:+=}$libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles+=" $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -9746,7 +9721,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles+=" ${lt_sysroot:+=}$libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -9758,7 +9733,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles+=" $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -9767,7 +9742,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles+=" $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi @@ -9872,9 +9847,9 @@ func_mode_uninstall () for arg do case $arg in - -f) RM+=" $arg"; rmforce=yes ;; - -*) RM+=" $arg" ;; - *) files+=" $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -9899,7 +9874,7 @@ func_mode_uninstall () if test "$opt_mode" = clean; then case " $rmdirs " in *" $odir "*) ;; - *) rmdirs+=" $odir" ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -9925,17 +9900,17 @@ func_mode_uninstall () # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles+=" $odir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles+=" $odir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" case "$opt_mode" in clean) case " $library_names " in *" $dlname "*) ;; - *) test -n "$dlname" && rmfiles+=" $odir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles+=" $odir/$name $odir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -9963,13 +9938,13 @@ func_mode_uninstall () # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles+=" $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles+=" $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; @@ -9985,7 +9960,7 @@ func_mode_uninstall () noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles+=" $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -9994,7 +9969,7 @@ func_mode_uninstall () func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles+=" $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -10002,12 +9977,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles+=" $odir/$name $odir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles+=" $odir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles+=" $odir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -10072,6 +10047,101 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # vi:sw=2 +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} + +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} + +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $* )) +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1+=\$2" +} + # ### BEGIN LIBTOOL TAG CONFIG: CXX # The linker used to build libraries. @@ -10093,12 +10163,12 @@ with_gcc=yes # Compiler flag to turn off builtin functions. no_builtin_flag=" -fno-builtin" -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" - # How to pass a linker flag through the compiler. wl="-Wl," +# Additional compiler flags for building library objects. +pic_flag=" -fPIC -DPIC" + # Compiler flag to prevent dynamic linking. link_static_flag="-static" @@ -10127,8 +10197,8 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build a shared archive. -archive_cmds="\$CC \$pic_flag -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$CC \$pic_flag -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" +archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" +archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" # Commands used to build a loadable module if different from building # a shared archive. @@ -10185,6 +10255,9 @@ inherit_rpath=no # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=unknown +# Fix the shell variable $srcfile for the compiler. +fix_srcfile_path="" + # Set to "yes" if exported symbols are required. always_export_symbols=no @@ -10200,9 +10273,6 @@ include_expsyms="" # Commands necessary for linking programs (against libraries) with templates. prelink_cmds="" -# Commands necessary for finishing linking programs. -postlink_cmds="" - # Specify filename containing input files. file_list_spec="" @@ -10210,17 +10280,17 @@ file_list_spec="" hardcode_action=immediate # The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs="/usr/lib/gcc/i686-pc-linux-gnu/4.5.3 /usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../../../i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../.." +compiler_lib_search_dirs="/usr/lib/gcc/i686-pc-linux-gnu/4.4.5 /usr/lib/gcc/i686-pc-linux-gnu/4.4.5 /usr/lib/gcc/i686-pc-linux-gnu/4.4.5/../../../../i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.4.5/../../.." # Dependencies to place before and after the objects being linked to # create a shared library. -predep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../../crti.o /usr/lib/gcc/i686-pc-linux-gnu/4.5.3/crtbeginS.o" -postdep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.5.3/crtendS.o /usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../../crtn.o" +predep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.4.5/../../../crti.o /usr/lib/gcc/i686-pc-linux-gnu/4.4.5/crtbeginS.o" +postdep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.4.5/crtendS.o /usr/lib/gcc/i686-pc-linux-gnu/4.4.5/../../../crtn.o" predeps="" postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.5.3 -L/usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../.." +compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.4.5 -L/usr/lib/gcc/i686-pc-linux-gnu/4.4.5 -L/usr/lib/gcc/i686-pc-linux-gnu/4.4.5/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc/i686-pc-linux-gnu/4.4.5/../../.." # ### END LIBTOOL TAG CONFIG: CXX