fixes for --without-pangocairo

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 3db251eb9a2d814f4aeab39fb63eadf0dd481eaa..d6278d726fd3245e2920d61384fa9df9d5110800 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -35,6 +35,7 @@ Prefix: /usr
 %define IPSEPCOLA --without-ipsepcola
 %define MYLIBGD --with-mylibgd
 %define MING --without-ming
+%define PANGOCAIRO --without-pangocairo
 
 # SuSE uses a different mechanism to generate BuildRequires
 # norootforbuild
@@ -108,6 +109,7 @@ BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel li
 %endif
 %if "%fedora" >= "6"
 %define LUA     1
+%define PANGOCAIRO  --with-pangocairo
 BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel
 %endif
 %if "%fedora" >= "7"
@@ -409,7 +411,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
       --mandir=%{_mandir} \
       --with-x \
       --disable-static \
-      --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING}
+      --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING} %{PANGOCAIRO}
 %__make %{?_smp_mflags}
 
 %install

diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index 4f56686fedd06a9e35e967ab2d170b456bcce87f..2894c0f7de9f762ddd4b9528330475cb322db071 100644 (file)
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -10,9 +10,10 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cdt \
        $(PANGOCAIRO_CFLAGS)
 
+if WITH_PANGOCAIRO
 noinst_LTLIBRARIES = libgvplugin_pango_C.la
-
 pkglib_LTLIBRARIES = libgvplugin_pango.la
+endif
 
 libgvplugin_pango_C_la_SOURCES = \
        gvplugin_pango.c \

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 92a5d993f9a482ee56cbcc6a32370c5745a17fd3..44bcb5d0ad868799daf5178c5e04b8718b558b9d 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -43,80 +43,55 @@ endif
 
 libtcldot_la_SOURCES = tcldot.c $(CODEGENS) $(GDTCLFT)
 libtcldot_la_LDFLAGS = -no-undefined
+
+libtcldot_la_LIBADD = $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
+       $(top_builddir)/lib/gvc/libgvc.la 
+
+# GDTCLFT requires gd libs to be builtin
 if WITH_LIBGD
 if WITH_MYLIBGD
-libtcldot_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/lib/gvc/libgvc.la \
-        $(top_builddir)/lib/gd/libgvgd_C.la \
-       @PANGOCAIRO_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+libtcldot_la_LIBADD += $(top_builddir)/lib/gd/libgvgd_C.la
 else
-libtcldot_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/lib/gvc/libgvc.la \
-       @PANGOCAIRO_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+libtcldot_la_LIBADD += @GD_LIBS@
 endif
-else
-libtcldot_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/lib/gvc/libgvc.la \
-       @PANGOCAIRO_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @ICONV_LIBS@ @MATH_LIBS@
+libtcldot_la_LIBADD += @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@
 endif
 
+libtcldot_la_LIBADD += @LIBGEN_LIBS@ @LIBLTDL@ @ICONV_LIBS@ @MATH_LIBS@
 
 libtcldot_builtin_la_SOURCES = \
        tcldot.c $(CODEGENS) $(GDTCLFT) \
        $(top_srcdir)/lib/gvc/dot_builtins.c \
        $(top_srcdir)/lib/gvc/no_demand_loading.c 
 libtcldot_builtin_la_LDFLAGS = -no-undefined
-if WITH_LIBGD
-if WITH_MYLIBGD
-libtcldot_builtin_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout_C.la \
-       $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
-       $(top_builddir)/plugin/core/libgvplugin_core_C.la \
-       $(top_builddir)/plugin/gd/libgvplugin_gd_C.la \
-       $(top_builddir)/plugin/pango/libgvplugin_pango_C.la \
-       $(top_builddir)/lib/gvc/libgvc_C.la \
-       $(top_builddir)/lib/graph/libgraph_C.la \
-       $(top_builddir)/lib/cdt/libcdt_C.la \
-       $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/gd/libgvgd_C.la \
-       @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
-else
+
 libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
        $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout_C.la \
        $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
        $(top_builddir)/plugin/core/libgvplugin_core_C.la \
-       $(top_builddir)/plugin/gd/libgvplugin_gd_C.la \
-       $(top_builddir)/plugin/pango/libgvplugin_pango_C.la \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-       $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       @PANGOCAIRO_LIBS@ @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@
+       $(top_builddir)/lib/pathplan/libpathplan_C.la
+
+if WITH_PANGOCAIRO
+libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la @PANGOCAIRO_LIBS@
 endif
+
+if WITH_LIBGD
+libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
+if WITH_MYLIBGD
+libtcldot_builtin_la_LIBADD += $(top_builddir)/lib/gd/libgvgd_C.la
 else
-libtcldot_builtin_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout_C.la \
-       $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
-       $(top_builddir)/plugin/core/libgvplugin_core_C.la \
-       $(top_builddir)/plugin/pango/libgvplugin_pango_C.la \
-       $(top_builddir)/lib/gvc/libgvc_C.la \
-       $(top_builddir)/lib/graph/libgraph_C.la \
-       $(top_builddir)/lib/cdt/libcdt_C.la \
-       $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
+libtcldot_builtin_la_LIBADD += @GD_LIBS@
 endif
+libtcldot_builtin_la_LIBADD += @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@
+endif
+
+libtcldot_builtin_la_LIBADD += @ICONV_LIBS@ @EXPAT_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
 
 if WITH_TCL
 all-local: pkgIndex.tcl