Index: trunk/scconfig/find_fontdir.c =================================================================== --- trunk/scconfig/find_fontdir.c (revision 5156) +++ trunk/scconfig/find_fontdir.c (nonexistent) @@ -1,29 +0,0 @@ -static const char *font_dirs[] = { - "/usr/share/fonts/truetype", - "/usr/share/fonts", - "/usr/local/share/fonts/truetype", - "/usr/local/share/fonts", - NULL -}; - -int find_fontdir(void) -{ - const char **d, *ud; - - ud = get("/local/csch/fontdir"); - if ((ud != NULL) && (*ud != '\0')) { - report("Accepting system font dir (user specified): '%s'\n", ud); - return 0; - } - - report("Detecting system font dir..."); - for(d = font_dirs; *d != NULL; d++) { - if (is_dir(*d)) { - put("/local/csch/fontdir", *d); - report("'%s'\n", *d); - return 0; - } - } - report("NOT FOUND!\nPlease specify one with --fontdir\n"); - return 1; -} Index: trunk/scconfig/Makefile =================================================================== --- trunk/scconfig/Makefile (revision 5156) +++ trunk/scconfig/Makefile (revision 5157) @@ -90,7 +90,7 @@ LIBRNDSCC=$(LIBRND_PREFIX)/include/librnd/scconfig RNDHOOKS=$(LIBRNDSCC)/plugin_3state.h $(LIBRNDSCC)/hooks_common.h -hooks.o: $(RNDHOOKS) plugins.h $(LIBRND_PREFIX)/include/librnd/scconfig Rev.h find_fontdir.c +hooks.o: $(RNDHOOKS) plugins.h $(LIBRND_PREFIX)/include/librnd/scconfig Rev.h librnd_ver.o: librnd_ver.c $(LIBRND_PREFIX)/include/librnd/config.h $(CC) -c $(CFLAGS) -o librnd_ver.o librnd_ver.c Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 5156) +++ trunk/scconfig/hooks.c (revision 5157) @@ -50,7 +50,6 @@ { rnd_help1("sch-rnd"); printf(" --dot_sch_rnd=path .sch-rnd config path under $HOME/\n"); - printf(" --fontdir=path system font dir that hosts ttf files\n"); } /* Runs when a custom command line argument is found @@ -65,8 +64,7 @@ return 1; } if (strcmp(key, "fontdir") == 0) { - need_value("use --fontdir=path"); - put("/local/csch/fontdir", value); + fprintf(stderr, "*** WARNING ***\n *** --fontdir is obsolete, please remove it from your command line!\n\n"); return 1; } /* if (strcmp(key, "debug") == 0) { @@ -131,8 +129,6 @@ return rnd_hook_detect_host(); } -#include "find_fontdir.c" - /* Runs when things should be detected for the target system */ int hook_detect_target() { @@ -152,7 +148,6 @@ require("sys/types/size/4_u_int", 0, 1); require("libs/sul/librnd-hid/*", 0, 1); - require("libs/sul/freetype2/*", 0, 1); /* yacc/lex - are we able to regenerate languages? */ if (istrue(get("/local/csch/want_bison"))) { @@ -194,9 +189,6 @@ else put("/local/csch/want_libxml2", sfalse); - if (find_fontdir() != 0) - return 1; - return 0; } @@ -243,7 +235,6 @@ print_sum_cfg_val("/local/prefix", "installation prefix (--prefix)"); print_sum_cfg_val("/local/confdir", "configuration directory (--confdir)"); print_sum_cfg_val("/local/csch/dot_sch_rnd", ".sch_rnd config dir under $HOME"); - print_sum_cfg_val("/local/csch/fontdir", "system font dir"); #undef plugin_def #undef plugin_header Index: trunk/src/libcschem/config.h.in =================================================================== --- trunk/src/libcschem/config.h.in (revision 5156) +++ trunk/src/libcschem/config.h.in (revision 5157) @@ -39,9 +39,6 @@ as ~/DOT_SCH_RND/ */ #define DOT_SCH_RND "@/local/csch/dot_sch_rnd@" -/* system font dir, as detected by scconfig */ -#define CSCH_SYSTEM_FONT_DIR "@/local/csch/fontdir@" - /* Version number of package */ #define CSCH_VERSION "@/local/version@" #define CSCH_REVISION "@/local/revision@" Index: trunk/src/sch-rnd/Makefile.dep =================================================================== --- trunk/src/sch-rnd/Makefile.dep (revision 5156) +++ trunk/src/sch-rnd/Makefile.dep (revision 5157) @@ -790,8 +790,8 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/cnc_text.h ../libcschem/cnc_text_dyn.h \ - ../libcschem/rotate.h ../../src_3rd/ttf2bbox/ttf_map.h \ - ../../src_3rd/ttf2bbox/ttf2bbox.h conf_core.h draw.h font.h \ + ../libcschem/rotate.h \ + conf_core.h draw.h font.h \ font_rnd.c ../../src_3rd/rnd_inclib/font/font.h \ ../../src_3rd/rnd_inclib/font/glyph.h \ ../../src_3rd/rnd_inclib/font/vtgla.h font_internal.c \ Index: trunk/src/sch-rnd/Makefile.in =================================================================== --- trunk/src/sch-rnd/Makefile.in (revision 5156) +++ trunk/src/sch-rnd/Makefile.in (revision 5157) @@ -39,8 +39,6 @@ $(ROOT)/src_3rd/libuundo/uundo.o $(ROOT)/src_3rd/libuundo/uundo_debug.o $(ROOT)/src_3rd/load_cache/load_cache.o - $(ROOT)/src_3rd/ttf2bbox/ttf_map.o - $(ROOT)/src_3rd/ttf2bbox/ttf2bbox.o $(ROOT)/src_3rd/rnd_inclib/font/font.o $(ROOT)/src_3rd/rnd_inclib/font/vtgla.o $(ROOT)/src_3rd/rnd_inclib/font/xform_mx.o @@ -107,13 +105,13 @@ RNDLIB_LDLIBS = -lrnd-poly -lrnd-hid -lrnd-3rd ROOT=@/local/csch/root@ CC=@cc/cc@ -CFLAGS=@/local/csch/CFLAGS@ @?/local/pcb/CFLAGS@ $(CFLAGS_LIBRND) @libs/sul/freetype2/cflags@ +CFLAGS=@/local/csch/CFLAGS@ @?/local/pcb/CFLAGS@ $(CFLAGS_LIBRND) C89FLAGS=$(CFLAGS) CP=cp MKDIR=mkdir -p LDFLAGS=@/local/csch/LDFLAGS@ @?/local/pcb/LDFLAGS@ $(LDFLAGS_LIBRND) OBJS = @/local/csch/OBJS@ -LDLIBS=$(RNDLIB_LDLIBS) $(LDFLAGS_LIBRND_FUNGW) @libs/sul/freetype2/ldflags@ @libs/ldl@ -lm +LDLIBS=$(RNDLIB_LDLIBS) $(LDFLAGS_LIBRND_FUNGW) @libs/ldl@ -lm PLUGDIR=../plugins PLUGIDIR=./plugins @@ -173,9 +171,6 @@ $(ROOT)/src_3rd/load_cache/load_cache.o: cd $(ROOT)/src_3rd/load_cache && $(MAKE) load_cache.o "CC=$(CC)" "CFLAGS=$(CFLAGS)" -$(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 ../plugins && ./map_plugins.sh @@ -185,7 +180,6 @@ -cd $(ROOT)/src_3rd/libminuid && make clean -cd $(ROOT)/src_3rd/libuundo && make clean -cd $(ROOT)/src_3rd/load_cache && make clean - -cd $(ROOT)/src_3rd/ttf2bbox && make clean distclean: clean -rm buildin.c conf_core_fields.h ../plugins/.builtin.pups Makefile defsheet_internal.c conf_internal.c @@ -217,7 +211,7 @@ put /local/dep/OUTFN {../src/sch-rnd/Makefile.depgen} put /local/dep/SRCS /local/csch/OBJS -put /local/dep/CFLAGS [@@/local/csch/CFLAGS@ @libs/sul/freetype2/cflags@@] +put /local/dep/CFLAGS /local/csch/CFLAGS gsub /local/dep/SRCS {.o } {.c } include {../scconfig/template/cdep.tmpasm} Index: trunk/src/sch-rnd/conf_core.c =================================================================== --- trunk/src/sch-rnd/conf_core.c (revision 5156) +++ trunk/src/sch-rnd/conf_core.c (revision 5157) @@ -68,7 +68,6 @@ rnd_conf_force_set_str(conf_core.rc.path.lib, SCHLIBDIR); rnd_conf_ro("rc/path/lib"); rnd_conf_force_set_str(conf_core.rc.path.bin, BINDIR); rnd_conf_ro("rc/path/bin"); rnd_conf_force_set_str(conf_core.rc.path.share, SCHSHAREDIR); rnd_conf_ro("rc/path/share"); - rnd_conf_force_set_str(conf_core.rc.path.fontdir, CSCH_SYSTEM_FONT_DIR); rnd_conf_ro("rc/path/fontdir"); } Index: trunk/src/sch-rnd/conf_core.h =================================================================== --- trunk/src/sch-rnd/conf_core.h (revision 5156) +++ trunk/src/sch-rnd/conf_core.h (revision 5157) @@ -34,7 +34,7 @@ RND_CFT_STRING lib; /* e.g. /usr/lib/sch-rnd */ RND_CFT_STRING bin; /* e.g. /usr/bin */ RND_CFT_STRING share; /* e.g. /usr/share/sch-rnd */ - RND_CFT_STRING fontdir; /* where to look for fonts (e.g. for text objects) */ + RND_CFT_STRING fontdir; /* rnd fonts are searched in these dirs */ RND_CFT_STRING design; /* directory path of the current design, or if the current design doesn't have a file name yet */ } path; Index: trunk/src/sch-rnd/font.c =================================================================== --- trunk/src/sch-rnd/font.c (revision 5156) +++ trunk/src/sch-rnd/font.c (revision 5157) @@ -45,8 +45,6 @@ #include #include #include -#include -#include #include "conf_core.h" #include "draw.h" Index: trunk/src_3rd =================================================================== --- trunk/src_3rd (revision 5156) +++ trunk/src_3rd (revision 5157) Property changes on: trunk/src_3rd ___________________________________________________________________ Modified: svn:externals ## -1,6 +1,5 ## libminuid svn://svn.repo.hu/libminuid/trunk/libminuid gengeo2d svn://svn.repo.hu/gengeo2d/trunk/gengeo2d libuundo svn://svn.repo.hu/libuundo/trunk/libuundo -ttf2bbox svn://svn.repo.hu/ttf2bbox/trunk/src rnd_inclib svn://svn.repo.hu/pcb-rnd/trunk/src_3rd/rnd_inclib