Automake 1.7+ compatability patch

[Robert Boehne]

Hello,

This patch modifies the way libltdl is handled to prevent
files from being left behind by make uninstall.

ChangeLog entry:

2003-02-23  Robert Boehne  <address@hidden>

        * libltdl/configure.ac: Use AC_CONFIG_AUX_DIR([.]) to place
        auxilary files in the libltdl directory.
        * Makefile.am: Add to the ltmain.sh rule to copy it into the
        libltdl subdirectory.
        * bootstrap: Explicitly handle ltmain.sh in libltdl.

Ok to commit?

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.67
diff -u -r1.67 Makefile.am
--- Makefile.am 25 Oct 2002 01:14:07 -0000      1.67
+++ Makefile.am 23 Feb 2003 23:28:56 -0000
@@ -45,6 +45,7 @@
            -e "s%@""address@hidden" $(srcdir)/ltmain.in > ltmain.shT
        mv -f ltmain.shT $@ || \
        (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
+       cp $@ $(srcdir)/libltdl/
 
 # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
 TSDEPS =
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.23
diff -u -r1.23 bootstrap
--- bootstrap   31 Jul 2002 20:15:27 -0000      1.23
+++ bootstrap   23 Feb 2003 23:28:56 -0000
@@ -13,6 +13,7 @@
 # fake the libtool scripts
 touch ltmain.sh
 touch libtoolize
+(cd libltdl && touch ltmain.sh)
 
 for sub in . libltdl cdemo demo depdemo mdemo pdemo tagdemo f77demo; do
   case $sub in
@@ -46,6 +47,6 @@
   cd $top_srcdir
 done
 
-rm -f ltmain.sh libtoolize
+rm -f ltmain.sh libtoolize libltdl/ltmain.sh
 
 exit 0
Index: libltdl/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/configure.ac,v
retrieving revision 1.5
diff -u -r1.5 configure.ac
--- libltdl/configure.ac        6 Oct 2001 15:35:17 -0000       1.5
+++ libltdl/configure.ac        23 Feb 2003 23:28:56 -0000
@@ -32,12 +32,7 @@
 ## Libltdl specific configuration. ##
 ## ------------------------------- ##
 
-# We shouldn't be using these internal macros of autoconf,
-# but CONFIG_AUX_DIR($with_auxdir) breaks automake.
-AC_ARG_WITH([auxdir],
-    [AC_HELP_STRING([--with-auxdir=DIR], [path to autoconf auxiliary files])],
-    [AC_CONFIG_AUX_DIRS($with_auxdir)],
-    [AC_CONFIG_AUX_DIR_DEFAULT])
+AC_CONFIG_AUX_DIR([.])
 
 if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
   if test -f ${srcdir}/ltmain.sh; then