[svn] * configure.in: Noticed in libtool documentation that we should have

  "AC_SUBST(LIBTOOL_DEPS)".

* Makefile.in: Made libtool depend on LIBTOOL_DEPS so if ltconfig
 and/or ltmain.sh are updated, libtool will be regenerated.

diff --git a/Makefile.in b/Makefile.in
index 724a52268ea9bc17825dc26092af04249be8863d..3756681a1ab63305eb2402291d77c544097458a7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,6 +56,7 @@ LDFLAGS = @LDFLAGS@
 #
 
 DISTNAME = wget-@VERSION@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 RM = rm -f
 
 # These are used for maintenance only, so they are safe without
@@ -74,7 +75,7 @@ infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 SUBDIRS = src doc po util windows
 
 # default target
-all: src/config.h Makefile $(SUBDIRS)
+all: libtool src/config.h Makefile $(SUBDIRS)
 
 check: all
 
@@ -97,6 +98,10 @@ install.info uninstall.info install.man uninstall.man install.wgetrc:
 install.mo:
        cd po && $(MAKE) $(MAKEDEFS) $@
 
+# Regenerate libtool if ltconfig and/or ltmain are updated
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status --recheck
+
 # create tag files for Emacs
 TAGS:
        cd src && $(MAKE) $@

diff --git a/configure.in b/configure.in
index 92728ce9ff73584967c8221bf282bdf2e062244d..a0512da2817d51e2a66aa15997a513b3e27cd8aa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -84,9 +84,10 @@ dnl
 AC_PROG_INSTALL
 
 dnl
-dnl Configure our included libtool
+dnl Configure our included libtool and make sure it's regenerated when needed
 dnl
 AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 
 dnl
 dnl Find the compiler