566 |
my_serial= |
my_serial= |
567 |
for my_file in `func_included_files "$my_filename"`; do |
for my_file in `func_included_files "$my_filename"`; do |
568 |
if test -z "$my_macro_regex" || |
if test -z "$my_macro_regex" || |
569 |
|
test "$my_filename" = aclocal.m4 || |
570 |
|
test "$my_macro_regex" = `echo "$my_filename" | $SED "$basename"` || |
571 |
func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_file" |
func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_file" |
572 |
then |
then |
573 |
my_serial=`$SED -e "$my_sed_serial" "$my_file"` |
my_serial=`$SED -e "$my_sed_serial" "$my_file"` |
718 |
# it has `m4_include([DESTFILE])', so the copy effectively already |
# it has `m4_include([DESTFILE])', so the copy effectively already |
719 |
# updated `aclocal.m4'. |
# updated `aclocal.m4'. |
720 |
my_included_files=`func_included_files aclocal.m4` |
my_included_files=`func_included_files aclocal.m4` |
721 |
case `echo " "$my_included_files" "` in |
case `echo " $my_included_files " | $NL2SP` in |
722 |
|
|
723 |
|
# Skip included files: |
724 |
*" $my_destfile "*) ;; |
*" $my_destfile "*) ;; |
725 |
|
|
726 |
|
# Otherwise compare to aclocal.m4 serial number (func_serial |
727 |
|
# returns 0 for older macro serial numbers before we provided |
728 |
|
# serial tags, so the update message will be correctly given |
729 |
|
# if aclocal.m4 contains an untagged --i.e older-- macro file): |
730 |
*) |
*) |
731 |
if test -f aclocal.m4; then |
if test -f aclocal.m4; then |
732 |
func_serial_max \ |
func_serial_max \ |
860 |
func_echo "and rerunning libtoolize." |
func_echo "and rerunning libtoolize." |
861 |
fi |
fi |
862 |
elif test -z "$m4dir"; then |
elif test -z "$m4dir"; then |
863 |
if test "$ltdldir/m4" != "$m4dir"; then |
if $opt_ltdl && test "$ltdldir/m4" != "$m4dir"; then |
864 |
acmacrodir="$ltdldir/m4" |
acmacrodir="$ltdldir/m4" |
865 |
else |
else |
866 |
acmacrodir="$aclocaldir" |
acmacrodir="$aclocaldir" |
1110 |
func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used." |
func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used." |
1111 |
fi |
fi |
1112 |
|
|
1113 |
func_copy_some_files "$pkgmacro_files" "$aclocaldir" \ |
my_save_IFS="$IFS" |
1114 |
"$m4dir" func_serial_update |
IFS=: |
1115 |
|
for file in $pkgmacro_files; do |
1116 |
|
IFS="$my_save_IFS" |
1117 |
|
func_serial_update $file "$aclocaldir" "$m4dir" "$file" |
1118 |
|
done |
1119 |
|
IFS="$my_save_IFS" |
1120 |
fi |
fi |
1121 |
|
|
1122 |
$opt_quiet || func_check_macros |
$opt_quiet || func_check_macros |