- provide control of whether demand loading is allowed independent of builtins

- provide demo of python wrapper using builtins and no demand laoding

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index d676f16191b67ce6d5dcb4ff33d9b520e4b85cdc..57a4c0306b06e8be65c5869045a67fa7dc09cb74 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -48,10 +48,10 @@ dot.pdf: $(top_srcdir)/cmd/dot/dot.1
 # symbols be in the binary image, but libtool makes it difficult
 # to get a library into an image if it doesn't already resolve any symbols!
 # Workaround is to link explicity to the .libs/libxxx.a
-# A better approach is probably to provide an explicit list of builins
-# like lib/gvc/dot_builtins.c
+# A better approach is probably to provide an explicit list of builtins
+# like $(top_srcdir)/lib/gvc/dot_builtins.c
 #
-dot_static_SOURCES = dot.c
+dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c
 dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
 dot_static_LDADD = \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \

diff --git a/configure.ac b/configure.ac
index 077b5c117f70fce0af835abe97cd3a91418da72c..2051eb944c2cf2979372cdf17412911b34598ac5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1814,6 +1814,7 @@ AC_CONFIG_FILES(Makefile
        lib/vpsc/Makefile
        lib/gvc/Makefile
        lib/gvc/libgvc.pc
+       lib/gvc/libgvc_builtins.pc
        lib/plugin/Makefile
        cmd/Makefile
        cmd/dot/Makefile

diff --git a/dot.demo/.cvsignore b/dot.demo/.cvsignore
index 472686275eab214982a33d24a037eeff446c3cc9..78f70b9adc88633b2c1978841a458417ce9f9607 100644 (file)
--- a/dot.demo/.cvsignore
+++ b/dot.demo/.cvsignore
@@ -2,3 +2,12 @@ dot
 simple
 demo
 example
+*.png
+*.o
+_gv.so
+gv.i
+gv.py
+gv.pyc
+gv.cpp
+gv_python.cpp
+dot_builtins.c