Index: trunk/scconfig/find_fontdir.c =================================================================== --- trunk/scconfig/find_fontdir.c (revision 674) +++ 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 674) +++ trunk/scconfig/Makefile (revision 675) @@ -90,7 +90,7 @@ LIBRNDSCC=$(LIBRND_PREFIX)/include/librnd4/librnd/scconfig RNDHOOKS=$(LIBRNDSCC)/plugin_3state.h $(LIBRNDSCC)/hooks_common.h -hooks.o: $(RNDHOOKS) plugins.h $(LIBRND_PREFIX)/include/librnd4/librnd/scconfig Rev.h find_fontdir.c +hooks.o: $(RNDHOOKS) plugins.h $(LIBRND_PREFIX)/include/librnd4/librnd/scconfig Rev.h librnd_ver.o: librnd_ver.c $(LIBRND_PREFIX)/include/librnd4/librnd/config.h $(CC) -c $(CFLAGS) -o librnd_ver.o librnd_ver.c Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 674) +++ trunk/scconfig/hooks.c (revision 675) @@ -48,7 +48,6 @@ { rnd_help1("camv-rnd"); printf(" --dot_camv_rnd=path .camv-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 @@ -63,8 +62,7 @@ return 1; } if (strcmp(key, "fontdir") == 0) { - need_value("use --fontdir=path"); - put("/local/camv/fontdir", value); + fprintf(stderr, "WARNING: --fontdir is ignored -camv-rnd doesn't need it, please use runtime configuration\n"); return 1; } @@ -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() { @@ -167,9 +163,6 @@ put("/local/camv/want_parsgen_byaccic", sfalse); } - if (find_fontdir() != 0) - return 1; - return 0; } @@ -215,7 +208,6 @@ print_sum_cfg_val("/local/prefix", "installation prefix (--prefix)"); print_sum_cfg_val("/local/confdir", "configuration directory (--confdir)"); print_sum_cfg_val("/local/camv/dot_camv_rnd", ".camv_rnd config dir under $HOME"); - print_sum_cfg_val("/local/camv/fontdir", "system font dir"); #undef plugin_def #undef plugin_header