From: ellson <devnull@localhost>
Date: Fri, 14 Mar 2008 04:10:39 +0000 (+0000)
Subject: NetBSD patches - mostly linker
X-Git-Tag: LAST_LIBGRAPH~32^2~4509
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0986290b835bff63c1963dcac4a63373d0ca3552;p=graphviz

NetBSD patches - mostly linker
	from: Joerg Sonnenberger <joerg@NetBSD.org>
---

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 129fef013..5505bdbaa 100644
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -40,7 +40,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
 	$(top_builddir)/lib/cdt/libcdt.la \
 	$(top_builddir)/lib/graph/libgraph.la \
 	$(top_builddir)/lib/pathplan/libpathplan.la \
-	@EXPAT_LIBS@ @Z_LIBS@
+	@EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 
 #For use without plugins.
 #  so it needs to be linked with a preset table of builtins, e.g. dot_builtins.c,
diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 6a15977e4..12cac498e 100644
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -29,7 +29,9 @@ libgvplugin_core_C_la_SOURCES = \
 
 libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
-libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la
+libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \
+				$(top_builddir)/lib/graph/libgraph.la \
+				$(top_builddir)/lib/cdt/libcdt.la
 
 if WITH_WIN32
 libgvplugin_core_la_LDFLAGS += -no-undefined
diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index 1fba36da8..14f6bb63d 100644
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -28,7 +28,9 @@ libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
 libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
 	$(top_builddir)/lib/gvc/libgvc.la \
-	$(top_builddir)/lib/pathplan/libpathplan.la
+	$(top_builddir)/lib/graph/libgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la \
+	$(top_builddir)/lib/pathplan/libpathplan.la @MATH_LIBS@
 	
 if WITH_WIN32
 libgvplugin_dot_layout_la_LDFLAGS += -no-undefined
diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index 8360f9bfa..0b17456f5 100644
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -32,11 +32,15 @@ if WITH_MYLIBGD
 libgvplugin_gd_la_LIBADD = \
 	$(top_builddir)/lib/gd/libgvgd_C.la \
 	$(top_builddir)/lib/gvc/libgvc.la \
+	$(top_builddir)/lib/graph/libgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la \
 	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 AM_CPPFLAGS += -DNONDLL
 else
 libgvplugin_gd_la_LIBADD = \
-	$(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@
+	$(top_builddir)/lib/gvc/libgvc.la \
+	$(top_builddir)/lib/graph/libgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la @GD_LIBS@ @MATH_LIBS@
 endif
 
 if WITH_WIN32
diff --git a/plugin/gd/gvtextlayout_gd.c b/plugin/gd/gvtextlayout_gd.c
index f872be686..c3fc86f90 100644
--- a/plugin/gd/gvtextlayout_gd.c
+++ b/plugin/gd/gvtextlayout_gd.c
@@ -52,7 +52,7 @@ char *gd_alternate_fontlist(char *font)
     len = strlen(font) + 1;
     if (len > fontbufsz) {
 	fontbufsz = 2 * len;
-	if (fontbuf)
+	if (fontbuf == NULL)
 	    fontbuf = malloc(fontbufsz);
 	else
 	    fontbuf = realloc(fontbuf, fontbufsz);
diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index 61700fcd5..59a51420f 100644
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -31,7 +31,9 @@ libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
 libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
 	$(top_builddir)/lib/gvc/libgvc.la \
-	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@
+	$(top_builddir)/lib/graph/libgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la \
+	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ @MATH_LIBS@
 	
 if WITH_WIN32
 libgvplugin_neato_layout_la_LDFLAGS += -no-undefined
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index af6e79b28..06a20a7c8 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -16,7 +16,9 @@ AM_CPPFLAGS = \
 LIBS =  @LIBS@ -lc
 
 BASESOURCES = gv.cpp gv.i
-BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
+BASELIBS = $(top_builddir)/lib/gvc/libgvc.la \
+	$(top_builddir)/lib/graph/libgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la
 
 pkgsharpdir = $(pkglibdir)/sharp
 SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 6f700481a..0186eb867 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -75,7 +75,7 @@ libtcldot_builtin_la_LIBADD = \
 	$(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/pathplan/libpathplan_C.la @TCL_LIBS@
 
 if WITH_PANGOCAIRO
 libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la @PANGOCAIRO_LIBS@