Add make support for SASL on Unix

This commit is contained in:
Berke Viktor 2012-07-17 19:19:48 +02:00
parent 6d55ce363b
commit e5f4c4d217
3 changed files with 41 additions and 4 deletions

View File

@ -129,6 +129,10 @@ AC_ARG_ENABLE(tcl,
[ --enable-tcl[=PATH] directory with Tcl config file: tclConfig.sh], [ --enable-tcl[=PATH] directory with Tcl config file: tclConfig.sh],
tcl=$enableval, tcl=yes) tcl=$enableval, tcl=yes)
AC_ARG_ENABLE(sasl,
[ --disable-sasl disable the SASL plugin],
sasl=$enableval, sasl=yes)
AC_ARG_ENABLE(plugin, AC_ARG_ENABLE(plugin,
[ --disable-plugin disable plugin support], [ --disable-plugin disable plugin support],
plugin=$enableval, plugin=yes) plugin=$enableval, plugin=yes)
@ -362,6 +366,21 @@ if test "$tcl" != "no"; then
fi fi
fi fi
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 ********************************************************************* dnl *********************************************************************
dnl ** IPv6 ************************************************************* dnl ** IPv6 *************************************************************
dnl ********************************************************************* dnl *********************************************************************
@ -575,6 +594,7 @@ AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes")
AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno") AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
@ -837,18 +857,17 @@ plugins/Makefile
plugins/python/Makefile plugins/python/Makefile
plugins/perl/Makefile plugins/perl/Makefile
plugins/tcl/Makefile plugins/tcl/Makefile
plugins/sasl/Makefile
intl/Makefile intl/Makefile
po/Makefile.in po/Makefile.in
]) ])
echo echo
echo hexchat $VERSION echo HexChat $VERSION
echo echo
echo Building GTK+ Interface .... : $gtkfe echo Building GTK+ Interface .... : $gtkfe
echo Building TEXT Interface .... : $textfe echo Building TEXT Interface .... : $textfe
echo echo
echo PLUGINS: Perl: $perl Python: $python TCL: $tcl
echo
echo mmx tinting ......... : $mmx\ spelling .............. : $spell echo mmx tinting ......... : $mmx\ spelling .............. : $spell
echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin
if test "$xft" = no; then if test "$xft" = no; then
@ -860,6 +879,10 @@ echo openssl support ..... : $openssl\ ipv6 support .......... : $ipv6
echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm
echo libnotify support ... : $libnotify echo libnotify support ... : $libnotify
echo echo
echo Perl ................ : $perl\ SASL .................. : $sasl
echo Python .............. : $python
echo Tcl ................. : $tcl
echo
echo The binary will be installed in $prefix/bin echo The binary will be installed in $prefix/bin
echo echo

View File

@ -17,5 +17,9 @@ if DO_TCL
tcldir = tcl tcldir = tcl
endif endif
if DO_SASL
sasldir = sasl
endif
#SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc #SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
SUBDIRS = . $(pythondir) $(perldir) $(tcldir) SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir)

10
plugins/sasl/Makefile.am Normal file
View File

@ -0,0 +1,10 @@
EXTRA_DIST =
libdir = $(hexchatlibdir)/plugins
lib_LTLIBRARIES = sasl.la
sasl_la_SOURCES = sasl.c
sasl_la_LDFLAGS = -avoid-version -module
sasl_la_LIBADD =
INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..