Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 37848)
+++ trunk/scconfig/hooks.c	(revision 37849)
@@ -35,6 +35,8 @@
 	{"disable-bison",     "/local/pcb/want_bison",        arg_false,     "$disable generating language files using bison/flex"},
 	{"enable-byaccic",    "/local/pcb/want_byaccic",      arg_true,      "$enable generating language files using byaccic/ureglex"},
 	{"disable-byaccic",   "/local/pcb/want_byaccic",      arg_false,     "$disable generating language files byaccic/ureglex"},
+	{"enable-polybool",   "/local/pcb/want_polybool",     arg_true,      "$enable the new polygon clipping library"},
+	{"disable-polybool",  "/local/pcb/want_polybool",     arg_false,     "$disable the new polygon clipping library"},
 
 #undef plugin_def
 #undef plugin_header
@@ -104,6 +106,7 @@
 	put("/local/pcb/want_bison", sfalse);
 	put("/local/pcb/want_byaccic", sfalse);
 	put("/local/pcb/want_static", sfalse);
+	put("/local/pcb/want_polybool", sfalse);
 	put("/local/pcb/dot_pcb_rnd", ".pcb-rnd");
 	put("/local/pcb/librnd_prefix", TO_STR(LIBRND_PREFIX));
 
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 37848)
+++ trunk/src/Makefile.in	(revision 37849)
@@ -228,6 +228,14 @@
 put /local/pcb/C99CFLAGS /local/rnd/CFLAGS
 sub /local/pcb/C99CFLAGS {-ansi } {}
 
+# decide which poly clipping library to use
+if /local/pcb/want_polybool
+then
+	put /local/pcb/polyclip {-lrnd-polybool}
+else
+	put /local/pcb/polyclip {-lrnd-poly}
+end
+
 # Makefile, static
 print [@
 # *** DO NOT EDIT THIS FILE ***
@@ -274,6 +282,7 @@
 GENLIST_CFLAGS=@/local/pcb/CFLAGS_GENERIC@
 GENLIST_LDFLAGS=@cc/ldflags@
 SO=@/local/pcb/SO@
+POLYCLIP=@/local/pcb/polyclip@
 
 all:
 	$(MAKE) revcheck
@@ -288,7 +297,7 @@
 
 pcb-rnd$(EXE): $(OBJS) $(OBJS_C99) $(EXEDEPS) $(LIBS_3RD) $(LIBRND_L)/librnd-hid$(SO) $(LIBRND_L)/librnd-poly$(SO) $(LIBRND_L)/librnd-3rd$(SO)
 	$(CC) $(OBJS) $(OBJS_C99) -o pcb-rnd$(EXE) $(LIBS_PRE) \
-		-lrnd-hid -lrnd-font -lrnd-poly -lrnd-core -lrnd-3rd \
+		-lrnd-hid -lrnd-font $(POLYCLIP)  -lrnd-core -lrnd-3rd \
 		$(LDFLAGS) $(LIBS)
 
 ### pcb-rnd infra ###