diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-26 18:28:28 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-26 18:28:30 +0200 |
| commit | 2b47e8c16f78dda81edb11a80be7c481aa457419 (patch) | |
| tree | a26c0b886d44fea403f5c1a7127e96783d771bd2 /configure.ac | |
| parent | f31bc2a9a6700bebc258130e802f40180af77d8e (diff) | |
build-sys: fix --with-sasl
The default configure sasl auto setting will error out if SASL is
missing. Instead, silentely skip sasl configure if detected missing.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 74738a3..b63a695 100644 --- a/configure.ac +++ b/configure.ac @@ -122,30 +122,24 @@ if test "x$with_sasl" != "xno"; then SASL_CFLAGS="-I$with_sasl" SASL_LIBS="-L$with_sasl" fi - fail=0 old_cflags="$CFLAGS" old_libs="$LIBS" CFLAGS="$CFLAGS $SASL_CFLAGS" LIBS="$LIBS $SASL_LIBS" - AC_CHECK_HEADER([sasl/sasl.h],[],[ - if test "x$with_sasl" != "xauto" ; then - with_sasl=no - else - fail=1 - fi]) - if test "x$with_sasl" != "xno" ; then + 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" -a "x$with_sasl" != "xno" ; then + if test "x$with_sasl2" = "xno" -a "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" - else + 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 + fi CFLAGS="$old_cflags" LIBS="$old_libs" if test "x$with_sasl2" = "xyes" -o "x$with_sasl" = "xyes" ; then |