e191cbb3e9
reviewed ok OBS-URL: https://build.opensuse.org/request/show/63973 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=26
100 lines
2.9 KiB
Diff
100 lines
2.9 KiB
Diff
See http://bugs.gentoo.org/339298
|
|
|
|
Index: graphviz-2.26.3/configure.ac
|
|
===================================================================
|
|
--- graphviz-2.26.3.orig/configure.ac 2010-01-26 17:00:29.000000000 +0100
|
|
+++ graphviz-2.26.3/configure.ac 2011-03-11 13:22:25.525313743 +0100
|
|
@@ -464,44 +464,17 @@ AC_REPLACE_FUNCS([strcasecmp strncasecmp
|
|
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])
|
|
Index: graphviz-2.26.3/lib/gvc/gvcext.h
|
|
===================================================================
|
|
--- graphviz-2.26.3.orig/lib/gvc/gvcext.h 2009-07-08 17:14:20.000000000 +0200
|
|
+++ graphviz-2.26.3/lib/gvc/gvcext.h 2011-03-11 13:23:13.753417211 +0100
|
|
@@ -58,6 +58,7 @@ extern "C" {
|
|
typedef struct GVJ_s GVJ_t;
|
|
typedef struct GVC_s GVC_t;
|
|
|
|
+
|
|
typedef struct {
|
|
const char *name;
|
|
void* address;
|
|
@@ -80,9 +81,11 @@ __declspec(dllexport) lt_symlist_t lt_pr
|
|
#if defined(GVDLL)
|
|
__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
|
|
#else
|
|
+#if !defined(LTDL_H)
|
|
extern lt_symlist_t lt_preloaded_symbols[];
|
|
#endif
|
|
#endif
|
|
+#endif
|
|
|
|
|
|
#ifdef __cplusplus
|
|
Index: graphviz-2.26.3/lib/gvc/Makefile.am
|
|
===================================================================
|
|
--- graphviz-2.26.3.orig/lib/gvc/Makefile.am 2009-08-28 21:46:42.000000000 +0200
|
|
+++ graphviz-2.26.3/lib/gvc/Makefile.am 2011-03-11 13:22:25.526313858 +0100
|
|
@@ -18,7 +18,6 @@ AM_CPPFLAGS = \
|
|
-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_LIBADD += $(top_builddir)/li
|
|
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
|