Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 702)
+++ trunk/scconfig/Rev.h	(revision 703)
@@ -1 +1 @@
-static const int myrev = 697;
+static const int myrev = 703;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 702)
+++ trunk/scconfig/Rev.tab	(revision 703)
@@ -1,3 +1,4 @@
+703	configure	get rid of ttf support in favor of librnd vector font
 697	configure	./configure shouldn't detect librnd as it depends on librnd
 678	configure	link against librnd-font
 611	configure	BINDIR in config.h
Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 702)
+++ trunk/scconfig/hooks.c	(revision 703)
@@ -62,7 +62,7 @@
 		return 1;
 	}
 	if (strcmp(key, "fontdir") == 0) {
-		fprintf(stderr, "WARNING: --fontdir is ignored -camv-rnd doesn't need it, please use runtime configuration\n");
+		fprintf(stderr, "WARNING: --fontdir is ignored -camv-rnd doesn't need it; it uses an embedded vector font\n");
 		return 1;
 	}
 
@@ -146,8 +146,6 @@
 
 	require("sys/types/size/4_u_int", 0, 1);
 
-	require("libs/sul/freetype2/*", 0, 1);
-
 	/* byaccic - are we able to regenerate languages? */
 	if (istrue(get("/local/camv/want_byaccic"))) {
 		require("parsgen/byaccic/*", 0, 0);
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 702)
+++ trunk/src/Makefile.dep	(revision 703)
@@ -148,7 +148,7 @@
  obj_any.h data.h obj_arc.h obj_line.h obj_poly.h obj_grp.h conf_core.h \
  geo.h ../src_3rd/opc89.h ../src_3rd/gengeo2d/common.h \
  ../src_3rd/gengeo2d/box.h ../src_3rd/gengeo2d/prim.h \
- ../src_3rd/gengeo2d/vect.h ../src_3rd/ttf2bbox/ttf2bbox.h
+ ../src_3rd/gengeo2d/vect.h
 plug_io.o: plug_io.c plug_io.h data.h camv_typedefs.h rtree.h
 plug_io_act.o: plug_io_act.c config.h ../config.h event.h data.h \
  camv_typedefs.h rtree.h plug_io.h plug_io_act.h
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 702)
+++ trunk/src/Makefile.in	(revision 703)
@@ -29,9 +29,8 @@
  build_run.o
 @]
 
+# e.g.$(ROOT)/src_3rd/ttf2bbox/ttf_map.o
 put /local/camv/LIBS_3RD [@
-	$(ROOT)/src_3rd/ttf2bbox/ttf_map.o
-	$(ROOT)/src_3rd/ttf2bbox/ttf2bbox.o
 @]
 
 uniq /local/camv/LIBS_3RD
@@ -89,13 +88,13 @@
 
 RNDLIB_LDLIBS = -lrnd-hid -lrnd-poly -lrnd-font -lrnd-core -lrnd-3rd
 CC=@cc/cc@
-CFLAGS=@/local/camv/CFLAGS@ @?/local/rnd/CFLAGS@ $(CFLAGS_LIBRND) @libs/sul/freetype2/cflags@
+CFLAGS=@/local/camv/CFLAGS@ @?/local/rnd/CFLAGS@ $(CFLAGS_LIBRND)
 C89FLAGS=$(CFLAGS)
 CP=cp
 MKDIR=mkdir -p
 LDFLAGS=@/local/camv/LDFLAGS@ @?/local/rnd/LDFLAGS@ $(LDFLAGS_LIBRND)
 OBJS = @/local/camv/OBJS@
-LDLIBS=$(RNDLIB_LDLIBS) $(LDFLAGS_LIBRND_FUNGW) @libs/sul/freetype2/ldflags@ @libs/ldl@ -lm
+LDLIBS=$(RNDLIB_LDLIBS) $(LDFLAGS_LIBRND_FUNGW) @libs/ldl@ -lm
 PLUGDIR=../src_plugins
 PLUGIDIR=./plugins
 
@@ -137,9 +136,6 @@
 
 ### src_3rd explicit rules ###
 
-$(ROOT)/src_3rd/ttf2bbox/ttf_map.o $(ROOT)/src_3rd/ttf2bbox/ttf2bbox.o:
-	cd $(ROOT)/src_3rd/ttf2bbox && $(MAKE) ttf_map.o ttf2bbox.o "CC=$(CC)" "CFLAGS=$(CFLAGS)"
-
 ### misc ###
 map_plugins:
 	cd ../src_plugins && ./map_plugins.sh
@@ -146,7 +142,6 @@
 
 clean:
 	-rm $(OBJS) camv-rnd @/local/rnd/CLEANFILES@
-	-cd $(ROOT)/src_3rd/ttf2bbox && make clean
 
 distclean: clean
 	-rm buildin.c conf_core_fields.h ../plugins/.builtin.pups Makefile conf_internal.c
@@ -179,7 +174,7 @@
 
 put /local/dep/OUTFN {../src/Makefile.depgen}
 put /local/dep/SRCS /local/camv/OBJS
-put /local/dep/CFLAGS [@@/local/camv/CFLAGS@ -I@/local/camv/librnd_prefix@/include/librnd/src_3rd @libs/sul/freetype2/cflags@@]
+put /local/dep/CFLAGS [@@/local/camv/CFLAGS@ -I@/local/camv/librnd_prefix@/include/librnd/src_3rd@]
 gsub /local/dep/SRCS {.o } {.c }
 include [@@/local/camv/librnd_template@/cdep.tmpasm@]
 
Index: trunk/src_3rd
===================================================================
--- trunk/src_3rd	(revision 702)
+++ trunk/src_3rd	(revision 703)

Property changes on: trunk/src_3rd
___________________________________________________________________
Modified: svn:externals
## -1,3 +1,2 ##
-ttf2bbox svn://repo.hu/ttf2bbox/trunk/src
 gengeo2d svn://repo.hu/gengeo2d/trunk/gengeo2d