Gentoo Archives: gentoo-commits

From: "Romain Perier (mrpouet)" <mrpouet@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libcanberra/files: libcanberra-0.14-backward-compatibility-libtool.patch
Date: Fri, 17 Jul 2009 10:52:05
Message-Id: E1MRl2p-0004Jm-NK@stork.gentoo.org
1 mrpouet 09/07/17 10:52:03
2
3 Added:
4 libcanberra-0.14-backward-compatibility-libtool.patch
5 Log:
6 Fix correctly bug #277739, remove template fix, replaced LT_* macros by AC_LIBTOOL* (equivalent for old version) for backward compatibility with < sys-devel/libtool-2.2
7 (Portage version: 2.1.6.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch?rev=1.1&content-type=text/plain
14
15 Index: libcanberra-0.14-backward-compatibility-libtool.patch
16 ===================================================================
17 configure.ac | 9 ++++++---
18 1 files changed, 6 insertions(+), 3 deletions(-)
19
20 diff --git a/configure.ac b/configure.ac
21 index e804538..1e96988 100644
22 --- a/configure.ac
23 +++ b/configure.ac
24 @@ -68,8 +68,11 @@ for flag in $DESIRED_FLAGS ; do
25 done
26
27 #### libtool stuff ####
28 -LT_PREREQ(2.2)
29 -LT_INIT([dlopen win32-dll disable-static])
30 +AC_LIBTOOL_DLOPEN
31 +AC_LIBTOOL_WIN32_DLL
32 +AC_DISABLE_STATIC
33 +AM_DISABLE_STATIC
34 +AC_PROG_LIBTOOL
35
36 dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
37 dnl exactly which version of libltdl is present in the system, so we
38 @@ -89,7 +92,7 @@ dnl can give the proper place to find libltdl through the standard
39 dnl variables like LDFLAGS and CPPFLAGS.
40
41 AC_CHECK_HEADER([ltdl.h],
42 - [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
43 + [AC_CHECK_LIB([ltdl], [lt_dlopen], [LIBLTDL=-lltdl], [LIBLTDL=])],
44 [LIBLTDL=])
45
46 AS_IF([test "x$LIBLTDL" = "x"],