build: make charset detectors dependent on iconv and group them

1 files changed, 11 insertions, 4 deletions

diff --git a/wscript b/wscript
index 11a10a04b7..f6d5b6c194 100644
--- a/wscript
+++ b/wscript
@@ -277,10 +277,6 @@ iconv support use --disable-iconv.",
         'func': check_statement('sys/vfs.h',
                                 'struct statfs fs; fstatfs(0, &fs); fs.f_namelen')
     }, {
-        'name': '--libguess',
-        'desc': 'libguess support',
-        'func': check_pkg_config('libguess', '>= 1.0'),
-    }, {
         'name': '--libsmbclient',
         'desc': 'Samba support',
         'deps': [ 'libdl' ],
@@ -339,8 +335,19 @@ iconv support use --disable-iconv.",
     }, {
         'name': '--enca',
         'desc': 'ENCA support',
+        'deps': [ 'iconv' ],
         'func': check_statement('enca.h', 'enca_get_languages(NULL)', lib='enca'),
     }, {
+        'name': '--libguess',
+        'desc': 'libguess support',
+        'deps': [ 'iconv' ],
+        'func': check_pkg_config('libguess', '>= 1.0'),
+    }, {
+        'name': '--uchardet',
+        'desc': 'uchardet support',
+        'deps': [ 'iconv' ],
+        'func': check_pkg_config('uchardet'),
+    }, {
         'name': '--ladspa',
         'desc': 'LADSPA plugin support',
         'func': check_statement('ladspa.h', 'LADSPA_Descriptor ld = {0}'),