[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] libtoolize --acdir --ltdir
From: |
Rusty Ballinger |
Subject: |
[patch] libtoolize --acdir --ltdir |
Date: |
Fri, 10 Nov 2000 14:44:36 -0800 |
I can only assume that everyone was stunned into silence by a rush of
euphoria and love at my suggestion to add --acdir and --ltdir arguments
to automake & libtoolize, so here's a patch.
The documentation changes could be horribly wrong; I just guessed at what
to do by looking at another patch on the mailing list.
--Rusty
--- automake/automake.texi Sun Jan 10 20:18:00 1999
+++ ../automake-1.4/./automake.texi Fri Nov 10 13:40:46 2000
@@ -794,6 +794,14 @@
make a symbolic link pointing to its own copy of the missing file; this
can be changed with @code{--copy}.
address@hidden address@hidden
address@hidden --acdir
+If Automake invokes @code{libtoolize} and this argument has been given,
+it's passed on to @code{libtoolize}. You only need this if you want
address@hidden to look for @code{aclocal} data files in directory
address@hidden instead of in @code{aclocal}'s installation directory. If you
+use this, you may also want to use @code{--ltdir}.
+
@item address@hidden
@opindex --amdir
Look for Automake data files in directory @var{dir} instead of in the
@@ -853,6 +861,14 @@
conjunction with @samp{--include-deps}, @samp{--srcdir-name}, and
@samp{--build-dir}. Note that if this option is given, no other
processing is done.
+
address@hidden address@hidden
address@hidden --ltdir
+If Automake invokes @code{libtoolize} and this argument has been given,
+it's passed on to @code{libtoolize}. You only need this if you want
address@hidden to look for its data files in directory @var{dir}
+instead of in its installation directory. If you use this, you may also
+want to use @code{--acdir}.
@item --no-force
@opindex --no-force
--- automake/ChangeLog Thu Jan 14 22:16:52 1999
+++ ../automake-1.4/./ChangeLog Fri Nov 10 13:00:38 2000
@@ -1,3 +1,7 @@
+2000-11-09 Rusty Ballinger <address@hidden>
+
+ * automake.in: Added --acdir and --ltdir flags.
+
1999-01-14 Tom Tromey <address@hidden>
* automake.in (handle_configure): Compute $header_dir based on
--- automake/automake.in Thu Jan 14 22:42:36 1999
+++ ../automake-1.4/./automake.in Thu Nov 9 04:30:41 2000
@@ -189,6 +189,9 @@
# Files installed by libtoolize.
@libtoolize_files = ('ltconfig', 'ltmain.sh', 'config.guess', 'config.sub');
+# Arguments passed to libtoolize.
address@hidden = ('libtoolize', '--automake');
+
# TRUE if we've seen AM_MAINTAINER_MODE.
$seen_maint_mode = 0;
@@ -413,6 +416,26 @@
shift (@arglist);
$am_dir = $arglist[0];
}
+ elsif ($arglist[0] =~ /^--acdir=(.+)$/)
+ {
+ push (@libtoolize_args, $arglist[0]);
+ }
+ elsif ($arglist[0] eq '--acdir')
+ {
+ &require_argument (@arglist);
+ shift (@arglist);
+ push (@libtoolize_args, "--acdir=$arglist[0]");
+ }
+ elsif ($arglist[0] =~ /^--ltdir=(.+)$/)
+ {
+ push (@libtoolize_args, $arglist[0]);
+ }
+ elsif ($arglist[0] eq '--ltdir')
+ {
+ &require_argument (@arglist);
+ shift (@arglist);
+ push (@libtoolize_args, "--ltdir=$arglist[0]");
+ }
elsif ($arglist[0] =~ /^--build-dir=(.+)$/)
{
# Must end in /.
@@ -6212,6 +6235,8 @@
$USAGE = "\
-a, --add-missing add missing standard files to package
--amdir=DIR directory storing config files
+ --acdir=DIR directory storing aclocal config files
+ --ltdir=DIR directory storing libtool config files
--build-dir=DIR directory where build being done (for dependencies)
-c, --copy with -a, copy missing files (default is symlink)
--cygnus assume program is part of Cygnus-style tree
@@ -6884,7 +6909,7 @@
# Maybe run libtoolize.
if ($seen_libtool
&& grep ($_ eq $file, @libtoolize_files)
- && system ('libtoolize', '--automake'))
+ && system (@libtoolize_args))
{
$message = "installing \`$errfile'";
$suppress = 0;
--- libtool/doc/libtool.texi Tue Nov 2 04:36:23 1999
+++ ../libtool-1.3.5/./doc/libtool.texi Fri Nov 10 13:48:09 2000
@@ -1905,6 +1905,11 @@
and accepts the following options:
@table @samp
address@hidden address@hidden
+Look for @code{aclocal} data files in directory @var{dir} instead of in
address@hidden's installation directory. If you use this, you may
+also want to use @code{--ltdir}.
+
@item --automake
Work silently, and assume that Automake libtool support is used.
@@ -1934,6 +1939,11 @@
@item --help
Display a help message and exit.
+
address@hidden address@hidden
+Look for libtool data files in directory @var{dir} instead of in the
+installation directory. If you use this, you may also want to use
address@hidden
@item --ltdl
Install libltdl in a subdirectory of your package.
--- libtool/ChangeLog Sat May 27 04:12:27 2000
+++ ../libtool-1.3.5/./ChangeLog Thu Nov 9 04:20:10 2000
@@ -1,3 +1,7 @@
+2000-11-09 Rusty Ballinger <address@hidden>
+
+ * libtoolize.in: added --acdir and --ltdir flags.
+
2000-05-27 Gary V. Vaughan <address@hidden>
GNU libtool 1.3.5 was released.
--- libtool/libtoolize.in Tue Mar 30 11:25:27 1999
+++ ../libtool-1.3.5/./libtoolize.in Thu Nov 9 04:43:15 2000
@@ -71,6 +71,10 @@
--help display this message and exit
--ltdl install libltdl in a subdirectory
--ltdl-tar install the libltdl tarball
+ --ltdir=DIR directory containing libtool config files
+ [$pkgdatadir]
+ --acdir=DIR directory containing aclocal config files
+ [$aclocaldir]
--version print version information and exit
You must \`cd' to the top directory of your package before you run
@@ -117,6 +121,14 @@
--ltdl-tar)
ltdl_tar=yes
+ ;;
+
+ --ltdir=*)
+ pkgdatadir=`echo "$arg" | sed -e s/^--ltdir=//`
+ ;;
+
+ --acdir=*)
+ aclocaldir=`echo "$arg" | sed -e s/^--acdir=//`
;;
-*)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [patch] libtoolize --acdir --ltdir,
Rusty Ballinger <=