branch merge

diff --cc cmd/dot/Makefile.am
index 85eacf497764fbc058ea71235a1ba1946d72e52e,59759dd393425eed9859244b55104f8eba274316..4b7be0aadd5a045c6c2f1ffcbd1008f1884f99e9
--- 1/cmd/dot/Makefile.am
--- 2/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@@ -116,12 -111,17 +111,21 @@@ dot_builtins_LDADD += $(top_builddir)/p
  endif
  
  if WITH_PANGOCAIRO
 +if WITH_WEBP
 +dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
 +dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
 +endif
  dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
  dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
+ if WITH_WEBP
+ dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
+ dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
+ endif
+ endif
+ 
+ if WITH_LASI
+ dot_static_LDADD += $(top_builddir)/plugin/lasi/.libs/libgvplugin_lasi_C.a $(LASI_LIBS) -lstdc++
+ dot_builtins_LDADD += $(top_builddir)/plugin/lasi/libgvplugin_lasi.la $(LASI_LIBS) -lstdc++
  endif
  
  EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj