diff --git a/ChangeLog b/ChangeLog index ddd626d2..1fa09ead 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-10-12 Eric Blake + Whitespace cleanup. + * libltdl/m4/ltsugar.m4: Avoid space-tab in indents. + * libltdl/m4/libtool.m4: Avoid trailing space. + Deal with Autoconf 2.62's semantic change in m4_append. * libltdl/m4/ltsugar.m4 (lt_append): Replace broken versions of m4_append. diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 14324ec5..1eaebc79 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2143,7 +2143,7 @@ darwin* | rhapsody*) shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -2324,7 +2324,7 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH + # Some binutils ld are patched to set DT_RUNPATH save_LDFLAGS=$LDFLAGS save_libdir=$libdir eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ @@ -7100,7 +7100,7 @@ func_basename () # 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 +# add APPEND to the result, otherwise set result # to NONDIR_REPLACEMENT. # value returned in "$func_dirname_result" # basename: Compute filename of FILE. @@ -7174,7 +7174,7 @@ func_basename () # 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 +# add APPEND to the result, otherwise set result # to NONDIR_REPLACEMENT. # value returned in "$func_dirname_result" # basename: Compute filename of FILE. diff --git a/libltdl/m4/ltsugar.m4 b/libltdl/m4/ltsugar.m4 index fe994282..239051a6 100644 --- a/libltdl/m4/ltsugar.m4 +++ b/libltdl/m4/ltsugar.m4 @@ -23,7 +23,7 @@ m4_define([lt_join], [1], [], [2], [[$2]], [m4_ifval([$2], - [[$2][]m4_foreach(_lt_Arg, lt_car([m4_shiftn(2, $@)]), + [[$2][]m4_foreach(_lt_Arg, lt_car([m4_shiftn(2, $@)]), [_$0([$1], _lt_Arg)])], [$0([$1], m4_shiftn(2, $@))])])[]dnl ]) @@ -72,8 +72,8 @@ m4_define([lt_combine], [m4_if([$4], [], [], [lt_join(m4_quote(m4_default([$1], [[, ]])), lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl + [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), + [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl ])