diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2002-11-27 19:39:26 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2002-11-27 19:39:26 +0000 |
| commit | cab2a4d2b999ccadbea09f2d4d223624e399b6b4 (patch) | |
| tree | ad3281da9d5cf46518dd5a23eebcf8061337eed3 | |
| parent | 8e5bc7211646d29481d721ca774244782732a33d (diff) | |
Notes
| -rw-r--r-- | usr.sbin/sade/config.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 5075f48154fc..8a3b30ff7fb0 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -650,7 +650,9 @@ int configXSetup(dialogMenuItem *self) { char *config, *execfile, *execcmd, *style, *tmp; +#ifdef WITH_MICE char *moused; +#endif WINDOW *w = savescr(); setenv("XWINHOME", "/usr/X11R6", 1); @@ -697,6 +699,7 @@ tryagain: *tmp = '\0'; if (file_executable(execfile)) { free(execfile); +#ifdef WITH_MICE moused = variable_get(VAR_MOUSED); while (!moused || strcmp(moused, "YES")) { if (msgYesNo("The X server may access the mouse in two ways: direct access\n" @@ -714,6 +717,7 @@ tryagain: "Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n" "\"MouseSystems\" as the mouse protocol in the X configuration\n" "utility."); +#endif Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */ systemExecute(execcmd); if (!file_readable("/etc/X11/XF86Config")) { diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 5075f48154fc..8a3b30ff7fb0 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -650,7 +650,9 @@ int configXSetup(dialogMenuItem *self) { char *config, *execfile, *execcmd, *style, *tmp; +#ifdef WITH_MICE char *moused; +#endif WINDOW *w = savescr(); setenv("XWINHOME", "/usr/X11R6", 1); @@ -697,6 +699,7 @@ tryagain: *tmp = '\0'; if (file_executable(execfile)) { free(execfile); +#ifdef WITH_MICE moused = variable_get(VAR_MOUSED); while (!moused || strcmp(moused, "YES")) { if (msgYesNo("The X server may access the mouse in two ways: direct access\n" @@ -714,6 +717,7 @@ tryagain: "Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n" "\"MouseSystems\" as the mouse protocol in the X configuration\n" "utility."); +#endif Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */ systemExecute(execcmd); if (!file_readable("/etc/X11/XF86Config")) { |