pdf_DATA = dot.1.pdf
dot_SOURCES = dot.c no_builtins.c
+dot_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
install-data-hook:
dot.1.pdf: $(srcdir)/dot.1
- $(GROFF) -Tps -man $(srcdir)/dot.1 | $(PS2PDF) - - >dot.1.pdf
-dot_static_SOURCES = dot.c dot_builtins.c no_demand_loading.c
+dot_static_SOURCES = dot.c dot_builtins.c
+dot_static_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0
dot_static_LDADD = \
$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout_C.la \
$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
$(top_builddir)/lib/cdt/libcdt_C.la \
$(GTS_LIBS) $(ICONV_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
-dot_builtins_SOURCES = dot.c dot_builtins.c no_demand_loading.c
+dot_builtins_SOURCES = dot.c dot_builtins.c
+dot_builtins_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
dot_builtins_LDADD = \
$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
#endif /* WITH_CGRAPH */
-#if 0
-
-/* For Windows DLLs using builtins, we need to initialize
- * * the lt_preloaded_symbols table.
- * */
-/*visual studio*/
-#if defined(WIN32_DLL) && !defined(ENABLE_LTDL)
- init_lt_preloaded_symbols();
-#endif
-/*end visual studio*/
-
-#ifndef WIN32_DLL
-#if defined(GVDLL) && !defined(ENABLE_LTDL)
- init_lt_preloaded_symbols();
-#endif
-#endif
-
-#endif
-
- Gvc = gvNEWcontext(lt_preloaded_symbols);
+ Gvc = gvNEWcontext(lt_preloaded_symbols, DEMAND_LOADING);
gvParseArgs(Gvc, argc, argv);
#ifndef WIN32
+++ /dev/null
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-* This software is part of the graphviz package *
-* http://www.graphviz.org/ *
-* *
-* Copyright (c) 1994-2004 AT&T Corp. *
-* and is licensed under the *
-* Common Public License, Version 1.0 *
-* by AT&T Corp. *
-* *
-* Information and Software Systems Research *
-* AT&T Research, Florham Park NJ *
-**********************************************************/
-
-const int Demand_Loading = 0;
- @GROFF@ -Tps -man $(srcdir)/gc.1 | @PS2PDF@ - - >gc.1.pdf
gvpack_SOURCES = gvpack.c gvpack_builtins.c
+gvpack_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0
gvpack_LDADD = \
$(top_builddir)/lib/gvc/libgvc.la \
init(argc, argv);
- gvc = gvNEWcontext(lt_preloaded_symbols);
+ gvc = gvNEWcontext(lt_preloaded_symbols, DEMAND_LOADING);
gs = readGraphs(&cnt, gvc);
if (cnt == 0)
exit(0);
dnl -----------------------------------
dnl checks for compilers
-AC_PROG_CC
+AM_PROG_CC_C_O
+#AC_PROG_CC
AC_PROG_CXX
AC_PROG_OBJC
if test "x$use_swig" != "xYes"; then
use_php="No (swig not available)"
else
- if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0 && `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then
+ if test `$SWIG -help 2>&1 | $GREP -c '\-php5* *- Generate'` = 0 ; then
use_php="No (swig does not support -php or -php5 option)"
else
AC_CHECK_PROG(PHP,php,php)
pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \
gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \
- gvplugin_textlayout.h gvplugin_device.h gvplugin_loadimage.h \
- demand_loading.c no_demand_loading.c
+ gvplugin_textlayout.h gvplugin_device.h gvplugin_loadimage.h
noinst_HEADERS = gvcint.h gvcproc.h gvio.h
noinst_LTLIBRARIES = libgvc_C.la
lib_LTLIBRARIES = libgvc.la
endif
libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined
-libgvc_la_SOURCES = $(libgvc_C_la_SOURCES) demand_loading.c
+libgvc_la_SOURCES = $(libgvc_C_la_SOURCES)
libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
$(top_builddir)/lib/cdt/libcdt.la \
$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+++ /dev/null
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-* This software is part of the graphviz package *
-* http://www.graphviz.org/ *
-* *
-* Copyright (c) 1994-2004 AT&T Corp. *
-* and is licensed under the *
-* Common Public License, Version 1.0 *
-* by AT&T Corp. *
-* *
-* Information and Software Systems Research *
-* AT&T Research, Florham Park NJ *
-**********************************************************/
-
-/*visual studio*/
-#ifdef WIN32_DLL
-#ifndef GVC_EXPORTS
-__declspec(dllimport) int Demand_Loading = 1;
-#else
-__declspec(dllexport) int Demand_Loading = 1;
-#endif
-#endif
-/*end visual studio*/
-
-#ifndef WIN32_DLL
-#ifdef GVDLL
-__declspec(dllexport) int Demand_Loading = 1;
-#else
-const int Demand_Loading = 1;
-#endif
-#endif
\ No newline at end of file
+++ /dev/null
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-* This software is part of the graphviz package *
-* http://www.graphviz.org/ *
-* *
-* Copyright (c) 1994-2004 AT&T Corp. *
-* and is licensed under the *
-* Common Public License, Version 1.0 *
-* by AT&T Corp. *
-* *
-* Information and Software Systems Research *
-* AT&T Research, Florham Park NJ *
-**********************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gvplugin.h"
-
-#if defined(GVDLL) && !defined(ENABLE_LTDL)
-#define extern __declspec(dllimport)
-#endif
-
-extern gvplugin_library_t gvplugin_dot_layout_LTX_library;
-extern gvplugin_library_t gvplugin_neato_layout_LTX_library;
-#ifdef HAVE_LIBGD
-extern gvplugin_library_t gvplugin_gd_LTX_library;
-#endif
-#ifdef HAVE_PANGOCAIRO
-extern gvplugin_library_t gvplugin_pango_LTX_library;
-#endif
-extern gvplugin_library_t gvplugin_core_LTX_library;
-
-
-lt_symlist_t lt_preloaded_symbols[] = {
- { "gvplugin_dot_layout_LTX_library", (void*)(&gvplugin_dot_layout_LTX_library) },
- { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
-#ifdef HAVE_PANGOCAIRO
- { "gvplugin_pango_LTX_library", (void*)(&gvplugin_pango_LTX_library) },
-#endif
-#ifdef HAVE_LIBGD
- { "gvplugin_gd_LTX_library", (void*)(&gvplugin_gd_LTX_library) },
-#endif
- { "gvplugin_core_LTX_library", (void*)(&gvplugin_core_LTX_library) },
- { 0, 0 }
-};
-
-
-#if 0
-
-#if defined(GVDLL) && !defined(ENABLE_LTDL)
-lt_symlist_t lt_preloaded_symbols[] = {
- { "gvplugin_dot_layout_LTX_library", 0},
- { "gvplugin_neato_layout_LTX_library", 0},
-#ifdef HAVE_PANGOCAIRO
- { "gvplugin_pango_LTX_library", 0},
-#endif
-#ifdef HAVE_LIBGD
- { "gvplugin_gd_LTX_library", 0},
-#endif
- { "gvplugin_core_LTX_library", 0},
- { 0, 0 }
-};
-
-static void*
-lt_lookup (const char* name)
-{
- void* addr = 0;
- switch (*(name + 9)) { /* skip "gvplugin_" */
- case 'c' :
- addr = &gvplugin_core_LTX_library;
- break;
- case 'd' :
- addr = &gvplugin_dot_layout_LTX_library;
- break;
-#ifdef HAVE_LIBGD
- case 'g' :
- addr = &gvplugin_gd_LTX_library;
- break;
-#endif
- case 'n' :
- addr = &gvplugin_neato_layout_LTX_library;
- break;
-#ifdef HAVE_PANGOCAIRO
- case 'p' :
- addr = &gvplugin_pango_LTX_library;
- break;
-#endif
- }
- return addr;
-}
-
-void
-init_lt_preloaded_symbols()
-{
- const char* s;
- int i;
- for (i = 0; (s = lt_preloaded_symbols[i].name); i++) {
- lt_preloaded_symbols[0].address = lt_lookup (s);
- }
-}
-
-#endif
-#endif
#else
agattr(NULL, AGNODE, "label", NODENAME_ESC);
#endif
- gvc = gvNEWcontext(NULL);
+ /* default to no builtins, demand loading enabled */
+ gvc = gvNEWcontext(NULL, TRUE);
gvconfig(gvc, FALSE); /* configure for available plugins and codegens */
return gvc;
}
-GVC_t *gvContextBuiltins(const lt_symlist_t *builtins)
+GVC_t *gvContextPlugins(const lt_symlist_t *builtins, int demand_loading)
{
GVC_t *gvc;
#else
agattr(NULL, AGNODE, "label", NODENAME_ESC);
#endif
- gvc = gvNEWcontext(builtins);
+ gvc = gvNEWcontext(builtins, demand_loading);
gvconfig(gvc, FALSE); /* configure for available plugins and codegens */
return gvc;
}
+++ /dev/null
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/**********************************************************
-* This software is part of the graphviz package *
-* http://www.graphviz.org/ *
-* *
-* Copyright (c) 1994-2004 AT&T Corp. *
-* and is licensed under the *
-* Common Public License, Version 1.0 *
-* by AT&T Corp. *
-* *
-* Information and Software Systems Research *
-* AT&T Research, Florham Park NJ *
-**********************************************************/
-
-const int Demand_Loading = 0;
projects / graphviz / commitdiff