diff options
author | jhb <jhb@FreeBSD.org> | 2002-11-27 18:36:30 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2002-11-27 18:36:30 +0000 |
commit | 6880dc45b681e98479c738e20ddac983cddd50b5 (patch) | |
tree | 42e618e03749610dff45c10e12b377678fc7939b /usr.sbin/sysinstall/sysinstall.h | |
parent | 05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933 (diff) | |
download | FreeBSD-src-6880dc45b681e98479c738e20ddac983cddd50b5.zip FreeBSD-src-6880dc45b681e98479c738e20ddac983cddd50b5.tar.gz |
Expand X_AS_PKG so that we don't declare distribution bitmasks or menus
for the X distributions if X_AS_PKG is defined.
Tested on: i386
Approved by: re
Diffstat (limited to 'usr.sbin/sysinstall/sysinstall.h')
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 4b47541..e8653c7 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -372,9 +372,11 @@ extern Device *mediaDevice; /* Where we're getting our distribution from */ extern unsigned int Dists; /* Which distributions we want */ extern unsigned int CRYPTODists; /* Which naughty distributions we want */ extern unsigned int SrcDists; /* Which src distributions we want */ +#ifndef X_AS_PKG extern unsigned int XF86Dists; /* Which XFree86 dists we want */ extern unsigned int XF86ServerDists; /* The XFree86 servers we want */ extern unsigned int XF86FontDists; /* The XFree86 fonts we want */ +#endif extern int BootMgr; /* Which boot manager to use */ extern int StatusLine; /* Where to print our status messages */ extern DMenu MenuInitial; /* Initial installation menu */ @@ -418,12 +420,13 @@ extern DMenu MenuDiskDevices; /* Disk type devices */ extern DMenu MenuSubDistributions; /* Custom distribution menu */ extern DMenu MenuSrcDistributions; /* Source distribution menu */ extern DMenu MenuXF86; /* XFree86 main menu */ +#ifndef X_AS_PKG extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */ extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */ extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */ extern DMenu MenuXF86SelectPC98Server; /* XFree86 server distribution menu */ extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */ -extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */ +#endif extern DMenu MenuXDesktops; /* Disk devices menu */ extern DMenu MenuHTMLDoc; /* HTML Documentation menu */ extern DMenu MenuUsermgmt; /* User management menu */ @@ -531,7 +534,9 @@ extern int distSetXUser(dialogMenuItem *self); extern int distSetMinimum(dialogMenuItem *self); extern int distSetEverything(dialogMenuItem *self); extern int distSetSrc(dialogMenuItem *self); +#ifndef X_AS_PKG extern int distSetXF86(dialogMenuItem *self); +#endif extern int distExtractAll(dialogMenuItem *self); /* dmenu.c */ |