From: Ralf Wildenhues Date: Tue, 19 Apr 2005 16:40:52 +0000 (+0000) Subject: * libtoolize.m4sh (func_scan_files, func_serial, func_ltmain_update, X-Git-Tag: release-2-1b~663 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b9f37130736457775ac819d088c21120fb8d3ab;p=thirdparty%2Flibtool.git * libtoolize.m4sh (func_scan_files, func_serial, func_ltmain_update, func_config_update, func_install_update): Placate AIX sed. --- diff --git a/ChangeLog b/ChangeLog index caa28e997..07c05bb26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-19 Ralf Wildenhues + + * libtoolize.m4sh (func_scan_files, func_serial, func_ltmain_update, + func_config_update, func_install_update): Placate AIX sed. + 2005-04-19 David Edelsohn * config/ltmain.m4sh (func_mode_link): If command exceeds diff --git a/libtoolize.m4sh b/libtoolize.m4sh index eaa9db9ea..8e9b59917 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -462,7 +462,8 @@ func_scan_files () # in `Makefile.am' for a `-I' argument. my_sed_aclocal_flags='/^[[ ]]*ACLOCAL_[[A-Z_]]*FLAGS[[ ]]*=/ { - s,^[[^=]]*=[[ ]]*\(.*\), \1,; q; }; d' + s,^[[^=]]*=[[ ]]*\(.*\), \1,; q; }; + d' if test ! -n "$m4dir" && test -f Makefile.am; then my_m4dir_is_next=false for arg in `$SED "$my_sed_aclocal_flags" Makefile.am`; do @@ -514,7 +515,8 @@ func_serial () my_macro_regex="$2" my_sed_serial=['/^# serial [1-9][0-9.]*[ ]*'"$my_macro_regex"'[ ]*$/ { s,^# serial \([1-9][0-9.]*\).*$,\1,; q; - }; d'] + }; + d'] # Search FILENAME and all the files it m4_includes for a serial number # in the file that AC_DEFUNs MACRO_REGEX. @@ -737,7 +739,8 @@ func_ltmain_update () $opt_debug my_sed_ltmain=['/^package_revision='\''*[0-9][1-9.]*'\''*/ { s,^package_revision='\''*\([0-9.]*\)'\''*[ ]*$,\1,; p; - }; d'] + }; + d'] func_keyword_update "$1" "$2" "$3" "$my_sed_ltmain" @@ -754,7 +757,8 @@ func_config_update () $opt_debug my_sed_config=['/^timestamp='\''*[0-9][1-9-]*'\''*/ { s,^timestamp='\''*\([0-9-]*\)'\''*,\1,; s/-/./g; p; - }; d'] + }; + d'] func_keyword_update "$1" "$2" "$3" "$my_sed_config" @@ -771,7 +775,8 @@ func_install_update () $opt_debug my_sed_install=['/^scriptversion='\''*[0-9][1-9.-]*'\''*/ { s,^scriptversion='\''*\([0-9.-]*\)'\''*,\1,; s/-/./g; p; - }; d'] + }; + d'] func_keyword_update "$1" "$2" "$3" "$my_sed_install"