* libtool.m4 (OBJDUMP): Pass it to ltconfig.

* configure.in: AC_SUBST DLLTOOL, OBJDUMP and AS.
* Makefile.am (libtool, clibtool): Pass them to ltconfig.
* doc/libtool.texi (Invoking ltconfig): Document OBJDUMP.

diff --git a/ChangeLog b/ChangeLog
index 7bf88117604bc1c9c4949d7ed5b61bbaa6e02e53..a5d9f189d1682c937e7336e19f9703be9fa51334 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-04-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libtool.m4 (OBJDUMP): Pass it to ltconfig.
+       * configure.in: AC_SUBST DLLTOOL, OBJDUMP and AS.
+       * Makefile.am (libtool, clibtool): Pass them to ltconfig.
+       * doc/libtool.texi (Invoking ltconfig): Document OBJDUMP.
+
 1999-04-25  Frank Ch. Eigler  <fche@cygnus.com>
  
        * libtool.m4 (cygwin*): Look for target objdump tool.

diff --git a/Makefile.am b/Makefile.am
index 06a952e128acf913eeb684a82bb9f8f9f8003465..7b6f3f56fa7540c35bd674d7898de24f0225ab29 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@ libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
        CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
        LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       DLLTOOL="$(DLLTOOL)" OBJDUMP="$(OBJDUMP)" AS="$(AS)" \
        $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
          --output=$@ $(srcdir)/ltmain.sh
 
@@ -40,6 +41,7 @@ clibtool: $(srcdir)/ltmain.c $(srcdir)/ltconfig
        CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
        LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       DLLTOOL="$(DLLTOOL)" OBJDUMP="$(OBJDUMP)" AS="$(AS)" \
        $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
          --output=$@ $(srcdir)/ltmain.c
 

diff --git a/configure.in b/configure.in
index ab22aac08403c1edd226da9b18f4fe92527ab11c..ddd1d47cb59e4435808faffb364d6e30f0c35b8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,9 @@ AC_PROG_AWK
 dnl Check for dlopen support
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_SETUP
+AC_SUBST(DLLTOOL)
+AC_SUBST(OBJDUMP)
+AC_SUBST(AS)
 
 LIBTOOL_FLAGS="$libtool_flags"
 AC_SUBST(LIBTOOL_FLAGS)

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 29c642c4f30c3baea9d8f074b417b5c8f040e0b4..61e836f8d5746dec6052a46cb79a8d8da1131c6b 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1647,12 +1647,17 @@ hard-link otherwise.
 
 @defvar DLLTOOL
 Program to use rather than checking for @code{dlltool}.  Only meaningful 
-for MS-Windows.
+for Cygwin/MS-Windows.
+@end defvar
+
+@defvar OBJDUMP
+Program to use rather than checking for @code{objdump}.  Only meaningful 
+for Cygwin/MS-Windows.
 @end defvar
 
 @defvar AS
 Program to use rather than checking for @code{as}.  Only meaningful for
-MS-Windows.
+Cygwin/MS-Windows.
 @end defvar
 
 @node ltconfig example

diff --git a/libtool.m4 b/libtool.m4
index 4c7eeb1b6fd6ed89a10faea5b3eed2399d8b76c2..73b50e54e886892b1fa6e277f1aab74c5806391f 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -21,7 +21,7 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 36 AC_PROG_LIBTOOL
+# serial 37 AC_PROG_LIBTOOL
 AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
@@ -30,8 +30,9 @@ AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" LN_S="$LN_S" \
-NM="$NM" RANLIB="$RANLIB" DLLTOOL="$DLLTOOL" AS="$AS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])