Add libltdl.

diff --git a/.gitignore b/.gitignore
index 56e731fd1463600a0f3f8382a049cda96c8877c2..527fdf72e00da21b0f2e4bedd608c4bd63f9f500 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ aclocal.m4
 autom4te.cache
 configure
 libtool
+libltdl
 ltmain.sh
 install-sh
 depcomp

diff --git a/Makefile.am b/Makefile.am
index f8238b2370ae0a82a37bb0d8fc82e579bd9f2811..4f0f2a80b4156c54c9510ce2920ba1c81e1be0a2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src
+DIST_SUBDIRS = libltdl src
+SUBDIRS =
+
+if BUNDLED_LIBLTDL
+SUBDIRS += libltdl
+endif
+
+SUBDIRS += src

diff --git a/autogen.sh b/autogen.sh
index 9db4e70f6a7ba547e6031717d65d5ef3568330dd..6bcc42150f9bdf464875472cd0ccb1ffa585d3e5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,6 +10,6 @@ test -d m4 || mkdir m4
 
 aclocal    -I m4         || die "Failed to run aclocal."
 autoheader               || die "Failed to run autoheader."
-libtoolize --copy        || die "Failed to run libtoolize."
+libtoolize --copy --ltdl || die "Failed to run libtoolize."
 automake   --add-missing || die "Failed to run automake."
 autoconf                 || die "Failed to run autoconf."

diff --git a/configure.ac b/configure.ac
index 5b8dbf732cd89d423980ef6b94531eb55588bcaf..f86b8dd1d234db4073b67eff58206c0a34ec1e50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/libupkg.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 
 AC_PROG_CC_C99
 
@@ -22,10 +22,15 @@ fi
 
 AM_CONDITIONAL([BUILD_UPKG], [test x$have_gobject = xyes])
 
-LT_INIT
+LT_CONFIG_LTDL_DIR([libltdl])
+LT_INIT([dlopen])
+LTDL_INIT([recursive])
+
+AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
 AC_CONFIG_FILES([
        Makefile
+       libltdl/Makefile
        src/Makefile
 ])
 AC_OUTPUT

diff --git a/src/Makefile.am b/src/Makefile.am
index a631216889c729a90bd7bde089d7cef5b0e1a49c..95e7082795b48b8fa8e7fd41ccef3f408297954c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,5 +9,5 @@ bin_PROGRAMS = upkg
 upkg_SOURCES = upkg.c exportable.c serializable.c music.c
 upkg_CFLAGS  = $(GLIB_CFLAGS)
 upkg_LDFLAGS = $(GLIB_LIBS)
-upkg_LDADD = libupkg.la
+upkg_LDADD = libupkg.la $(LIBLTDL)
 endif