diff --git a/src/sbbs3/install/sbbsinst.c b/src/sbbs3/install/sbbsinst.c index 82addbb0d5435a82dc8d669f6d283a390b077ee3..b33eeea3f85fe298a3dccf5384450a94e1518f88 100644 --- a/src/sbbs3/install/sbbsinst.c +++ b/src/sbbs3/install/sbbsinst.c @@ -111,6 +111,7 @@ 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; } params; /* Build parameters */ #define MAKEFILE "/tmp/SBBSmakefile" @@ -185,6 +186,7 @@ int main(int argc, char **argv) SAFECOPY(params.sbbsuser,p); if((p=getenv("GROUP"))!=NULL) SAFECOPY(params.sbbsgroup,p); + params.useX=TRUE; printf("\r\nSynchronet Installation Utility (%s) v%s Copyright 2003 " "Rob Swindell\r\n",PLATFORM_DESC,VERSION); @@ -304,6 +306,7 @@ 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); + sprintf(mopt[i++],"%-27.27s%s","Include X Support",params.useX?"Yes":"No"); sprintf(mopt[i++],"%-27.27s","Start Installation..."); mopt[i][0]=0; @@ -409,6 +412,21 @@ int main(int argc, char **argv) uifc.input(WIN_MID,0,0,"",params.sbbsgroup,32,K_EDIT); break; 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" + "\nToDo: Add help."; + i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&i,0 + ,"Build GUI Versions of scfg and echocfg",opt); + if(!i) + params.useX=TRUE; + else if(i==1) + params.useX=FALSE; + i=0; + break; + case 12: install_sbbs(distlist[dist],distlist[dist]->type==LOCAL_FILE?NULL:distlist[dist]->servers[server]); bail(0); break; @@ -480,6 +498,9 @@ 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"); + } if(params.usebcc) putenv("bcc=1");