dbus: Use CONFIG_DBUS instead of old||new

This commit is contained in:
Jouni Malinen 2010-01-01 13:26:56 +02:00
parent 094e9ea1d7
commit 64bde6d730

View file

@ -73,9 +73,9 @@ static void usage(void)
" -p = driver parameters\n" " -p = driver parameters\n"
" -P = PID file\n" " -P = PID file\n"
" -q = decrease debugging verbosity (-qq even less)\n"); " -q = decrease debugging verbosity (-qq even less)\n");
#if defined(CONFIG_CTRL_IFACE_DBUS) || defined(CONFIG_CTRL_IFACE_DBUS_NEW) #ifdef CONFIG_DBUS
printf(" -u = enable DBus control interface\n"); printf(" -u = enable DBus control interface\n");
#endif /* CONFIG_CTRL_IFACE_DBUS || CONFIG_CTRL_IFACE_DBUS_NEW */ #endif /* CONFIG_DBUS */
printf(" -v = show version\n" printf(" -v = show version\n"
" -W = wait for a control interface monitor before starting\n" " -W = wait for a control interface monitor before starting\n"
" -N = start describing new interface\n"); " -N = start describing new interface\n");
@ -218,11 +218,11 @@ int main(int argc, char *argv[])
case 't': case 't':
params.wpa_debug_timestamp++; params.wpa_debug_timestamp++;
break; break;
#if defined(CONFIG_CTRL_IFACE_DBUS) || defined(CONFIG_CTRL_IFACE_DBUS_NEW) #ifdef CONFIG_DBUS
case 'u': case 'u':
params.dbus_ctrl_interface = 1; params.dbus_ctrl_interface = 1;
break; break;
#endif /* CONFIG_CTRL_IFACE_DBUS || CONFIG_CTRL_IFACE_DBUS_NEW */ #endif /* CONFIG_DBUS */
case 'v': case 'v':
printf("%s\n", wpa_supplicant_version); printf("%s\n", wpa_supplicant_version);
exitcode = 0; exitcode = 0;