[patch] For prev. attached ebuild

graphviz-2.26.3-libtool.patch (text/plain), 2.08 KB, created by Samuli Suominen (RETIRED) on 2010-10-05 21:01:50 UTC

diff -ur graphviz-2.26.3.orig/configure.ac graphviz-2.26.3/configure.ac
--- graphviz-2.26.3.orig/configure.ac	2010-01-26 18:00:29.000000000 +0200
+++ graphviz-2.26.3/configure.ac	2010-10-05 23:52:22.000000000 +0300
@@ -464,44 +464,17 @@
 dnl -----------------------------------
 dnl libtool ltdl on-demand plugin loading
 
-m4_ifdef([LT_INIT],
-    [ #code that is for Libtool 2.x
-AM_PROG_LIBTOOL
-    ],
-    [ #code that is for 1.5.x
-    ])
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
 AC_ARG_ENABLE(ltdl,
   [AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])
 if test "x$enable_ltdl" != "xno"; then
   AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])
-  AC_LIBTOOL_DLOPEN
-m4_ifdef([LT_INIT],
-    [ #code that is for Libtool 2.x
-  LT_CONFIG_LTDL_DIR([libltdl])
-  LTDL_INIT
-    ],
-    [ #code that is for 1.5.x
-  AC_CONFIG_SUBDIRS([libltdl])
-    ])
   use_ltdl="Yes"
-  
-  AC_LIBLTDL_CONVENIENCE
-  if test "x$DARWIN9" = "xyes"; then
-     LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
-  fi
 else
   use_ltdl="No (disabled)"
 fi
 AM_CONDITIONAL(ENABLE_LTDL, [test "x$enable_ltdl" != "xno"])
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_SUBST(LIBLTDL_LDFLAGS)
-m4_ifdef([LT_INIT],
-    [ #code that is for Libtool 2.x
-    ],
-    [ #code that is for 1.5.x
-AM_PROG_LIBTOOL
-    ])
 
 # Checks for libraries.
 #AC_CHECK_LIB([ICE], [main])
diff -ur graphviz-2.26.3.orig/lib/gvc/Makefile.am graphviz-2.26.3/lib/gvc/Makefile.am
--- graphviz-2.26.3.orig/lib/gvc/Makefile.am	2009-08-28 22:46:42.000000000 +0300
+++ graphviz-2.26.3/lib/gvc/Makefile.am	2010-10-05 23:43:13.000000000 +0300
@@ -18,7 +18,6 @@
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/$(GRAPH) \
 	-I$(top_srcdir)/lib/cdt \
-	$(INCLTDL) -I$(top_srcdir)/libltdl \
 	-DGVLIBDIR=\"$(pkglibdir)\"
 
 if WITH_WIN32
@@ -55,8 +54,7 @@
 libgvc_C_la_DEPENDENCIES +=  $(top_builddir)/lib/ortho/libortho_C.la
 endif
 if ENABLE_LTDL
-libgvc_C_la_LIBADD += $(LIBLTDL) $(LIBLTDL_LDFLAGS)
-libgvc_C_la_DEPENDENCIES += $(LIBLTDL)
+libgvc_C_la_LIBADD += -lltdl
 endif
 
 libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined