Hi On Tue, Nov 4, 2008 at 8:49 PM, Lennart Poettering <[EMAIL PROTECTED]> wrote: > On Mon, 03.11.08 03:35, Marc-André Lureau ([EMAIL PROTECTED]) wrote: > > Hmm, will this break support for ltdl 1.5.x? Or should this work for > both versions with this patch applied? > > Unfortunately, it break with 1.5.x.. This is quite incomplete anyway, and somebody with better understanding should do the upgrade, It's just the minimal patch needed to make it work on libtool experimental from Debian.
regards, > >> Signed-off-by: Marc-André Lureau <[EMAIL PROTECTED]> >> --- >> Makefile.am | 2 +- >> configure.ac | 1 + >> src/Makefile.am | 2 +- >> 3 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/Makefile.am b/Makefile.am >> index 8ac534a..507a02f 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -19,7 +19,7 @@ >> dist_doc_DATA = README >> >> EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas >> -SUBDIRS = src gtkdoc libltdl doc >> +SUBDIRS = libltdl src gtkdoc doc >> >> MAINTAINERCLEANFILES = README >> noinst_DATA = README >> diff --git a/configure.ac b/configure.ac >> index daede34..65efea4 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -67,6 +67,7 @@ AC_LTDL_ENABLE_INSTALL >> AC_LIBLTDL_INSTALLABLE >> AC_LIBTOOL_DLOPEN >> AC_LIBTOOL_WIN32_DLL >> +LT_CONFIG_LTDL_DIR([libltdl]) >> AC_PROG_LIBTOOL >> AC_SUBST(LTDLINCL) >> AC_SUBST(LIBLTDL) >> diff --git a/src/Makefile.am b/src/Makefile.am >> index d1b4d89..62fb35f 100644 >> --- a/src/Makefile.am >> +++ b/src/Makefile.am >> @@ -88,7 +88,7 @@ libcanberra_la_SOURCES += \ >> libcanberra_la_CFLAGS += \ >> $(LTDLINCL) >> libcanberra_la_LIBADD += \ >> - $(LIBLTDL) >> + $(top_builddir)/$(LIBLTDL) >> >> plugin_LTLIBRARIES += \ >> libcanberra-multi.la > > > Lennart > > -- > Lennart Poettering Red Hat, Inc. > lennart [at] poettering [dot] net ICQ# 11060553 > http://0pointer.net/lennart/ GnuPG 0x1A015CC4 > _______________________________________________ > libcanberra-discuss mailing list > [email protected] > https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss > -- Marc-André Lureau _______________________________________________ libcanberra-discuss mailing list [email protected] https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss
