1 files changed, 42 insertions, 31 deletions
diff --git a/chat-irc/hexchat/CONFIGURE b/chat-irc/hexchat/CONFIGURE
index 9fe71e02fb..656a3409db 100755
--- a/chat-irc/hexchat/CONFIGURE
+++ b/chat-irc/hexchat/CONFIGURE
@@ -1,35 +1,46 @@
-config_query_option HEXCHAT_OPTS "Enable threads?" y \
-                    "--enable-threads=pth" "--disable-theads"  &&
-
-config_query_option HEXCHAT_OPTS "Enable IPv6?" n \
-                    "--enable-ipv6" "--disable-ipv6"  &&
-
-config_query_option HEXCHAT_OPTS "Enable use of Xft directly?" n \
-                    "--enable-xft" "--disable-xft"  &&
-
-config_query_option HEXCHAT_OPTS "Enable use of XShm for fast tinting?" n \
-                    "--enable-shm" "--disable-shm"  &&
+# remove obsolete options from HEXCHAT_OPTS
+list_remove HEXCHAT_OPTS '--enable-threads=pth' &&
+list_remove HEXCHAT_OPTS '--disable-theads' &&
+list_remove HEXCHAT_OPTS '--enable-xft' &&
+list_remove HEXCHAT_OPTS '--disable-xft' &&
+list_remove HEXCHAT_OPTS '--enable-shm' &&
+list_remove HEXCHAT_OPTS '--disable-shm' &&
+list_remove HEXCHAT_OPTS '--enable-mmx' &&
+list_remove HEXCHAT_OPTS '--disable-mmx' &&
+list_remove HEXCHAT_OPTS '--enable-sasl' &&
+list_remove HEXCHAT_OPTS '--disable-sasl' &&
+
+config_query_option HEXCHAT_OPTS "Enable IPv6?" y \
+                                 "--enable-ipv6" \
+                                 "--disable-ipv6" &&
 
 config_query_option HEXCHAT_OPTS "Build the text frontend?" n \
-                    "--enable-textfe" "--disable-textfe"  &&
+                                 "--enable-textfe" \
+                                 "--disable-textfe" &&
 
 config_query_option HEXCHAT_OPTS "Enable plugin support?" y \
-                    "--enable-plugin" "--disable-plugin"  &&
-
-config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y  \
-                    "--enable-checksum" "--disable-checksum"  &&
-
-config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \
-                    "--enable-doat" "--disable-doat"      &&
-
-config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \
-                    "--enable-fishlim" "--disable-fishlim"  &&
-
-config_query_option HEXCHAT_OPTS "Enable SASL plugin?" y \
-                    "--enable-sasl" "--disable-sasl"  &&
-
-config_query_option HEXCHAT_OPTS "Enable MMX assembly routines?" y \
-                    "--enable-mmx" "--disable-mmx"  &&
-
-config_query_option HEXCHAT_OPTS "enable use of XShm for fast tinting?" n \
-                    "--enable-mmx" "--disable-mmx"
+                                 "--enable-plugin" \
+                                 "--disable-plugin" &&
+
+if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
+  config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y  \
+                                   "--enable-checksum" \
+                                   "--disable-checksum" &&
+
+  config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \
+                                   "--enable-doat" \
+                                   "--disable-doat" &&
+
+  config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \
+                                   "--enable-fishlim" \
+                                   "--disable-fishlim" &&
+
+  config_query_option HEXCHAT_OPTS "Enable sysinfo plugin?" y \
+                                   "--enable-sysinfo" \
+                                   "--disable-sysinfo"
+else
+  list_add HEXCHAT_OPTS '--disable-checksum' &&
+  list_add HEXCHAT_OPTS '--disable-doat' &&
+  list_add HEXCHAT_OPTS '--disable-fishlim' &&
+  list_add HEXCHAT_OPTS '--disable-sysinfo'
+fi