Patch: fixup Makefile.in

[Bob Friesenhahn]

This proposed patch is necessary in order to be able to use the 
Makefile.inc installed by 'libtoolize --nonrecursive' since otherwise 
components are requested which are not installed.  Ok to apply?

Bob

2005-12-29  Bob Friesenhahn  <address@hidden>

        * libtoolize.m4sh (func_fixup_Makefile_inc): Remove Makefile.inc
        substitution which was not working and is not needed since the
        same effect is obtained by editing the master Makefile.inc.
        * libltdl/Makefile.inc: Strip down to only require components
        installed by 'libtoolize --nonrecursive'.


Index: libtoolize.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.51
diff -u -r1.51 libtoolize.m4sh
--- libtoolize.m4sh     4 Dec 2005 14:40:43 -0000       1.51
+++ libtoolize.m4sh     29 Dec 2005 20:24:40 -0000
@@ -312,6 +312,7 @@
     if $opt_dry_run; then :;
     else
       $SED "\
+       s, -Ilibltdl , address@hidden@ ,
        s,libltdl_,@address@hidden,
        s,libltdl/,@repl@/,
        s,: libltdl/,: @repl@/,
Index: libltdl/Makefile.inc
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- libltdl/Makefile.inc        16 Dec 2005 16:36:20 -0000      1.5
+++ libltdl/Makefile.inc        29 Dec 2005 20:24:40 -0000
@@ -27,7 +27,7 @@
 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
 # (not as a sub-package!) using 'nostdinc':
 AM_CPPFLAGS           += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
-                         -DLTDL -I. -I$(srcdir) -Ilibltdl \
+                         -DLTDL -Ilibltdl \
                          -I$(srcdir)/libltdl -I$(srcdir)/libltdl/libltdl
 AM_LDFLAGS            += -no-undefined
 LTDL_VERSION_INFO      = -version-info 7:0:0
@@ -117,12 +117,6 @@
 CLEANFILES            += $(LIBOBJS) $(LTLIBOBJS)

 EXTRA_DIST            += libltdl/COPYING.LIB \
-                         libltdl/configure.ac \
-                         libltdl/Makefile.am \
-                         libltdl/aclocal.m4 \
-                         libltdl/Makefile.in \
-                         libltdl/configure \
-                         libltdl/config-h.in \
                          libltdl/README

 ## --------------------------- ##