[patch 16/19] 1-ralf-fix-ltdl-config-dist.diff Queue

[Gary V. Vaughan]

 Makefile.am           |   15 ++++++++++--
 tests/libltdl-dist.at |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/testsuite.at    |    2 +
 3 files changed, 75 insertions(+), 2 deletions(-)

Index: ChangeLog
from  Ralf Wildenhues  <address@hidden>,
        Gary V. Vaughan  <address@hidden>
        * Makefile.am (libltdl/stamp-mk): New rule to fix
        libltdl/Makefile.in to not distribute the auxiliary files that
        are not used by libltdl, so that packages that use
        `libtoolize --ltdl' can `make dist' successfully.
        (EXTRA_DIST): Distribute stamp-mk.
        (all-local): Depend on it.
        (TESTSUITE_AT): Add libltdl-dist.at.
        * tests/libltdl-dist.at: New test to prevent regressions.
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -217,8 +217,18 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)
 $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am
        cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
 
+$(srcdir)/libltdl/stamp-mk: $(srcdir)/libltdl/Makefile.in
+       cd $(srcdir)/libltdl && \
+       sed -e 's,config/mdate-sh,,' -e 's,config/texinfo.tex,,' \
+           -e 's,config/mkinstalldirs,,' \
+         < Makefile.in > Makefile.inT && \
+       mv -f Makefile.inT Makefile.in
+       echo stamp > $@
+
+EXTRA_DIST += libltdl/stamp-mk
+
 # We want the libltdl files to be up to date as much as possible.
-all-local: $(srcdir)/libltdl/Makefile.in
+all-local: $(srcdir)/libltdl/stamp-mk
 
 
 ## -------- ##
@@ -304,7 +314,7 @@ install-data-local: libltdl/Makefile.in
          f=`echo "$$p" | sed 's|^.*/||'`; \
          echo " $(INSTALL_DATA) '$$f' '$(DESTDIR)$(aclocaldir)/$$f'"; \
          $(INSTALL_DATA) "$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
-       done; \
+       done
 ## install the helper scripts
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/config
@@ -359,6 +369,7 @@ TESTSUITE_AT        = tests/testsuite.at \
                  tests/am-subdir.at \
                  tests/duplicate_members.at \
                  tests/inherited_flags.at \
+                 tests/libltdl-dist.at \
                  tests/libtoolize.at \
                  tests/nonrecursive.at \
                  tests/old-m4-iface.at \
Index: tests/libltdl-dist.at
===================================================================
--- /dev/null
+++ tests/libltdl-dist.at
@@ -0,0 +1,60 @@
+# Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
+# Copyright 2005 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+AT_BANNER([make dist in trees with an ltdl subdirectory.])
+
+AT_SETUP([libltdl redistribution])
+
+# Workaround permissions bug:
+chmod -R u+rwx .
+trap "chmod -R u+rwx ." 0 1 2 15
+
+_LTDL_PROJECT_FILES
+rm -f Makefile
+
+AT_DATA([configure.ac],
+[[AC_INIT([ltdldist-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
+LT_CONFIG_LTDL_DIR([ltdl])
+AC_CONFIG_AUX_DIR([ltdl/config])
+AC_CONFIG_MACRO_DIR([ltdl/m4])
+AM_INIT_AUTOMAKE([foreign])
+LT_INIT
+LT_WITH_LTDL
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+]])
+
+AT_DATA([Makefile.am],
+[[ACLOCAL_AMFLAGS = -I ltdl/m4
+SUBDIRS = ltdl .
+
+bin_PROGRAMS = main
+main_SOURCES   = main.c
+main_CPPFLAGS  = $(INCLTDL)
+main_LDADD     = -dlopen module.la $(LIBLTDL)
+
+lib_LTLIBRARIES   = module.la
+module_la_LDFLAGS = -module -avoid-version -no-undefined
+]])
+
+LT_AT_BOOTSTRAP
+LT_AT_MAKE
+
+AT_CHECK([${MAKE-make} distcheck], 0, [ignore], [ignore])
+
+AT_CLEANUP
Index: tests/testsuite.at
===================================================================
--- tests/testsuite.at.orig
+++ tests/testsuite.at
@@ -252,3 +252,5 @@ m4_include([early-libtool.at])
 m4_include([deplibs-ident.at])
 # stress test
 m4_include([stresstest.at])
+# Distributing libltdl
+m4_include([libltdl-dist.at])

--
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook