back out previous change - dot_builtins.c needs work

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 62bb150feea778e73c50d0b944109b6c535d1387..da41b96af767645ab79106574c46aa4bd5d053b1 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -53,19 +53,6 @@ dot.pdf: $(top_srcdir)/cmd/dot/dot.1
 #
 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'
-if WITH_PANGOCAIRO
-dot_static_LDADD = \
-       $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
-       $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
-       $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
-       $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
-       $(top_builddir)/lib/gvc/libgvc_C.la \
-       $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/pack/libpack_C.la \
-       $(top_builddir)/lib/graph/libgraph_C.la \
-       $(top_builddir)/lib/cdt/libcdt_C.la \
-               @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
-else
 if WITH_MYLIBGD
 dot_static_LDADD = \
        $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
@@ -79,7 +66,7 @@ dot_static_LDADD = \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(top_builddir)/lib/gd/libgvgd_C.la \
-               @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
+               @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@
 else
 dot_static_LDADD = \
        $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
@@ -92,8 +79,7 @@ dot_static_LDADD = \
        $(top_builddir)/lib/pack/libpack_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-               @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
-endif
+               @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@
 endif
 
 EXTRA_DIST = Makefile.old dot.1 dot.pdf