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  82beb2a169ac1943df67be90675c3135ece03735 (commit)
       via  1c9aa6dac54372220d367715bf891a6f06c668fd (commit)
       via  cc027148f2acded5c1a2bd5c951ef70fb3223a50 (commit)
      from  4fee8796c92a2ab554eb6596330ac06613c22807 (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 82beb2a169ac1943df67be90675c3135ece03735
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date:   Mon Dec 6 04:31:14 2010 +0100

    Fix nvcc PIC setting on darwin.
    
    * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC)
    <lt_prog_compiler_pic>: Prepend -Xcompiler to nonempty variable
    setting rather than hard-coding -Xcompiler -fPIC, for darwin.
    * NEWS, THANKS: Update.
    Report by Paweł Daniluk.
    
    Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>

commit 1c9aa6dac54372220d367715bf891a6f06c668fd
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date:   Sat Nov 20 10:34:16 2010 +0100

    Honor $AUTOCONF, $AUTOMAKE in --help output.
    
    * libltdl/config/getopt.m4sh (func_help): Use $AUTOCONF and
    $AUTOMAKE if set, for --version outout.
    
    Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>

commit cc027148f2acded5c1a2bd5c951ef70fb3223a50
Author: Ralf Wildenhues <ralf.wildenh...@gmx.de>
Date:   Fri Nov 19 18:42:04 2010 +0100

    docs: Libtool configuration diagram.
    
    * doc/libtool.texi (Integrating libtool): Add diagrams
    explaining the dependencies between Libtool files.
    Suggestion by Ethan Mallove.
    
    Signed-off-by: Ralf Wildenhues <ralf.wildenh...@gmx.de>

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

Summary of changes:
 ChangeLog                  |   18 +++++++++++++++
 NEWS                       |    1 +
 THANKS                     |    1 +
 doc/libtool.texi           |   50 ++++++++++++++++++++++++++++++++++++++++++++
 libltdl/config/getopt.m4sh |    4 +-
 libltdl/m4/libtool.m4      |    4 ++-
 6 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e418f3c..8bc122e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-10  Ralf Wildenhues  <ralf.wildenh...@gmx.de>
+
+       Fix nvcc PIC setting on darwin.
+       * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC)
+       <lt_prog_compiler_pic>: Prepend -Xcompiler to nonempty variable
+       setting rather than hard-coding -Xcompiler -fPIC, for darwin.
+       * NEWS, THANKS: Update.
+       Report by Paweł Daniluk.
+
+       Honor $AUTOCONF, $AUTOMAKE in --help output.
+       * libltdl/config/getopt.m4sh (func_help): Use $AUTOCONF and
+       $AUTOMAKE if set, for --version outout.
+
+       docs: Libtool configuration diagram.
+       * doc/libtool.texi (Integrating libtool): Add diagrams
+       explaining the dependencies between Libtool files.
+       Suggestion by Ethan Mallove.
+
 2010-11-15  Ralf Wildenhues  <ralf.wildenh...@gmx.de>
 
        Eliminate hardcode_libdir_flag_spec_ld tag variable.
diff --git a/NEWS b/NEWS
index 83cee5e..0aeca57 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ New in 2.4.2 2010-12-??: git version 2.4.1a, Libtool team:
     not available) works again.  Regression introduced in v2.2.6-39-g9c3d4d8.
   - The bug that leaked developer tool paths into the release tarballs
     from ./bootstrap is fixed.
+  - Improved support for the Cuda Compiler Driver (nvcc) on Darwin.
 
 * Important incompatible changes:
 
diff --git a/THANKS b/THANKS
index e85e21a..6dd8dd8 100644
--- a/THANKS
+++ b/THANKS
@@ -147,6 +147,7 @@
   Paul Biggar                  paul.big...@gmail.com
   Paul Eggert                  egg...@twinsun.com
   Paul Laight                  plai...@quantxautomation.co.uk
+  Paweł Daniluk                       pa...@bioexploratorium.pl
   Peter Eisentraut             pete...@gmx.net
   Peter Fritzsche              peter.fritzs...@gmx.de
   Peter Jeremy                 peterjer...@optushome.com.au
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 12d006b..04c5507 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1791,6 +1791,56 @@ The remaining @var{mode-args} are either flags for the 
deletion program
 This chapter describes how to integrate libtool with your packages so
 that your users can install hassle-free shared libraries.
 
+There are several ways in which Libtool may be integrated in your
+package, described in the following sections.  Typically, the Libtool
+macro files as well as @file{ltmain.sh} are copied into your package
+using @command{libtoolize} and @command{aclocal} after setting up the
+...@file{configure.ac} and toplevel @file{Makefile.am}, then
+...@command{autoconf} adds the needed tests to the @file{configure} script.
+These individual steps are often automated with @command{autoreconf}.
+
+Here is a diagram showing how such a typical Libtool configuration works
+when preparing a package for distribution, assuming that @file{m4} has
+been chosen as location for additional Autoconf macros, and
+...@file{build-aux} as location for auxiliary build tools (@pxref{Input,,
+The Autoconf Manual, autoconf, The Autoconf Manual}):
+
+...@example
+...@group
+libtool.m4 -----.                .--> aclocal.m4 -----.
+ltoptions.m4 ---+  .-> aclocal* -+                    +--> autoconf*
+ltversion.m4 ---+--+             `--> [copy in m4/] --+       |
+ltsugar.m4 -----+  |                    ^             |       \/
+lt~obsolete.m4 -+  +-> libtoolize* -----'             |    configure
+[ltdl.m4] ------+  |                                  |
+                   `----------------------------------'
+
+ltmain.sh -----------> libtoolize* -> [copy in build-aux/]
+...@end group
+...@end example
+
+During configuration, the @file{libtool} script is generated either
+through @command{config.status} or @command{config.lt}:
+
+...@example
+...@group
+             .--> config.status* --.
+configure* --+                     +--> libtool
+             `--> [config.lt*] ----'      ^
+                                          |
+ltmain.sh --------------------------------'
+...@end group
+...@end example
+
+At @command{make} run time, @command{libtool} is then invoked as needed
+as a wrapper around compilers, linkers, install and cleanup programs.
+
+There are alternatives choices to several parts of the setup; for
+example, the Libtool macro files can either be copied or symlinked into
+the package, or copied into @file{aclocal.m4}.  As another example, an
+external, pre-configured @command{libtool} script may be used,
+by-passing most of the tests and package-specific setup for Libtool.
+
 @menu
 * Autoconf macros::             Autoconf macros exported by libtool.
 * Makefile rules::              Writing @file{Makefile} rules for libtool.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 2196743..e9363bc 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -592,8 +592,8 @@ func_help ()
        s*\$LTCFLAGS*'"$LTCFLAGS"'*
        s*\$LD*'"$LD"'*
        s/\$with_gnu_ld/'"$with_gnu_ld"'/
-       s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-       s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+       s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null 
|$SED 1q`"'/
+       s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null 
|$SED 1q`"'/
        p
        d
      }
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 419ffe1..1f61140 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4232,7 +4232,9 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler 
$_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else


hooks/post-receive
-- 
GNU Libtool

Reply via email to