From: Dwight Perry <dperry@research.att.com>
Date: Fri, 25 May 2012 23:04:04 +0000 (-0400)
Subject: branch merge
X-Git-Tag: LAST_LIBGRAPH~32^2~408^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a4ca5980ee8f15ba0c96c830831e3657c9f8ca5;p=graphviz

branch merge
---

3a4ca5980ee8f15ba0c96c830831e3657c9f8ca5
diff --cc cmd/dot/Makefile.am
index 85eacf497,59759dd39..4b7be0aad
--- a/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