Index: trunk/scconfig/plugins.h
===================================================================
--- trunk/scconfig/plugins.h	(revision 29468)
+++ trunk/scconfig/plugins.h	(revision 29469)
@@ -84,7 +84,7 @@
 plugin_def("import_netlist",   "import netlist",                  sbuildin, 1, 0)
 plugin_def("import_pxm_gd",    "import pixmaps from png/gif/jpg", sbuildin, 1, 0)
 plugin_def("import_pxm_pnm",   "import pixmaps from pnm ",        sbuildin, 1, 0)
-plugin_def("import_sch2",      "import sch v2",                   sdisable, 1, 0)
+plugin_def("import_sch2",      "import sch v2",                   sbuildin, 1, 0)
 plugin_def("import_sch",       "import sch v1",                   sbuildin, 1, 0)
 plugin_def("import_tinycad",   "import tinycad .net",             sbuildin, 1, 0)
 plugin_def("import_ttf",       "import ttf glyphs",               sbuildin, 1, 0)
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 29468)
+++ trunk/src/Makefile.dep	(revision 29469)
@@ -3766,9 +3766,9 @@
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h librnd/core/paths.h \
  librnd/core/compat_fs.h remove.h librnd/core/actions.h \
- ../src_plugins/import_sch/import_sch_conf.h librnd/core/compat_misc.h \
+ ../src_plugins/import_sch2/import_sch_conf.h librnd/core/compat_misc.h \
  obj_rat.h librnd/core/safe_fs.h librnd/core/hid_init.h \
- ../src_plugins/import_sch/import_sch_conf_fields.h
+ ../src_plugins/import_sch2/import_sch_conf_fields.h
 ../src_plugins/import_sch2/import_sch.o: \
  ../src_plugins/import_sch2/import_sch.c ../config.h librnd/config.h \
  librnd/core/error.h librnd/core/global_typedefs.h librnd/core/pcb_bool.h \
Index: trunk/src_plugins/import_sch/import_sch_conf.h
===================================================================
--- trunk/src_plugins/import_sch/import_sch_conf.h	(revision 29468)
+++ trunk/src_plugins/import_sch/import_sch_conf.h	(nonexistent)
@@ -1,16 +0,0 @@
-#ifndef PCB_IMPORT_SCH_CONF_H
-#define PCB_IMPORT_SCH_CONF_H
-
-#include <librnd/core/conf.h>
-
-typedef struct {
-	const struct {
-		const struct {
-			CFT_STRING gnetlist_program;       /* gnetlist program name */
-			CFT_STRING make_program;           /* make program name */
-			CFT_BOOLEAN verbose;                  /* verbose logging of the import code */
-		} import_sch;
-	} plugins;
-} conf_import_sch_t;
-
-#endif
Index: trunk/src_plugins/import_sch/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_sch/Plug.tmpasm	(revision 29468)
+++ trunk/src_plugins/import_sch/Plug.tmpasm	(revision 29469)
@@ -1,6 +1,5 @@
 put /local/pcb/mod {import_sch}
 put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_sch/import_sch.o @]
-put /local/pcb/mod/CONF {$(PLUGDIR)/import_sch/import_sch_conf.h}
 
 switch /local/pcb/import_sch/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
Index: trunk/src_plugins/import_sch/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch/import_sch.c	(revision 29468)
+++ trunk/src_plugins/import_sch/import_sch.c	(revision 29469)
@@ -46,7 +46,7 @@
 #include <librnd/core/pcb-printf.h>
 #include "remove.h"
 #include <librnd/core/actions.h>
-#include "import_sch_conf.h"
+#include "../src_plugins/import_sch2/import_sch_conf.h"
 #include <librnd/core/misc_util.h>
 #include <librnd/core/compat_misc.h>
 #include "obj_rat.h"
@@ -397,7 +397,7 @@
 	PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie)
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	pcb_conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags);
-#include "import_sch_conf_fields.h"
+#include "../src_plugins/import_sch2/import_sch_conf_fields.h"
 
 	/* Compatibility: get some settings from the env */
 	tmp = getenv ("PCB_MAKE_PROGRAM");
Index: trunk/src_plugins/import_sch/import_sch.pup
===================================================================
--- trunk/src_plugins/import_sch/import_sch.pup	(revision 29468)
+++ trunk/src_plugins/import_sch/import_sch.pup	(revision 29469)
@@ -6,5 +6,6 @@
 $fmt-feature-r import netlist and footprint info from gEDA schematics using gnetlist
 $fmt-feature-r import netlist and footprint produced by an external command
 $package import-net
+$dep import_sch2
 default buildin
 autoload 1
Index: trunk/src_plugins/import_sch2/import_sch2.pup
===================================================================
--- trunk/src_plugins/import_sch2/import_sch2.pup	(revision 29468)
+++ trunk/src_plugins/import_sch2/import_sch2.pup	(revision 29469)
@@ -5,5 +5,5 @@
 $fmt-native no
 $fmt-feature-r import netlist and footprint info from schematics or netlist
 $package import-net
-default disable
+default buildin
 autoload 1
Index: trunk/src_plugins/import_sch2/import_sch_conf.h
===================================================================
--- trunk/src_plugins/import_sch2/import_sch_conf.h	(revision 29468)
+++ trunk/src_plugins/import_sch2/import_sch_conf.h	(revision 29469)
@@ -1,5 +1,5 @@
-#ifndef PCB_IMPORT_SCH2_CONF_H
-#define PCB_IMPORT_SCH2_CONF_H
+#ifndef PCB_IMPORT_SCH_CONF_H
+#define PCB_IMPORT_SCH_CONF_H
 
 #include <librnd/core/conf.h>
 
@@ -8,6 +8,10 @@
 		const struct {
 			CFT_STRING import_fmt;          /* name of the input format */
 			CFT_BOOLEAN verbose;            /* verbose logging of the import code */
+
+			/* obsolete: temporary compatibility with import_sch for the transition period */
+			CFT_STRING gnetlist_program;       /* DEPRECATED: gnetlist program name */
+			CFT_STRING make_program;           /* DEPRECATED: make program name */
 		} import_sch;
 	} plugins;
 } conf_import_sch_t;