[patch 17/19] 287-gary-implicit-libtoolize-ltdl.diff Queue

[Gary V. Vaughan]

An ill conceived idea to save typing the --ltdl flag all the time.

 doc/libtool.texi |    5 ++++-
 libtoolize.m4sh  |    5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Index: libtool--devo--1.0/ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * libtoolize.m4sh: Support implicit --ltdl when LT_CONFIG_LTDL_DIR
        is present, but names an as-yet empty directory.
        * doc/libtool.texi (Invoking libtoolize): Document it.
Index: libtool--devo--1.0/doc/libtool.texi
===================================================================
--- libtool--devo--1.0.orig/doc/libtool.texi
+++ libtool--devo--1.0/doc/libtool.texi
@@ -2247,7 +2247,10 @@ your package.  Normally, the directory i
 to @code{LT_CONFIG_LTDL_DIR} in @file{configure.ac}, though you can
 also specify a subdirectory name here if you are not using Autoconf
 for example.  If @command{libtoolize} can't determine the target
-directory, @samp{libltdl} is used as the default.
+directory, @samp{libltdl} is used as the default.  If
address@hidden is in @file{configure.ac} and names a
+directory that is not present yet, then this option is implied, and
+needn't be specified manually.
 
 @item --nonrecursive
 If passed in conjunction with @option{--ltdl}, this option will cause
Index: libtool--devo--1.0/libtoolize.m4sh
===================================================================
--- libtool--devo--1.0.orig/libtoolize.m4sh
+++ libtool--devo--1.0/libtoolize.m4sh
@@ -1038,6 +1038,11 @@ func_nonemptydir_p ()
 
   glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
 
+  # As a convenience to the user, if LT_CONFIG_LTDL_DIR is
+  # set in $configure_ac, but doesn't exist yet, behave as if
+  # --ltdl was passed.
+  test -z "$ac_ltdldir" || test -f "$ac_ltdldir" || opt_ltdl=:
+
   # Copy all the files from installed libltdl to this project, if the
   # user specified `--ltdl'.
   if $opt_ltdl; then

--
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