[SCM] GNU Libtool branch, master, updated. release-2-2-2-17-g39903a5

[Peter O'Gorman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  39903a5836fc563e83fe6aa614d75a2a3ebe04fe (commit)
      from  314d795eab720baf4416cc703b27a9059fea509d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39903a5836fc563e83fe6aa614d75a2a3ebe04fe
Author: Peter O'Gorman <address@hidden>
Date:   Mon Apr 21 10:21:27 2008 -0500

    Use AC_CHECK_TOOL for lipo too.
    
    * libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
    * libltdl/config/ltmain.m4sh (func_extract_archives): Use.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    6 ++++++
 libltdl/config/ltmain.m4sh |    6 +++---
 libltdl/m4/libtool.m4      |    3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d2e5c3..4cc2147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-21  Peter O'Gorman  <address@hidden>
+
+       Use AC_CHECK_TOOL for lipo too.
+       * libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
+       * libltdl/config/ltmain.m4sh (func_extract_archives): Use.
+
 2008-04-20  Gary V. Vaughan  <address@hidden>
 
        Fix misleading lt_dlopenadvise documentation.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 378acae..089f162 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -2208,14 +2208,14 @@ func_extract_archives ()
          darwin_archive=$my_xabs
          darwin_curdir=`pwd`
          darwin_base_archive=`basename "$darwin_archive"`
-         darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $GREP 
Architectures 2>/dev/null || true`
+         darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP 
Architectures 2>/dev/null || true`
          if test -n "$darwin_arches"; then
            darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
            darwin_arch=
            func_verbose "$darwin_base_archive has multiple architectures 
$darwin_arches"
            for darwin_arch in  $darwin_arches ; do
              func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             lipo -thin $darwin_arch -output 
"unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" 
"${darwin_archive}"
+             $LIPO -thin $darwin_arch -output 
"unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" 
"${darwin_archive}"
              cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
              func_extract_an_archive "`pwd`" "${darwin_base_archive}"
              cd "$darwin_curdir"
@@ -2227,7 +2227,7 @@ func_extract_archives ()
            darwin_files=
            for darwin_file in $darwin_filelist; do
              darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-             lipo -create -output "$darwin_file" $darwin_files
+             $LIPO -create -output "$darwin_file" $darwin_files
            done # $darwin_filelist
            $RM -rf unfat-$$
            cd "$darwin_orig_dir"
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index cdab378..9906e11 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -893,10 +893,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
     rhapsody* | darwin*)
     AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
     AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
     _LT_DECL([], [DSYMUTIL], [1],
       [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
     _LT_DECL([], [NMEDIT], [1],
       [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
 
     AC_CACHE_CHECK([for -single_module linker 
flag],[lt_cv_apple_cc_single_mod],
       [lt_cv_apple_cc_single_mod=no


hooks/post-receive
--
GNU Libtool