diff --git a/src/sbbs3/install/sbbsinst.c b/src/sbbs3/install/sbbsinst.c index c3000f1c95ece62320a1e81229988172f98498ae..c397abe68cefb8b3dec9c7c843ea895668056f9c 100644 --- a/src/sbbs3/install/sbbsinst.c +++ b/src/sbbs3/install/sbbsinst.c @@ -72,11 +72,8 @@ #endif char *distlists[]={ - "http://www.synchro.net/sbbsdist.lst" - ,"http://rob.synchro.net/sbbsdist.lst" - ,"http://cvs.synchro.net/sbbsdist.lst" - ,"http://bbs.synchro.net/sbbsdist.lst" - ,"http://freebsd.synchro.net/sbbsdist.lst" + "http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/sbbs3/install/sbbsdist.lst?rev=HEAD&content-type=text/plain" + "http://cvs-mirror.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/sbbs3/install/sbbsdist.lst?rev=HEAD&content-type=text/plain" ,NULL /* terminator */ }; @@ -124,7 +121,9 @@ struct { struct utsname name; char sbbsuser[9]; /* Historical UName limit of 8 chars */ char sbbsgroup[17]; /* Can't find historical limit for group names */ - BOOL useX; +#ifdef __linux__ + BOOL use_dosemu; +#endif } params; /* Build parameters */ #define MAKEFILE "/tmp/SBBSmakefile" @@ -231,7 +230,9 @@ int main(int argc, char **argv) SAFECOPY(params.sbbsuser,p); if((p=getenv("GROUP"))!=NULL) SAFECOPY(params.sbbsgroup,p); - params.useX=FALSE; +#ifdef __linux__ + params.use_dosemu=FALSE; +#endif sscanf("$Revision$", "%*s %s", revision); umask(077); @@ -380,8 +381,8 @@ int main(int argc, char **argv) sprintf(mopt[i++],"%-27.27s%s","Make Command-line",params.make_cmdline); sprintf(mopt[i++],"%-27.27s%s","File Owner",params.sbbsuser); sprintf(mopt[i++],"%-27.27s%s","File Group",params.sbbsgroup); -#if 0 /* this won't work until we get the FTLK source in CVS */ - sprintf(mopt[i++],"%-27.27s%s","Include X/FLTK Support",params.useX?"Yes":"No"); +#ifdef __linux__ + sprintf(mopt[i++],"%-27.27s%s","Integrate DOSEmu support",params.use_dosemu?"Yes":"No"); #endif sprintf(mopt[i++],"%-27.27s","Start Installation..."); mopt[i][0]=0; @@ -488,24 +489,26 @@ int main(int argc, char **argv) "\n"; uifc.input(WIN_MID,0,0,"",params.sbbsgroup,32,K_EDIT); break; -#if 0 +#ifdef __linux__ case 11: strcpy(opt[0],"Yes"); strcpy(opt[1],"No"); opt[2][0]=0; - i=params.useX?0:1; - uifc.helpbuf= "`Include X Support`\n" + i=params.use_dosemu?0:1; + uifc.helpbuf= "`Include DOSEmu Support`\n" "\nToDo: Add help."; i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&i,0 - ,"Build GUI Versions of scfg and echocfg",opt); + ,"Integrate DOSEmu support into Synchronet?",opt); if(!i) - params.useX=TRUE; + params.use_dosemu=TRUE; else if(i==1) - params.useX=FALSE; + params.use_dosemu=FALSE; i=0; break; -#endif + case 12: +#else case 11: +#endif install_sbbs(distlist[dist],distlist[dist]->type==LOCAL_FILE?NULL:distlist[dist]->servers[server]); bail(0); break; @@ -752,9 +755,11 @@ void install_sbbs(dist_t *dist,struct server_ent_t *server) { sprintf(sbbsgroup,"SBBSGROUP=%s",params.sbbsgroup); putenv(sbbsgroup); } - if(params.useX==TRUE) { - putenv("MKFLAGS=USE_FLTK=1"); +#ifdef __linux__ + if(params.use_dosemu==TRUE) { + putenv("USE_DOSEMU=1"); } +#endif if(params.usebcc) putenv("bcc=1");