[teklib-general] changeset in /hg/teklib/current: Fixed Xft library dlclose(), re...

[Timm S. Mueller]

changeset e89d7c76f1fa in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=e89d7c76f1fa
description:
	Fixed Xft library dlclose(), removed dependency during build

diffs (35 lines):

diff -r 88c0547c7374 -r e89d7c76f1fa src/display_x11/build/tmkmakefile
--- a/src/display_x11/build/tmkmakefile	Tue Sep 25 21:05:00 2007 +0200
+++ b/src/display_x11/build/tmkmakefile	Tue Sep 25 21:28:08 2007 +0200
@@ -12,7 +12,7 @@
 		display_x11
 	[/embed]
 
-	EXTRAMODLIBS = -lXft -L/usr/X11R6/lib -lX11 -lXext
+	EXTRAMODLIBS = -L/usr/X11R6/lib -lX11 -lXext
 	EXTRADEFS = -D_XOPEN_SOURCE -I/usr/include/freetype2/
 
 	[embed body="modlink"]
diff -r 88c0547c7374 -r e89d7c76f1fa src/display_x11/display_x11_inst.c
--- a/src/display_x11/display_x11_inst.c	Tue Sep 25 21:05:00 2007 +0200
+++ b/src/display_x11/display_x11_inst.c	Tue Sep 25 21:28:08 2007 +0200
@@ -318,9 +318,6 @@ x11_exitinstance(TMOD_X11 *inst)
 	for (; (next = node->tln_Succ); node = next)
 		x11_hostclosefont(inst, (TAPTR) node);
 
-// 	if (inst->x11_libxfthandle)
-// 		dlclose(inst->x11_libxfthandle);
-
 	if (inst->x11_fd_sigpipe_read != -1)
 	{
 		close(inst->x11_fd_sigpipe_read);
@@ -329,6 +326,9 @@ x11_exitinstance(TMOD_X11 *inst)
 
 	if (inst->x11_Display)
 		XCloseDisplay(inst->x11_Display);
+
+	if (inst->x11_libxfthandle)
+		dlclose(inst->x11_libxfthandle);
 }
 
 /*****************************************************************************/