build: Integrate libltdl non-recursively using fix-ltdl.

diff --git a/Makefile.am b/Makefile.am
index 8f5aac96c0828c133c7900327021ae43ab5b5cff..63b5927d64fbae4ef9213c53f957d9234e26ea7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,12 @@
 AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4
 
 AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4
 

+CLEANFILES =

 MOSTLYCLEANFILES =
 MOSTLYCLEANFILES =

+include_HEADERS =
+lib_LTLIBRARIES =

 noinst_LTLIBRARIES =
 noinst_LTLIBRARIES =

+EXTRA_LTLIBRARIES =

 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 


@@ -16,14 +20,7 @@ EXTRA_DIST = m4/gnulib-cache.m4
 
 dist_man_MANS = doc/man/upkg.1
 
 
 dist_man_MANS = doc/man/upkg.1
 

-DIST_SUBDIRS = libltdl src
-SUBDIRS = .
-
-if BUNDLED_LIBLTDL
-SUBDIRS += libltdl
-endif
-
-SUBDIRS += src
+SUBDIRS = . src

 
 check_PROGRAMS = test/decodeindex
 test_decodeindex_LDADD = src/libupkg.la libgnu.la
 
 check_PROGRAMS = test/decodeindex
 test_decodeindex_LDADD = src/libupkg.la libgnu.la


@@ -36,3 +33,6 @@ TESTS = tests/libupkg-index-decode.sh
 EXTRA_DIST += $(TESTS)
 
 include $(top_srcdir)/lib/gnulib.mk
 EXTRA_DIST += $(TESTS)
 
 include $(top_srcdir)/lib/gnulib.mk

+if BUNDLED_LIBLTDL
+include $(top_srcdir)/libltdl/ltdl.mk
+endif

diff --git a/bootstrap b/bootstrap
index 557a9a46c8a8f22e5c78ff6089cd109276a80b57..4304be0f5dccc8517357ec0dc8977e9d4d7343ca 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -19,6 +19,7 @@ die() {
        exit 1
 }
 
        exit 1
 }
 

+: ${LIBTOOLIZE=libtoolize}

 : ${AUTORECONF=autoreconf}
 : ${GNULIB=gnulib}
 : ${GIT=git}
 : ${AUTORECONF=autoreconf}
 : ${GNULIB=gnulib}
 : ${GIT=git}


@@ -35,4 +36,9 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 

-$AUTORECONF -fis
+$LIBTOOLIZE -f || die "Failed to run libtoolize."
+
+$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/Makefile.inc \
+       || die "Failed to fixup libltdl makefile fragment."
+
+LIBTOOLIZE=true $AUTORECONF -fis

diff --git a/common b/common
index bfc45d64ca8ad53b1ac7c446b066699fecb7d2c3..90f9f764fa1d891ca8922f2fd0177ae44b1ed790 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit bfc45d64ca8ad53b1ac7c446b066699fecb7d2c3
+Subproject commit 90f9f764fa1d891ca8922f2fd0177ae44b1ed790

diff --git a/configure.ac b/configure.ac
index 3066977395b98845081a36322e6ec6faa7a8cc79..0a4b6f43d7d0b93dd0672fb2c4cefafee78e6e9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ gl_EARLY
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])

-LTDL_INIT([recursive])
+LTDL_INIT([nonrecursive])

 
 AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
 
 AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 


@@ -65,7 +65,6 @@ GOB2_CHECK([2.0.0])
 
 AC_CONFIG_FILES([
        Makefile
 
 AC_CONFIG_FILES([
        Makefile

-       libltdl/Makefile

        src/Makefile
        libuobject.pc
 ])
        src/Makefile
        libuobject.pc
 ])