Change the autodetect code so that it is more generic.
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>