Support only libsasl2 providing libsasl2.pc file --- depends on http://lists.freedesktop.org/archives/spice-devel/2015-November/024332.html --- configure.ac | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/configure.ac b/configure.ac index 98de1c6..288525c 100644 --- a/configure.ac +++ b/configure.ac @@ -111,50 +111,7 @@ AC_SUBST(SSL_CFLAGS) AC_SUBST(SSL_LIBS) SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl" -dnl Cyrus SASL -AC_ARG_WITH([sasl], - [AS_HELP_STRING([--with-sasl=@<:@yes/no/auto@:>@], [use cyrus SASL for authentication @<:@default=auto@:>@])], - [], - [with_sasl="auto"]) - -SASL_CFLAGS= -SASL_LIBS= -enable_sasl=no -if test "x$with_sasl" != "xno"; then - if test "x$with_sasl" != "xyes" && test "x$with_sasl" != "xauto"; then - SASL_CFLAGS="-I$with_sasl" - SASL_LIBS="-L$with_sasl" - fi - old_cflags="$CFLAGS" - old_libs="$LIBS" - CFLAGS="$CFLAGS $SASL_CFLAGS" - LIBS="$LIBS $SASL_LIBS" - AC_CHECK_HEADER([sasl/sasl.h],[with_sasl=yes]) - if test "x$with_sasl" = "xyes" ; then - AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl2=yes],[with_sasl2=no]) - fi - if test "x$with_sasl2" = "xno" && test "x$with_sasl" = "xyes" ; then - AC_CHECK_LIB([sasl], [sasl_client_init],[with_sasl=yes],[with_sasl=no]) - fi - if test "x$with_sasl2" = "xyes"; then - SASL_LIBS="$SASL_LIBS -lsasl2" - elif test "x$with_sasl" = "xyes"; then - SASL_LIBS="$SASL_LIBS -lsasl" - elif test "x$with_sasl" != "xauto"; then - AC_MSG_ERROR([You must install the Cyrus SASL development package in order to compile spice-gtk]) - fi - CFLAGS="$old_cflags" - LIBS="$old_libs" - if test "x$with_sasl2" = "xyes" || test "x$with_sasl" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SASL], 1, - [whether Cyrus SASL is available for authentication]) - enable_sasl=yes - fi -fi -AM_CONDITIONAL([HAVE_SASL], [test "x$with_sasl2" = "xyes" || test "x$with_sasl" = "xyes"]) -AC_SUBST([SASL_CFLAGS]) -AC_SUBST([SASL_LIBS]) - +SPICE_CHECK_SASL AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], -- 2.5.0 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel