summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Perier <mrpouet@gentoo.org>2009-07-17 10:52:03 +0000
committerRomain Perier <mrpouet@gentoo.org>2009-07-17 10:52:03 +0000
commitdd7b0252ace11c16ed1d7f478c3b1e530f55a72f (patch)
tree559d9c0fdcd51905a7bccd0f07595140196bec43 /media-libs/libcanberra/files
parentTweak USE defaults a bit. (diff)
downloadhistorical-dd7b0252ace11c16ed1d7f478c3b1e530f55a72f.tar.gz
historical-dd7b0252ace11c16ed1d7f478c3b1e530f55a72f.tar.bz2
historical-dd7b0252ace11c16ed1d7f478c3b1e530f55a72f.zip
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
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libcanberra/files')
-rw-r--r--media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch b/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
new file mode 100644
index 000000000000..54428f00f1dd
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
@@ -0,0 +1,30 @@
+ configure.ac | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e804538..1e96988 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,8 +68,11 @@ for flag in $DESIRED_FLAGS ; do
+ done
+
+ #### libtool stuff ####
+-LT_PREREQ(2.2)
+-LT_INIT([dlopen win32-dll disable-static])
++AC_LIBTOOL_DLOPEN
++AC_LIBTOOL_WIN32_DLL
++AC_DISABLE_STATIC
++AM_DISABLE_STATIC
++AC_PROG_LIBTOOL
+
+ dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
+ dnl exactly which version of libltdl is present in the system, so we
+@@ -89,7 +92,7 @@ dnl can give the proper place to find libltdl through the standard
+ dnl variables like LDFLAGS and CPPFLAGS.
+
+ AC_CHECK_HEADER([ltdl.h],
+- [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
++ [AC_CHECK_LIB([ltdl], [lt_dlopen], [LIBLTDL=-lltdl], [LIBLTDL=])],
+ [LIBLTDL=])
+
+ AS_IF([test "x$LIBLTDL" = "x"],