Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 970)
+++ trunk/scconfig/hooks.c	(revision 971)
@@ -6,9 +6,59 @@
 #include "db.h"
 #include "libs.h"
 #include "tmpasm_scconfig.h"
+#include "../util/arg_auto_set.h"
 
 #include "../src_3rd/puplug/scconfig_hooks.h"
 
+#include "plugin_3state.h"
+
+const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */
+
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_, hidlib_) plugin3_args(name, desc)
+#define plugin_header(sect)
+#define plugin_dep(plg, on, hidlib)
+#include "plugins.h"
+
+	{NULL, NULL, NULL, NULL}
+};
+
+static void help1(void)
+{
+	argtbl_t *a;
+
+	printf("./configure: configure sch-rnd.\n");
+	printf("\n");
+	printf("Usage: ./configure [options]\n");
+	printf("\n");
+	printf("options are:\n");
+	printf(" --prefix=path              change installation prefix from /usr/local to path\n");
+	printf(" --debug                    build full debug version (-g -O0, extra asserts)\n");
+	printf(" --profile                  build profiling version if available (-pg)\n");
+	printf(" --symbols                  include symbols (add -g, but no -O0 or extra asserts)\n");
+	printf(" --coord=32|64              set coordinate integer type's width in bits\n");
+	printf(" --dot_pcb_pcb=path         .pcb-rnd config path under $HOME/\n");
+	printf(" --workaround-gtk-ctrl      enable GTK control key query workaround\n");
+	printf(" --man1dir=path             change installation path of man1 files (under prefix)\n");
+	printf(" --libarchdir=relpath       relative path under prefix for arch-lib-dir (e.g. lib64)\n");
+	printf(" --confdir=path             change installed conf path (normally matches sharedir)\n");
+	printf(" --all=plugin               enable all working plugins for dynamic load\n");
+	printf(" --all=buildin              enable all working plugins for static link\n");
+	printf(" --all=disable              disable all plugins (compile core only)\n");
+	printf(" --force-all=plugin         enable even broken plugins for dynamic load\n");
+	printf(" --force-all=buildin        enable even broken plugins for static link\n");
+}
+
+static void help2(void)
+{
+	printf("\n");
+	printf("Some of the --disable options will make ./configure to skip detection of the given feature and mark them \"not found\".");
+	printf("\n");
+}
+
+
 /* Runs when a custom command line argument is found
  returns true if no furhter argument processing should be done */
 int hook_custom_arg(const char *key, const char *value)
Index: trunk/src/libcschem/abstract.c
===================================================================
--- trunk/src/libcschem/abstract.c	(revision 970)
+++ trunk/src/libcschem/abstract.c	(revision 971)
@@ -31,7 +31,7 @@
 #include <genht/hash.h>
 
 #include "abstract.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 
 void csch_ahdr_uninit(csch_ahdr_t *hdr)
 {
Index: trunk/src/libcschem/actions_csch.c
===================================================================
--- trunk/src/libcschem/actions_csch.c	(revision 970)
+++ trunk/src/libcschem/actions_csch.c	(revision 971)
@@ -34,7 +34,7 @@
 
 #include <libfungw/fungw_conv.h>
 
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "actions_csch.h"
 #include "oidpath.h"
 
Index: trunk/src/libcschem/attrib.c
===================================================================
--- trunk/src/libcschem/attrib.c	(revision 970)
+++ trunk/src/libcschem/attrib.c	(revision 971)
@@ -33,7 +33,7 @@
 #include <genvector/vts0.h>
 #include <genvector/vtp0.h>
 #include "attrib.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 
 /*** low level attribute manipulation */
 
Index: trunk/src/libcschem/cnc_pen.h
===================================================================
--- trunk/src/libcschem/cnc_pen.h	(revision 970)
+++ trunk/src/libcschem/cnc_pen.h	(revision 971)
@@ -28,7 +28,7 @@
 #ifndef CSCH_CONCRETE_PEN_H
 #define CSCH_CONCRETE_PEN_H
 #include "libcschem/concrete.h"
-#include "color.h"
+#include <librnd/core/color.h>
 
 /* type=CSCH_CTYPE_PEN */
 
Index: trunk/src/libcschem/concrete.h
===================================================================
--- trunk/src/libcschem/concrete.h	(revision 970)
+++ trunk/src/libcschem/concrete.h	(revision 971)
@@ -28,9 +28,9 @@
 #ifndef CSCH_CONCRETE_H
 #define CSCH_CONCRETE_H
 
-#include "global_typedefs.h"
-#include "hidlib.h"
-#include "color.h"
+#include <librnd/core/global_typedefs.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/color.h>
 
 #include "libcschem/common_types.h"
 #include "libcschem/rtree.h"
Index: trunk/src/libcschem/config.h.in
===================================================================
--- trunk/src/libcschem/config.h.in	(revision 970)
+++ trunk/src/libcschem/config.h.in	(revision 971)
@@ -7,6 +7,8 @@
 #ifndef CSCH_CONFIG_H
 #define CSCH_CONFIG_H
 
+#include <librnd/config.h>
+
 @sys/types/size/includes@
 
 typedef @sys/types/size/4_u_int@ csch_uint32_t;
Index: trunk/src/libcschem/engine.c
===================================================================
--- trunk/src/libcschem/engine.c	(revision 970)
+++ trunk/src/libcschem/engine.c	(revision 971)
@@ -31,7 +31,7 @@
 #include <libfungw/fungw.h>
 
 #include "actions_csch.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "project.h"
 
 #include "engine.h"
Index: trunk/src/libcschem/library.c
===================================================================
--- trunk/src/libcschem/library.c	(revision 970)
+++ trunk/src/libcschem/library.c	(revision 971)
@@ -24,11 +24,11 @@
  *    mailing list: cschem (at) list.repo.hu (send "subscribe")
  */
 
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 #include "config.h"
-#include "misc_util.h"
+#include <librnd/core/misc_util.h>
 
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "message.h"
 
 #include "library.h"
Index: trunk/src/libcschem/library.h
===================================================================
--- trunk/src/libcschem/library.h	(revision 970)
+++ trunk/src/libcschem/library.h	(revision 971)
@@ -29,8 +29,8 @@
 #include <genvector/vts0.h>
 #include <genvector/gds_char.h>
 
-#include "safe_fs.h"
-#include "safe_fs_dir.h"
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/safe_fs_dir.h>
 
 typedef struct {
 	/* optional configuration */
Index: trunk/src/libcschem/message.c
===================================================================
--- trunk/src/libcschem/message.c	(revision 970)
+++ trunk/src/libcschem/message.c	(revision 971)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <genvector/vtp0.h>
-#include "fptr_cast.h"
+#include <librnd/core/fptr_cast.h>
 
 #include "message.h"
 
Index: trunk/src/libcschem/plug_io.c
===================================================================
--- trunk/src/libcschem/plug_io.c	(revision 970)
+++ trunk/src/libcschem/plug_io.c	(revision 971)
@@ -31,10 +31,10 @@
 #include <string.h>
 #include <genvector/vtp0.h>
 #include "plug_io.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "project.h"
-#include "safe_fs.h"
-#include "compat_lrealpath.h"
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/compat_lrealpath.h>
 
 static vtp0_t ios;
 
Index: trunk/src/libcschem/project.c
===================================================================
--- trunk/src/libcschem/project.c	(revision 970)
+++ trunk/src/libcschem/project.c	(revision 971)
@@ -29,10 +29,10 @@
 #include <genvector/gds_char.h>
 #include "project.h"
 #include "libcschem.h"
-#include "compat_lrealpath.h"
+#include <librnd/core/compat_lrealpath.h>
 #include "message.h"
-#include "compat_fs.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 
 csch_project_t *csch_project_alloc(void)
Index: trunk/src/plugins/.builtin.pups
===================================================================
--- trunk/src/plugins/.builtin.pups	(revision 970)
+++ trunk/src/plugins/.builtin.pups	(revision 971)
@@ -1,7 +1,2 @@
-# temporarily, hand written
-io_lihata=io_lihata/io_lihata.pup
-export_animator=export_animator/export_animator.pup
-export_tedax=export_tedax/export_tedax.pup
-std_devmap=std_devmap/std_devmap.pup
-gui=gui/gui.pup
-sch_dialogs=sch_dialogs/sch_dialogs.pup
+# Autogenerated by ./configure - do NOT edit - contains the list of buildins
+
Index: trunk/src/plugins/gui/act.c
===================================================================
--- trunk/src/plugins/gui/act.c	(revision 970)
+++ trunk/src/plugins/gui/act.c	(revision 971)
@@ -28,12 +28,12 @@
 
 #include "config.h"
 
-#include "actions.h"
-#include "compat_misc.h"
-#include "conf.h"
-#include "hidlib_conf.h"
-#include "hid.h"
-#include "hidlib.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/conf.h>
+#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/hid.h>
+#include <librnd/core/hidlib.h>
 
 #include "act.h"
 
Index: trunk/src/plugins/gui/layersel.c
===================================================================
--- trunk/src/plugins/gui/layersel.c	(revision 970)
+++ trunk/src/plugins/gui/layersel.c	(revision 971)
@@ -25,18 +25,18 @@
  *    mailing list: cschem (at) list.repo.hu (send "subscribe")
  */
 
-#include "config.h"
+#include <librnd/config.h>
 
 #include <genvector/vti0.h>
 #include <genvector/vtp0.h>
 
-#include "hid.h"
-#include "hid_cfg.h"
-#include "hid_dad.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_cfg.h>
+#include <librnd/core/hid_dad.h>
 
-#include "actions.h"
-#include "event.h"
-#include "hidlib_conf.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/event.h>
+#include <librnd/core/hidlib_conf.h>
 
 #include <libcschem/concrete.h>
 
Index: trunk/src/plugins/gui/sch_rnd_gui.c
===================================================================
--- trunk/src/plugins/gui/sch_rnd_gui.c	(revision 970)
+++ trunk/src/plugins/gui/sch_rnd_gui.c	(revision 971)
@@ -25,17 +25,17 @@
  *    mailing list: cschem (at) list.repo.hu (send "subscribe")
  */
 
-#include "config.h"
+#include <librnd/core/config.h>
 
 #include <string.h>
 
-#include "event.h"
-#include "actions.h"
-#include "hidlib.h"
-#include "hidlib_conf.h"
-#include "compat_misc.h"
-#include "compat_fs.h"
-#include "globalconst.h"
+#include <librnd/core/event.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/globalconst.h>
 
 #include <libcschem/search.h>
 #include <sch-rnd/draw.h>
Index: trunk/src/plugins/gui/toolbar.h
===================================================================
--- trunk/src/plugins/gui/toolbar.h	(revision 970)
+++ trunk/src/plugins/gui/toolbar.h	(revision 971)
@@ -1,5 +1,5 @@
-#include "event.h"
-#include "conf.h"
+#include <librnd/core/event.h>
+#include <librnd/core/conf.h>
 
 void sch_rnd_toolbar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void sch_rnd_toolbar_change_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
Index: trunk/src/plugins/io_lihata/read.c
===================================================================
--- trunk/src/plugins/io_lihata/read.c	(revision 970)
+++ trunk/src/plugins/io_lihata/read.c	(revision 971)
@@ -36,7 +36,7 @@
 #include <libcschem/cnc_conn.h>
 #include <libcschem/project.h>
 #include <liblihata/dom.h>
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "read.h"
 
 #define error(node, args) \
Index: trunk/src/plugins/sch_dialogs/attribute_dialog.c
===================================================================
--- trunk/src/plugins/sch_dialogs/attribute_dialog.c	(revision 970)
+++ trunk/src/plugins/sch_dialogs/attribute_dialog.c	(revision 971)
@@ -30,14 +30,14 @@
 #include <string.h>
 #include <genht/hash.h>
 
-#include "event.h"
-#include "actions.h"
-#include "hidlib.h"
-#include "hidlib_conf.h"
-#include "hid_dad.h"
-#include "compat_misc.h"
-#include "compat_fs.h"
-#include "globalconst.h"
+#include <librnd/core/event.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/hid_dad.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/globalconst.h>
 
 #include <libcschem/search.h>
 #include <sch-rnd/draw.h>
Index: trunk/src/plugins/sch_dialogs/sch_dialogs.c
===================================================================
--- trunk/src/plugins/sch_dialogs/sch_dialogs.c	(revision 970)
+++ trunk/src/plugins/sch_dialogs/sch_dialogs.c	(revision 971)
@@ -29,13 +29,13 @@
 
 #include <string.h>
 
-#include "event.h"
-#include "actions.h"
-#include "hidlib.h"
-#include "hidlib_conf.h"
-#include "compat_misc.h"
-#include "compat_fs.h"
-#include "globalconst.h"
+#include <librnd/core/event.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/globalconst.h>
 
 #include "attribute_dialog.h"
 
Index: trunk/src/plugins/std_devmap/std_devmap.c
===================================================================
--- trunk/src/plugins/std_devmap/std_devmap.c	(revision 970)
+++ trunk/src/plugins/std_devmap/std_devmap.c	(revision 971)
@@ -40,8 +40,8 @@
 #include <libcschem/library.h>
 #include <libcschem/project.h>
 #include <libcschem/parse_helper.h>
-#include "actions.h"
-#include "compat_misc.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/compat_misc.h>
 
 typedef struct {
 	ldch_ctx_t devmaps;
Index: trunk/src/sch-rnd/tool.h
===================================================================
--- trunk/src/sch-rnd/tool.h	(revision 970)
+++ trunk/src/sch-rnd/tool.h	(revision 971)
@@ -64,7 +64,7 @@
 	void     (*uninit)(void);
 	void     (*press)(pcb_hidlib_t *hl);    /* e.g. left click button press */
 	void     (*release)(pcb_hidlib_t *hl);  /* e.g. left click button release */
-	void     (*adjust_attached_objects)(pcb_hidlib_t *hl); /* update the objects for prediction graphics */
+	void     (*adjust_attached)(pcb_hidlib_t *hl); /* update the objects for prediction graphics */
 	void     (*draw_attached)(pcb_hidlib_t *hl); /* redraw the prediction graphics */
 	pcb_bool (*undo_act)(pcb_hidlib_t *hl);
 	pcb_bool (*redo_act)(pcb_hidlib_t *hl);