[Spice-commits] configure.ac spice-common

[Pavel Grunt]

 configure.ac |   47 ++---------------------------------------------
 spice-common |    2 +-
 2 files changed, 3 insertions(+), 46 deletions(-)

New commits:
commit 583f0d4d8e81f731143abb2522efc26d397250d0
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Wed Dec 16 18:18:58 2015 +0100

    build-sys: Use sasl check from spice-common
    
    Support only libsasl2 providing libsasl2.pc file
    
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/configure.ac b/configure.ac
index 4860fef..bfafb87 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],
@@ -747,7 +704,7 @@ AC_MSG_NOTICE([
         Coroutine:                ${with_coroutine}
         PulseAudio:               ${enable_pulse}
         GStreamer Audio:          ${have_gstaudio}
-        SASL support:             ${enable_sasl}
+        SASL support:             ${have_sasl}
         Smartcard support:        ${have_smartcard}
         USB redirection support:  ${have_usbredir} ${with_usbredir_hotplug}
         DBus:                     ${have_dbus}
diff --git a/spice-common b/spice-common
index 47122be..c3f2d21 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 47122befcde4e40a8be0267af2bd77811b838c84
+Subproject commit c3f2d217af40fa1da2cb42c69ca4a89fd8e7ef03