Get rid of the SASL plugin

9 files changed, 29 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 7c598cc2..f9165196 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,9 +146,9 @@ AC_ARG_ENABLE(fishlim,
 [  --disable-fishlim       disable the FiSHLiM plugin],
         fishlim=$enableval, fishlim=yes)
 
-AC_ARG_ENABLE(sasl,
-[  --disable-sasl          disable the SASL plugin],
-        sasl=$enableval, sasl=yes)
+dnl AC_ARG_ENABLE(sasl,
+dnl [  --disable-sasl          disable the SASL plugin],
+dnl         sasl=$enableval, sasl=yes)
 
 AC_ARG_ENABLE(sysinfo,
 [  --disable-sysinfo      disable the SysInfo plugin],
@@ -579,16 +579,16 @@ dnl *********************************************************************
 dnl ** SASL *************************************************************
 dnl *********************************************************************
 
-if test "$sasl" != "no"; then
-	AC_MSG_CHECKING(for plugin interface used by SASL)
-	sasl=no
-	if test "$plugin" = yes; then
-		sasl=yes
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SASL])
-	fi
-fi
+dnl if test "$sasl" != "no"; then
+dnl 	AC_MSG_CHECKING(for plugin interface used by SASL)
+dnl 	sasl=no
+dnl 	if test "$plugin" = yes; then
+dnl 		sasl=yes
+dnl 		AC_MSG_RESULT([yes])
+dnl 	else
+dnl 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SASL])
+dnl 	fi
+dnl fi
 
 dnl *********************************************************************
 dnl ** SYSINFO **********************************************************
@@ -697,7 +697,7 @@ AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
 AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
 AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
 AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes")
-AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes")
+dnl AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes")
 AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
 AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
 AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
@@ -963,7 +963,7 @@ plugins/tcl/Makefile
 plugins/checksum/Makefile
 plugins/doat/Makefile
 plugins/fishlim/Makefile
-plugins/sasl/Makefile
+dnl plugins/sasl/Makefile
 plugins/sysinfo/Makefile
 intl/Makefile
 po/Makefile.in
@@ -999,7 +999,7 @@ echo
 echo Checksum .............. : $checksum
 echo Do At ................. : $doat
 echo FiSHLiM ............... : $fishlim
-echo SASL .................. : $sasl
+dnl echo SASL .................. : $sasl
 echo SysInfo ............... : $sysinfo
 echo
 echo The binary will be installed in $prefix/bin
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9ca89e34..8d9e09b0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -17,9 +17,9 @@ if DO_TCL
 tcldir = tcl
 endif
 
-if DO_SASL
-sasldir = sasl
-endif
+#if DO_SASL
+#sasldir = sasl
+#endif
 
 if DO_DOAT
 doatdir = doat
@@ -38,4 +38,4 @@ sysinfodir = sysinfo
 endif
 
 #SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
-SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir) $(doatdir) $(fishlimdir) $(checksumdir) $(sysinfodir)
+SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(doatdir) $(fishlimdir) $(checksumdir) $(sysinfodir)
diff --git a/src/common/plugin.c b/src/common/plugin.c
index cc626659..ac1bce45 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -479,7 +479,7 @@ plugin_auto_load (session *sess)
 	for_files ("./plugins", "hcmpcinfo.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcperl.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcpython.dll", plugin_auto_load_cb);
-	for_files ("./plugins", "hcsasl.dll", plugin_auto_load_cb);
+	/* for_files ("./plugins", "hcsasl.dll", plugin_auto_load_cb); we have this built-in */
 	for_files ("./plugins", "hctcl.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcupd.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcwinamp.dll", plugin_auto_load_cb);
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index f05904dc..03f3f752 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -98,7 +98,6 @@ copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"

-copy "$(HexChatBin)hcsasl.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins"

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 5290c8c9..bc3d3ca0 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -111,7 +111,6 @@ copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"

-copy "$(HexChatBin)hcsasl.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins"

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 4fed20aa..05bef7ca 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -44,7 +44,7 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

-Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

+;Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning

@@ -174,7 +174,7 @@ Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo

 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo

-Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

+;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

 Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index e1bc4d9f..875a90f4 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -43,7 +43,7 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

-Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

+;Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning

@@ -175,7 +175,7 @@ Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo

 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo

-Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

+;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

 Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss
index 4fed20aa..05bef7ca 100644
--- a/win32/installer/hexchat-xp-x64.skel.iss
+++ b/win32/installer/hexchat-xp-x64.skel.iss
@@ -44,7 +44,7 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

-Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

+;Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning

@@ -174,7 +174,7 @@ Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo

 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo

-Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

+;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

 Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss
index e1bc4d9f..875a90f4 100644
--- a/win32/installer/hexchat-xp-x86.skel.iss
+++ b/win32/installer/hexchat-xp-x86.skel.iss
@@ -43,7 +43,7 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

-Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

+;Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning

@@ -175,7 +175,7 @@ Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo

 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo

-Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

+;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl

 Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa