try to fix strange problem with convenience libraries on SGIs

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 57a4c0306b06e8be65c5869045a67fa7dc09cb74..40105854cb093e2b5ade3bfdf9e457299d0e23ce 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -53,6 +53,7 @@ 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_MYLIBGD
 dot_static_LDADD = \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout_C.a \
@@ -63,8 +64,21 @@ dot_static_LDADD = \
        $(top_builddir)/lib/pack/libpack_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_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@
-
+       $(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@ @PANGOCAIRO_LIBS@
+else
+dot_static_LDADD = \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_gd_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_pangocairo_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 \
+               @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
 

diff --git a/configure.ac b/configure.ac
index 929cf66dced3c37fff3b201293f44ab8f390443a..a0a5c8955e05cd15d54c4d0b83e3cef4a8c3f60c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1304,7 +1304,7 @@ else
     AC_DEFINE_UNQUOTED(HAVE_GD_GIF,1,[Define if the GD library has the GD_GIF feature])
     AC_DEFINE_UNQUOTED(HAVE_LIBGD,1,[Define if either internal or external GD library is availabel])
     GD_INCLUDES='-I$(top_srcdir)/lib/gd'
-    GD_LIBS='$(top_builddir)/lib/gd/libgvgd_C.la'
+    GD_LIBS='$(top_builddir)/lib/gd/libgvgd.la'
 fi
 AC_SUBST(GD_INCLUDES)
 AC_SUBST(GD_LIBS)

diff --git a/lib/gd/Makefile.am b/lib/gd/Makefile.am
index 0e457d7b2abcf812919c83ea901b8602e4fa7308..f878835120dda40a8ecf134099d119467d7f3192 100644 (file)
--- a/lib/gd/Makefile.am
+++ b/lib/gd/Makefile.am
@@ -11,6 +11,7 @@ if WITH_MYLIBGD
 noinst_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
        gdfonts.h gdfontt.h gdhelpers.h jisx0208.h wbmp.h gdfx.h entities.h
 noinst_LTLIBRARIES = libgvgd_C.la
+pkglib_LTLIBRARIES = libgvgd.la
 noinst_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd \
        pngtogd2 webpng gd2togif gdcmpgif giftogd2 \
        fontsizetest fontwheeltest gdtest gddemo gd2time gdtestft \
@@ -23,12 +24,15 @@ libgvgd_C_la_SOURCES = \
        gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c \
        gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
        gdfonts.c gdfontt.c gdft.c gdhelpers.c gdkanji.c gdxpm.c wbmp.c
-libgvgd_C_la_LIBADD = @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+
+libgvgd_la_SOURCES = $(libgvgd_C_la_SOURCES)
+libgvgd_la_LIBADD = @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+
 
 gd.html: index.html
        cp $(top_srcdir)/lib/gd/index.html gd.html
 
-LDADD = ./libgvgd_C.la
+LDADD = ./libgvgd.la
 
 dist-zip: distdir
        zip -qr $(distdir).zip $(distdir)

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 26dafffbc9bfececff91eb709cb759ade5e7f770..a1f93106796f5004d0cddbad4dba159bd3890bd9 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -32,13 +32,22 @@ libgvc_C_la_LIBADD = $(top_builddir)/lib/common/libcommon_C.la
 
 #For use with plugins.
 #   so it is linked with an empty table of builtins.
-libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ 
 libgvc_la_SOURCES = $(libgvc_C_la_SOURCES) no_builtins.c demand_loading.c
+if WITH_MYLIBGD
 libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
+       $(top_builddir)/lib/gd/libgvgd_C.la \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
-       @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@
+       @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ 
+else
+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 \
+       @GD_LIBS@
+endif
 
 #For use without plugins.
 #  so it needs to be linked with a preset table of builtins, e.g. dot_builtins.c,

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 073c68da6d51b3496383cee18ecf3547108f938c..4573677a5c2f5c324574c25bd497996f2ff45f7f 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -30,11 +30,20 @@ libgdtclft_la_SOURCES = gdtclft.c
 
 libgdtclft_la_LDFLAGS = -no-undefined
 
+if WITH_LIBGD
+if WITH_MYLIBGD
+libgdtclft_la_LIBADD = \
+       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
+       $(top_builddir)/lib/gd/libgvgd_C.la \
+       @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+else
 libgdtclft_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la @GD_LIBS@
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
+       @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+endif
 
-if WITH_LIBGD
 if WITH_TCL
 all-local: pkgIndex.tcl