Index: trunk/INSTALL
===================================================================
--- trunk/INSTALL	(revision 36969)
+++ trunk/INSTALL	(revision 36970)
@@ -12,7 +12,7 @@
 For users:
  - mandatory: C compiler
  - mandatory: make (BSD make won't work)
- - mandatory: librnd >=3.2.0 installed
+ - mandatory: librnd >=4.0.0 installed
               Get it at: see http://www.repo.hu/projects/librnd
               Standard: install librnd in /usr/local or /usr
               Non-standard installation: doc/INSTALL.librnd.txt
Index: trunk/Makefile.conf.in
===================================================================
--- trunk/Makefile.conf.in	(revision 36969)
+++ trunk/Makefile.conf.in	(revision 36970)
@@ -38,6 +38,6 @@
 
 # Where librnd is installed, full path to the .mak file to auto-setup
 LIBRND_PREFIX=@/local/pcb/librnd_prefix@
-LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd3/librnd.mak
+LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd4/librnd.mak
 
 @]
Index: trunk/configure
===================================================================
--- trunk/configure	(revision 36969)
+++ trunk/configure	(revision 36970)
@@ -4,7 +4,7 @@
 then
 	for P in /usr/local /opt/librnd /usr $HOME/usr
 	do
-		if test -e "$P/include/librnd/core/config.h"
+		if test -e "$P/include/librnd4/librnd/core/config.h"
 		then
 			LIBRND_PREFIX="$P"
 			break
@@ -30,7 +30,7 @@
 		;;
 	/usr/include) ;;
 	/usr/local/include) ;;
-	*) LIBRND_EXTRA_INCLUDE="$LIBRND_PREFIX/include"
+	*) LIBRND_EXTRA_INCLUDE="$LIBRND_PREFIX/include/librnd4"
 esac
 
 
Index: trunk/scconfig/Makefile
===================================================================
--- trunk/scconfig/Makefile	(revision 36969)
+++ trunk/scconfig/Makefile	(revision 36970)
@@ -85,12 +85,12 @@
 menucfg.o: menucfg.c
 	$(CC) -c $(CFLAGS) -o menucfg.o menucfg.c
 
-LIBRNDSCC=$(LIBRND_PREFIX)/include/librnd/scconfig
+LIBRNDSCC=$(LIBRND_PREFIX)/include/librnd4/librnd/scconfig
 RNDHOOKS=$(LIBRNDSCC)/plugin_3state.h $(LIBRNDSCC)/hooks_common.h
 
-hooks.o: hooks.c $(RNDHOOKS) plugins.h Rev.h $(LIBRND_PREFIX)/include/librnd/scconfig
+hooks.o: hooks.c $(RNDHOOKS) plugins.h Rev.h $(LIBRND_PREFIX)/include/librnd4/librnd/scconfig
 
-librnd_ver.o: librnd_ver.c $(LIBRND_PREFIX)/include/librnd/config.h
+librnd_ver.o: librnd_ver.c $(LIBRND_PREFIX)/include/librnd4/librnd/config.h
 	$(CC) -c $(CFLAGS) -o librnd_ver.o librnd_ver.c
 
 $(BIN)/util/arg_auto_set.o: $(SRC)/util/arg_auto_set.c $(SRC)/util/arg_auto_set.h
Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 36969)
+++ trunk/scconfig/hooks.c	(revision 36970)
@@ -13,8 +13,8 @@
 
 #define version "3.1.0-dev"
 
-#define REQ_LIBRND_MAJOR 3
-#define REQ_LIBRND_MINOR 2
+#define REQ_LIBRND_MAJOR 4
+#define REQ_LIBRND_MINOR 0
 
 #define TOSTR_(x) #x
 #define TOSTR(x) TOSTR_(x)
@@ -118,7 +118,7 @@
 	char *tmp;
 	const char *libad;
 
-	put("/local/pcb/librnd_template", tmp = str_concat("", TO_STR(LIBRND_PREFIX), "/", get("/local/libarchdir"), "/librnd3/scconfig/template", NULL));
+	put("/local/pcb/librnd_template", tmp = str_concat("", TO_STR(LIBRND_PREFIX), "/", get("/local/libarchdir"), "/librnd4/scconfig/template", NULL));
 	free(tmp);
 
 	/* if librnd is installed at some custom path, we'll need to have a -I on CFLAGS and -L on LDFLAGS */
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 36969)
+++ trunk/src/Makefile.in	(revision 36970)
@@ -1,4 +1,4 @@
-append /local/pcb/CFLAGS [@-I. -I.. -I@/local/pcb/librnd_prefix@/include/librnd/src_3rd @?/local/pcb/librnd_extra_inc@ -I../src_3rd -I../src -I../src_3rd/liblihata @]
+append /local/pcb/CFLAGS [@-I. -I.. -I@/local/pcb/librnd_prefix@/include/librnd4 -I@/local/pcb/librnd_prefix@/include/librnd4/librnd/src_3rd @?/local/pcb/librnd_extra_inc@ -I../src_3rd -I../src -I../src_3rd/liblihata @]
 append /local/pcb/LDFLAGS [@@?/local/pcb/librnd_extra_ldf@@]
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS cc/rdynamic
@@ -17,7 +17,7 @@
 then
 	put /local/pcb/librnd_extra_mak [@
 # static librd link: need to get all librnd ldlibs
-include $(LIBRND_PREFIX)/share/librnd3/librnd.mak
+include $(LIBRND_PREFIX)/share/librnd4/librnd.mak
 @]
 	put /local/pcb/librnd_extra_ldlibs {$(LDFLAGS_LIBRND)}
 else
@@ -245,7 +245,7 @@
 # librnd installation
 LIBRND_PREFIX=@/local/pcb/librnd_prefix@
 @/local/pcb/librnd_extra_mak@
-LIBRND_LIBDIR=$(LIBRND_PREFIX)/@/local/libarchdir@/librnd3
+LIBRND_LIBDIR=$(LIBRND_PREFIX)/@/local/libarchdir@/librnd4
 LIBRND_L=$(LIBRND_PREFIX)/@/local/libarchdir@
 LIBRND_PLUGDIR=$(LIBRND_LIBDIR)/plugins
 
Index: trunk/util/bxl2txt/Makefile.in
===================================================================
--- trunk/util/bxl2txt/Makefile.in	(revision 36969)
+++ trunk/util/bxl2txt/Makefile.in	(revision 36970)
@@ -3,7 +3,7 @@
 ROOT=../..
 PLUGDIR=$(ROOT)/src_plugins
 LIBRND_LIBDIR=@/local/pcb/librnd_prefix@/lib/librnd
-LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd3
+LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd4
 PLUG=$(PLUGDIR)/io_bxl
 CFLAGS = @/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @?/local/pcb/librnd_extra_inc@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(ROOT)/src_3rd
 LDFLAGS = @/local/pcb/LDFLAGS@
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 36969)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 36970)
@@ -1,5 +1,5 @@
 put /local/pcb/CFLAGS cc/cflags
-append /local/pcb/CFLAGS [@-I../.. -I@/local/pcb/librnd_prefix@/include/librnd/src_3rd -I../../src_3rd -I../../src -I../../src_3rd/liblihata @]
+append /local/pcb/CFLAGS [@-I../.. -I@/local/pcb/librnd_prefix@/include/librnd4 -I@/local/pcb/librnd_prefix@/include/librnd4/librnd/src_3rd -I../../src_3rd -I../../src -I../../src_3rd/liblihata @]
 append /local/pcb/CFLAGS {-DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS ?/target/libs/ldl
@@ -9,8 +9,8 @@
 ROOT=../..
 PLUGDIR=../../src_plugins
 LIBRND_LIBDIR=@/local/pcb/librnd_prefix@/lib/librnd
-LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd3
-GENCONF=$(LIBRND_LIBDIR)/librnd3/scconfig/gen_conf.sh
+LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd4
+GENCONF=$(LIBRND_LIBDIR)/librnd4/scconfig/gen_conf.sh
 
 include $(LIBRND_SHAREDIR)/librnd.mak