diff options
author | jospaeth <spaethj@in.tum.de> | 2020-07-09 14:55:41 +0200 |
---|---|---|
committer | jospaeth <spaethj@in.tum.de> | 2020-07-09 14:56:10 +0200 |
commit | 4db9f457a19f1eeb8b8b9d1ea5cfa8515ec0c11f (patch) | |
tree | 622850aa1c4496d25735b02eecbefad66f79fe64 /configure.ac | |
parent | eeb3610df1d4f102e60abf20d22a3febc0f9b273 (diff) | |
download | gnunet-4db9f457a19f1eeb8b8b9d1ea5cfa8515ec0c11f.tar.gz gnunet-4db9f457a19f1eeb8b8b9d1ea5cfa8515ec0c11f.zip |
include sss library checks, minor fixes
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c2d18097e..aef598453 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -790,6 +790,34 @@ AC_ARG_WITH(jansson, | |||
790 | AS_IF([test "x$jansson" != x1], | 790 | AS_IF([test "x$jansson" != x1], |
791 | [AC_MSG_ERROR([GNUnet requires libjansson])]) | 791 | [AC_MSG_ERROR([GNUnet requires libjansson])]) |
792 | 792 | ||
793 | # check for sss (Shamir Secret Sharing) library | ||
794 | sss=0 | ||
795 | AC_MSG_CHECKING(for sss) | ||
796 | AC_ARG_WITH(sss, | ||
797 | [ --with-sss=PREFIX (base of sss installation)], | ||
798 | [AC_MSG_RESULT([$with_sss]) | ||
799 | AS_CASE([$with_sss], | ||
800 | [no],[], | ||
801 | [yes],[ | ||
802 | CHECK_LIBHEADER(SSS, sss, sss_create_shares, sss.h, sss=1,) | ||
803 | ],[ | ||
804 | LDFLAGS="-L$with_sss/lib $LDFLAGS" | ||
805 | CPPFLAGS="-I$with_sss/include $CPPFLAGS" | ||
806 | AC_CHECK_HEADERS(sss.h, | ||
807 | AC_CHECK_LIB([sss], [sss_create_shares], | ||
808 | EXT_LIB_PATH="-L$with_sss/lib $EXT_LIB_PATH" | ||
809 | sss=1)) | ||
810 | ]) | ||
811 | ], | ||
812 | [AC_MSG_RESULT([--with-sss not specified]) | ||
813 | CHECK_LIBHEADER(SSS, sss, sss_create_shares, sss.h,sss=1,)]) | ||
814 | AM_CONDITIONAL(HAVE_SSS, [test "$sss" = 1]) | ||
815 | AS_IF([test "$sss" = 1], | ||
816 | [AC_DEFINE([HAVE_SSS],[1],[Have sss library]) | ||
817 | sss_msg="yes"], | ||
818 | [AC_DEFINE([HAVE_SSS],[0],[Lacking sss library]) | ||
819 | sss_msg="no"]) | ||
820 | |||
793 | # check for libpulse(audio) library | 821 | # check for libpulse(audio) library |
794 | pulse=0 | 822 | pulse=0 |
795 | libpulse_msg="no" | 823 | libpulse_msg="no" |
@@ -2042,6 +2070,10 @@ AS_IF([test "x$conversation_backend" = "xnone"], | |||
2042 | # -- interface | 2070 | # -- interface |
2043 | interface_msg=`echo $DEFAULT_INTERFACE | tr -d \"` | 2071 | interface_msg=`echo $DEFAULT_INTERFACE | tr -d \"` |
2044 | # -- jansson | 2072 | # -- jansson |
2073 | # -- sss | ||
2074 | AS_IF([test "$sss" != 1], | ||
2075 | [AC_MSG_WARN([sss library not found. GNS escrow plugin will not be compiled.])], | ||
2076 | [sss_msg="yes"]) | ||
2045 | # -- libextractor | 2077 | # -- libextractor |
2046 | AS_IF([test "$extractor" != 1], | 2078 | AS_IF([test "$extractor" != 1], |
2047 | [AC_MSG_WARN([libextractor not found, but various file-sharing functions require it])], | 2079 | [AC_MSG_WARN([libextractor not found, but various file-sharing functions require it])], |
@@ -2154,6 +2186,7 @@ libpulse: ${libpulse_msg} | |||
2154 | libextractor: ${libextractor_msg} | 2186 | libextractor: ${libextractor_msg} |
2155 | texi2mdoc: ${texi2mdoc_msg} | 2187 | texi2mdoc: ${texi2mdoc_msg} |
2156 | mandoc: ${mandoc_msg} | 2188 | mandoc: ${mandoc_msg} |
2189 | sss: ${sss_msg} | ||
2157 | 2190 | ||
2158 | GNUnet configuration: | 2191 | GNUnet configuration: |
2159 | ===================== | 2192 | ===================== |