FYI: 303-gary-correct-included-file-matching-expression.diff

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.

  * looking for address@hidden/libtool--devo--1.0--patch-334 to compare with
  * comparing to address@hidden/libtool--devo--1.0--patch-334
  M  libtoolize.m4sh
  M  ChangeLog
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
        * libtoolize.m4sh: Don't use func_serial_update as a copy
        function for libtool m4 files with no macro_regex.  If the
        files are copied directly into aclocal.m4, because
        AC_CONFIG_MACRO_DIR isn't set for example, there is no way
        to tell what serial number goes with what source file.
        (func_serial_update): For future-proofing, only make the second
        serial number check if the destination file wasn't m4_included
        into aclocal.m4 (and hence updated automatically by the cat of
        copying a new version to the dest directory).
  
  2005-10-26  Gary V. Vaughan  <address@hidden>
  
  --- orig/libtoolize.m4sh
  +++ mod/libtoolize.m4sh
  @@ -677,13 +677,18 @@
       # Do this after the copy for hand maintained `aclocal.m4', incase
       # it has `m4_include([DESTFILE])', so the copy effectively already
       # updated `aclocal.m4'.
  -    if test -f aclocal.m4; then
  -      func_serial_max \
  -          "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
  -      test "X$my_src_serial" = "X$func_serial_max_result" \
  -       && func_echo "You should add the contents of \`$my_destfile' to 
\`aclocal.m4'."
  -    fi
  -
  +    my_included_files=`func_included_files aclocal.m4`
  +    case `echo " "$my_included_files" "` in
  +      *" $my_destfile "*) ;;
  +      *)
  +        if test -f aclocal.m4; then
  +          func_serial_max \
  +              "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
  +          test "X$my_src_serial" = "X$func_serial_max_result" \
  +           && func_echo "You should add the contents of \`$my_destfile' to 
\`aclocal.m4'."
  +        fi
  +        ;;
  +    esac
       return $my_return_status
   }
   
  @@ -1041,8 +1046,7 @@
         func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used."
       fi
   
  -    func_copy_some_files "$pkgmacro_files" "$aclocaldir" \
  -      "$m4dir" func_serial_update
  +    func_copy_some_files "$pkgmacro_files" "$aclocaldir" "$m4dir"
     fi
   
     $opt_quiet || func_check_macros
  
  
  
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 1.0
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFDX1xQFRMICSmD1gYRAgB9AKCBDPbIu9RuM4tZdNM35D2sHRM8GACgt0AC
99eMICA34YaIU0p8MAzsRLs=
=cTJ5
-----END PGP SIGNATURE-----