X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=36a1f4bdd88ab90797d2802848eec02b6da70001;hp=ffb06934439b807d7e8a49551e65c73e313d23ed;hb=f4c330d6693eb3da840d9f2f8210997095987956;hpb=a775408e5d2e3b21dff741b89ff5330b397b5138 diff --git a/configure.ac b/configure.ac index ffb06934..36a1f4bd 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,10 @@ AC_PATH_PROG([INSTALL], [install]) test -z "$INSTALL" && AC_MSG_ERROR( [The install program is required to build this package]) +AC_PATH_PROG([lopsubgen], [lopsubgen]) +test -z "$lopsubgen" && AC_MSG_ERROR( + [lopsubgen is required to build this package]) + AC_PROG_CC AC_PROG_CPP @@ -92,6 +96,22 @@ AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no]) AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no]) LIB_SUBST_FLAGS(osl) UNSTASH_FLAGS +######################################################################## lopsub +STASH_FLAGS +LIB_ARG_WITH([lopsub], [-llopsub]) +HAVE_LOPSUB=yes +AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no]) +AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=yes]) +if test $HAVE_LOPSUB = no; then AC_MSG_ERROR([ + The lopsub library is required to build this software, but + the above checks indicate it is not installed on your system. + Run the following command to download a copy. + git clone git://git.tuebingen.mpg.de/lopsub.git + Install the library, then run this configure script again. +]) +fi +LIB_SUBST_FLAGS([lopsub]) +UNSTASH_FLAGS ######################################################################## openssl STASH_FLAGS HAVE_OPENSSL=yes @@ -99,6 +119,10 @@ LIB_ARG_WITH([openssl], [-lssl -lcrypto]) AC_CHECK_HEADER(openssl/ssl.h, [], [HAVE_OPENSSL=no]) AC_CHECK_LIB([crypto], [RAND_bytes], [], [HAVE_OPENSSL=no]) LIB_SUBST_FLAGS(openssl) +if test $HAVE_OPENSSL = yes; then + AC_CHECK_LIB([crypto], [RSA_set0_key], + AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl-1.1])) +fi UNSTASH_FLAGS ######################################################################### gcrypt STASH_FLAGS