Partial application of configure.patch from Jens Elkner <jel+iws@iws.cs.uni-magdeburg.de>

Does not include changes to tclsh & tclConfig.sh detection.

diff --git a/configure.ac b/configure.ac
index feb860695a0c4e7eb46e10e79e70bed1e5369737..d1dea177ae3e7a72e8f1f2ab865894d6751203cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -160,8 +160,8 @@ case "${host_os}" in
        BROWSER="open"
        AC_DEFINE_UNQUOTED(DARWIN_DYLIB,"$DARWIN_DYLIB",[Define for Darwin-style shared library names.])
        ;;
-  * ) # This sucks!  Whatever happened to standards for file system layout?
-       DEFAULT_FONTPATH="/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+  * ) # This sucks!  Whatever happened to standards for file system layout?   (Good job its no longer used unless fontconfig is unavailable.)
+       DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
        PATHSEPARATOR=":"
         NO_POSTSCRIPT_ALIAS=0
        BROWSER="xdg-open"
@@ -544,6 +544,8 @@ if test "x$no_x" = "xyes"; then
   X_SUBDIRS=""
 else
   use_xlib="Yes"
+  PKG_CHECK_MODULES(X11, [x11])
+  PKG_CHECK_MODULES(XRENDER, [xrender])
 fi
 AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
 
@@ -790,7 +792,7 @@ else
            LDFLAGS="$LDFLAGS -L$lua_lib"
         fi
     
-        if test "x$LUA_INCLUDES" = "x" -o "x$LUA_LIBS" = "x" ; then
+        if test "x$LUA_INCLUDES" = "x" -a "x$LUA_LIBS" = "x" ; then
             PKGCONFIG=""
             AC_CHECK_PROGS(PKGCONFIG, pkg-config)
             if test "x$PKGCONFIG" != "x"; then
@@ -2002,7 +2004,8 @@ AM_CONDITIONAL(WITH_PANGOCAIRO, [test "x$use_pangocairo" = "xYes"])
 # see if pango uses a fontconfig/freetype2 backend
 if test "x$use_pangocairo" = "xYes"; then
     save_LIBS=$LIBS
-    LIBS="$LIBS $PANGOCAIRO_LIBS"
+    PKG_CHECK_MODULES(PANGOFT2, [pangoft2])
+    LIBS="$LIBS $PANGOCAIRO_LIBS $PANGOFT2_LIBS"
     AC_CHECK_FUNCS([pango_fc_font_lock_face pango_fc_font_unlock_face])
     LIBS=$save_LIBS
 fi

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index dc8dc11de7c0bb1628d958d39627e2be7ab86a17..231399a486da96d8bfc71514a2e16cdb2e2a2443 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -40,6 +40,7 @@ libgvplugin_gd_la_LIBADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/cdt/libcdt.la \
+       $(top_builddir)/lib/cdt/libpathplan.la \
        @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 AM_CPPFLAGS += -DNONDLL
 else

diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index e25a0f10750f1fe8e8b4684bee6cb56aa458bfd4..60290f1e3bae0f6057172a8a657b8898f11a419f 100644 (file)
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -34,7 +34,7 @@ libgvplugin_pango_C_la_SOURCES = \
 libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_pango_la_SOURCES = $(libgvplugin_pango_C_la_SOURCES)
 libgvplugin_pango_la_LIBADD = \
-       $(top_builddir)/lib/gvc/libgvc.la @PANGOCAIRO_LIBS@ @MATH_LIBS@
+       $(top_builddir)/lib/gvc/libgvc.la @PANGOCAIRO_LIBS@ @PANGOFT2_LIBS@ @MATH_LIBS@
 
 if WITH_WIN32
 libgvplugin_pango_la_LDFLAGS += -no-undefined

diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am
index fece00d6ab2b5d98331cfd0b04c3d9bcf6946bc1..51dfc289603f41c22d3727914da5e66c5d65e872 100644 (file)
--- a/plugin/xlib/Makefile.am
+++ b/plugin/xlib/Makefile.am
@@ -42,7 +42,7 @@ libgvplugin_xlib_C_la_SOURCES = \
 
 libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_xlib_la_SOURCES = $(libgvplugin_xlib_C_la_SOURCES)
-libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ @X_LIBS@ -lX11 @SOCKET_LIBS@ @MATH_LIBS@
+libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ $(X11_LIBS) $(XRENDER_LIBS) @SOCKET_LIBS@ @MATH_LIBS@
 
 if WITH_WIN32
 libgvplugin_xlib_la_LDFLAGS += -no-undefined

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 466c88fa033f19786459b41b266a03bc29b9469a..02b7c239d749d25bcb99e5d99ddb59c4a860d5a6 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -49,6 +49,9 @@ 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/cdt/libcdt.la \
+       $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+       $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/gvc/libgvc.la 
 
 libtcldot_la_DEPENDENCIES =  $(top_builddir)/lib/gvc/libgvc.la
@@ -81,7 +84,7 @@ libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(GTS_LIBS)
 
 if WITH_PANGOCAIRO
-libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la $(PANGOCAIRO_LIBS)
+libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
 endif
 
 if WITH_LIBGD

diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index 589c746074cd33adaa854b77bb9d2e16c9d72379..a1d69f78c60f23628789dc77e56a3e7c9ae0458d 100644 (file)
--- a/tclpkg/tclpathplan/Makefile.am
+++ b/tclpkg/tclpathplan/Makefile.am
@@ -22,7 +22,7 @@ libtclplan_la_LDFLAGS = -no-undefined
 libtclplan_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/lib/pathplan/libpathplan.la
+       $(top_builddir)/lib/pathplan/libpathplan.la $(MATH_LIBS)
 
 if WITH_TCL
 all-local: pkgIndex.tcl