sound/pianod/patches/010-Configure_add_SSL_options.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -31,8 +31,6 @@ AC_CHECK_LIB([pthread], [pthread_create]
   4  # with it, but don't consider it an error.
   5  # PKG_CHECK_MODULES only validates that pkg-config returns stuff; it doesn't
   6  # validate that these are correct, so check lib to make sure they're right.
   7 -PKG_CHECK_MODULES([gnutls], [gnutls],,
   8 -       [AC_MSG_WARN([No pkg-config for libgnutls])])
   9  PKG_CHECK_MODULES([ao], [ao],,
  10         [AC_MSG_WARN([No pkg-config for libao])])
  11  PKG_CHECK_MODULES([mad], [mad],,
  12 @@ -42,12 +40,28 @@ PKG_CHECK_MODULES([json], [json-c],,
  13                 [PKG_CHECK_MODULES([json], [json0],,
  14                         [AC_MSG_WARN([No pkg-config for json-c (aka libjson0, libjson)])])])])
  15
  16 +
  17  # Network communication stuff:
  18  AC_CHECK_LIB([gcrypt], [gcry_cipher_open],,
  19         [AC_MSG_ERROR([Cannot find required library: libgcrypt],1)])
  20 -AC_CHECK_LIB([gnutls], [gnutls_record_recv],,
  21 +# Check for SSL option
  22 +AC_ARG_WITH(polarssl, [  --with-polarssl       Build waitress with PolarSSL (default GNUTLS)], [
  23 +  AC_MSG_RESULT(>>Using PolarSSL)
  24 +  HAS_POLARSSL=1
  25 +  AC_DEFINE([USE_POLARSSL], 1, [Build for PolarSSL])
  26 +  PKG_CHECK_MODULES([polarssl], [polarssl],,
  27 +               [AC_MSG_WARN([No pkg-config for libpolarssl])])
  28 +  AC_CHECK_LIB([polarssl], [ssl_set_session],,
  29 +               [AC_MSG_ERROR([Cannot find required library: libpolarssl (aka polarssl)],1)])] )
  30 +AM_CONDITIONAL([USE_POLARSSL],[test "x$HAS_POLARSSL" = "x1"])
  31 +
  32 +if test "x$HAS_POLARSSL" != x1 ; then
  33 +  PKG_CHECK_MODULES([gnutls], [gnutls],,
  34 +       [AC_MSG_WARN([No pkg-config for libgnutls])])
  35 +  AC_CHECK_LIB([gnutls], [gnutls_record_recv],,
  36         [AC_MSG_ERROR([Cannot find required library: libgnutls (aka gnutls)],1)])
  37 -AC_CHECK_FUNCS(gnutls_transport_set_int2 gnutls_sec_param_to_pk_bits)
  38 +  AC_CHECK_FUNCS(gnutls_transport_set_int2 gnutls_sec_param_to_pk_bits)
  39 +fi
  40
  41  # Bloody json library may be linked via -ljson, or -ljson-c depending on
  42  # the platform.  Try both.