[gentoo-commits] gentoo-x86 commit in media-gfx/iscan/files: iscan-2.11.0-libltdl.patch

[Peter Alfredsen (loki_val)]

loki_val    08/06/29 22:56:44

  Added:                iscan-2.11.0-libltdl.patch
  Log:
  Fix libtool-2.2 breakage and do a full eautoreconf wrt bug #226315.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

Revision  Changes    Path
1.1                  media-gfx/iscan/files/iscan-2.11.0-libltdl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch?rev=1.1&content-type=text/plain

Index: iscan-2.11.0-libltdl.patch
===================================================================
--- configure.ac
+++ configure.ac
@@ -30,7 +30,10 @@ AC_SUBST(PACKAGE_RELEASE,1)		dnl  keep A
 
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([backend/epkowa.c])
+dnl Detect old libtool
+m4_ifndef([LT_OUTPUT], [
 AC_CONFIG_SUBDIRS([libltdl])
+])
 
 AM_INIT_AUTOMAKE([gnu 1.7])
 
@@ -196,10 +199,10 @@ dnl  The somewhat obscure LT_AC_PROG_SED
 dnl  SED environment variable gets set before it's used by the libtool
 dnl  machinery.  This works around buggy libtool versions.
 LT_AC_PROG_SED
-AC_LIB_LTDL
 AC_LIBLTDL_CONVENIENCE
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
+AC_LIB_LTDL
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
 
--- lib/imgstream.cc
+++ lib/imgstream.cc
@@ -211,6 +211,17 @@ int selector (const dirent *);
 imgstream::dl_handle
 imgstream::find_dlopen (const char *libname)
 {
+// forward compatibility
+#ifndef LTDL_SHLIB_EXT
+#define LTDL_SHLIB_EXT LT_MODULE_EXT
+#endif
+#ifndef LTDL_SHLIBPATH_VAR
+#define LTDL_SHLIBPATH_VAR LT_MODULE_PATH_VAR
+#endif
+#ifndef LTDL_SYSSEARCHPATH
+#define LTDL_SYSSEARCHPATH LT_DLSEARCH_PATH 
+#endif
+
   using std::bad_alloc;
 
   dl_handle result = NULL;



-- 
gentoo-commits@l.g.o mailing list