Index: trunk/config.auto.h.in
===================================================================
--- trunk/config.auto.h.in	(revision 473)
+++ trunk/config.auto.h.in	(revision 474)
@@ -100,13 +100,7 @@
 /* Define to 1 if you have the <windows.h> header file. */
 /* #undef HAVE_WINDOWS_H */
 
-/* Define to 1 if Xinerama is available */
-#define HAVE_XINERAMA 1
 
-/* Define to 1 if Xrender is available */
-#define HAVE_XRENDER 1
-
-
 /* Define to 1 if you have the `_spawnvp' function. */
 /* #undef HAVE__SPAWNVP */
 
@@ -263,7 +257,12 @@
 	default print [@#define WRAP_S_ISLNK(x) @/target/libs/fs/stat/macros/S_ISLNK@(x)@]; end;
 end;
 
+print {\n\n/* Define to 1 if Xinerama is available */\n}
+print_ternary libs/gui/xinerama/presents {#define HAVE_XINERAMA 1} {#undef /* HAVE_XINERAMA 1 */}
 
+print {\n\n/* Define to 1 if Xrender is available */\n}
+print_ternary libs/gui/xrender/presents {#define HAVE_XRENDER 1} {#undef /* HAVE_XRENDER 1 */}
+
 print [@
 
 /* Directory separator char */
Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 473)
+++ trunk/scconfig/hooks.c	(revision 474)
@@ -65,8 +65,16 @@
 	require("libs/gui/gtk2/presents", 0, 0);
 	require("libs/gui/lesstif2/presents", 0, 0);
 
+	if (istrue(get("libs/gui/lesstif2/presents"))) {
+		require("libs/gui/xinerama/presents", 0, 0);
+		require("libs/gui/xrender/presents", 0, 0);
+	}
+
+	/* for the exporters */
+	/* TODO: make this optional */
 	require("libs/gui/gd", 0, 1);
-	/* for the toporouter and gsch2pcb: */
+
+	/* for core, the toporouter and gsch2pcb: */
 	require("libs/sul/glib", 0, 1);
 
 	/* generic utils for Makefiles */
Index: trunk/src/Makefile.in.mod/lesstif
===================================================================
--- trunk/src/Makefile.in.mod/lesstif	(revision 473)
+++ trunk/src/Makefile.in.mod/lesstif	(revision 474)
@@ -1,8 +1,19 @@
 # lesstif2 options
 if /target/libs/gui/lesstif2/presents then
-append /local/pcb/CFLAGS {-I./hid/lesstif}
-append /local/pcb/CFLAGS  /target/libs/gui/lesstif2/cflags
-append /local/pcb/LIBS    /target/libs/gui/lesstif2/ldflags
+
+append /local/pcb/CFLAGS [@
+	-I./hid/lesstif
+	@/target/libs/gui/lesstif2/cflags@
+	@/target/libs/gui/xinerama/cflags@
+	@/target/libs/gui/xrender/cflags@
+@]
+
+append /local/pcb/LIBS [@
+	@/target/libs/gui/lesstif2/ldflags@
+	@/target/libs/gui/xinerama/ldflags@
+	@/target/libs/gui/xrender/ldflags@
+@]
+
 append /local/pcb/OBJS  [@
 	hid/lesstif/dialogs.o
 	hid/lesstif/library.o