From 46b88f1a475b4bb25b5cbfc854846c2995d061ec Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 19 Apr 2005 16:41:31 +0000 Subject: [PATCH] * libtoolize.m4sh (func_scan_files, func_serial, func_ltmain_update, func_config_update, func_install_update): Placate AIX sed. --- ChangeLog | 5 +++++ libtoolize.m4sh | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d8959021..6c018ec84 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-18 Ralf Wildenhues * tests/demo-hardcode.test: Fix typo. diff --git a/libtoolize.m4sh b/libtoolize.m4sh index 6a05d997c..ce45eb03a 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -429,7 +429,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 @@ -480,7 +481,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. @@ -698,7 +700,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" "$my_sed_ltmain" } @@ -714,7 +717,8 @@ func_config_update () my_sed_config=['/^timestamp='\''*[0-9][1-9-]*'\''*/ { s,^timestamp='\''*\([0-9-]*\)'\''*,\1,; s/-/./g; p; - }; d'] + }; + d'] func_keyword_update "$1" "$2" "$my_sed_config" } @@ -728,7 +732,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" "$my_sed_install" } -- 2.47.2