Make it possible to disable conf.

Now the configure script has --disable-conf command-line argument
that can be used to turn off environment variables and use of
configuration files.
This commit is contained in:
Ahti Legonkov
2013-02-19 14:39:53 +02:00
committed by Philippe Teuwen
parent 72b10c5d9b
commit fd6d4db5b7
5 changed files with 33 additions and 1 deletions

View File

@@ -294,6 +294,7 @@ nfc_list_devices(nfc_context *context, nfc_connstring connstrings[], const size_
{
size_t device_found = 0;
#ifdef CONF
// Load manually configured devices (from config file and env variables)
// TODO From env var...
for (uint32_t i = 0; i < context->user_defined_device_count; i++) {
@@ -334,6 +335,7 @@ nfc_list_devices(nfc_context *context, nfc_connstring connstrings[], const size_
return device_found;
}
}
#endif // CONF
// Device auto-detection
if (context->allow_autoscan) {