Attachment #249673 for bug #339298




dnl -----------------------------------
dnl libtool ltdl on-demand plugin loading

LT_PREREQ([2.2.6])
LT_INIT([dlopen])
AM_PROG_LIBTOOL
    ],
    [ #code that is for 1.5.x
    ])
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])

Lines 18-24 Link Here

(-)graphviz-2.26.3.orig/lib/gvc/Makefile.am (-3 / +1 lines)
18	-I$(top_srcdir)/lib/pathplan \	18	-I$(top_srcdir)/lib/pathplan \
19	-I$(top_srcdir)/lib/$(GRAPH) \	19	-I$(top_srcdir)/lib/$(GRAPH) \
20	-I$(top_srcdir)/lib/cdt \	20	-I$(top_srcdir)/lib/cdt \
21	$(INCLTDL) -I$(top_srcdir)/libltdl \
22	-DGVLIBDIR=\"$(pkglibdir)\"	21	-DGVLIBDIR=\"$(pkglibdir)\"
23		22
24	if WITH_WIN32	23	if WITH_WIN32
Lines 55-62 Link Here
55	libgvc_C_la_DEPENDENCIES += $(top_builddir)/lib/ortho/libortho_C.la	54	libgvc_C_la_DEPENDENCIES += $(top_builddir)/lib/ortho/libortho_C.la
56	endif	55	endif
57	if ENABLE_LTDL	56	if ENABLE_LTDL
58	libgvc_C_la_LIBADD += $(LIBLTDL) $(LIBLTDL_LDFLAGS)	57	libgvc_C_la_LIBADD += -lltdl
59	libgvc_C_la_DEPENDENCIES += $(LIBLTDL)
60	endif	58	endif
61		59
62	libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined	60	libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined

Return to bug 339298

Lines 464-507 Link Here

(-)graphviz-2.26.3.orig/configure.ac (-29 / +2 lines)
464	dnl -----------------------------------	464	dnl -----------------------------------
465	dnl libtool ltdl on-demand plugin loading	465	dnl libtool ltdl on-demand plugin loading
466		466
467	m4_ifdef([LT_INIT],	467	LT_PREREQ([2.2.6])
468	[ #code that is for Libtool 2.x	468	LT_INIT([dlopen])
469	AM_PROG_LIBTOOL
470	],
471	[ #code that is for 1.5.x
472	])
473	AC_ARG_ENABLE(ltdl,	469	AC_ARG_ENABLE(ltdl,
474	[AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])	470	[AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])
475	if test "x$enable_ltdl" != "xno"; then	471	if test "x$enable_ltdl" != "xno"; then
476	AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])	472	AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])
477	AC_LIBTOOL_DLOPEN
478	m4_ifdef([LT_INIT],
479	[ #code that is for Libtool 2.x
480	LT_CONFIG_LTDL_DIR([libltdl])
481	LTDL_INIT
482	],
483	[ #code that is for 1.5.x
484	AC_CONFIG_SUBDIRS([libltdl])
485	])
486	use_ltdl="Yes"	473	use_ltdl="Yes"
487
488	AC_LIBLTDL_CONVENIENCE
489	if test "x$DARWIN9" = "xyes"; then
490	LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
491	fi
492	else	474	else
493	use_ltdl="No (disabled)"	475	use_ltdl="No (disabled)"
494	fi	476	fi
495	AM_CONDITIONAL(ENABLE_LTDL, [test "x$enable_ltdl" != "xno"])	477	AM_CONDITIONAL(ENABLE_LTDL, [test "x$enable_ltdl" != "xno"])
496	AC_SUBST(INCLTDL)
497	AC_SUBST(LIBLTDL)
498	AC_SUBST(LIBLTDL_LDFLAGS)
499	m4_ifdef([LT_INIT],
500	[ #code that is for Libtool 2.x
501	],
502	[ #code that is for 1.5.x
503	AM_PROG_LIBTOOL
504	])
505		478
506	# Checks for libraries.	479	# Checks for libraries.
507	#AC_CHECK_LIB([ICE], [main])	480	#AC_CHECK_LIB([ICE], [main])