X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=74f3fd97f97cd1228ca76fadbda92bd77b5896bd;hp=2b2f2966b980bb6169c9501ce77e1ccaf830b0aa;hb=c257c9c321c6e9494dbcbb6da0af675c3a2aa8e4;hpb=0f4910b50116416fefb09ca67a615679067ef359 diff --git a/configure.ac b/configure.ac index 2b2f2966..74f3fd97 100644 --- a/configure.ac +++ b/configure.ac @@ -65,26 +65,17 @@ AC_DEFUN([LIB_SUBST_FLAGS], [ AC_SUBST($1_ldflags) ]) -AC_PATH_PROG(UNAMEPATH, uname, no) -if test "$UNAMEPATH" = "no"; then - AC_MSG_ERROR(unable to determine system type) -fi -AC_MSG_CHECKING(os type) -OSTYPE="`$UNAMEPATH -s`" -AC_MSG_RESULT("$OSTYPE") - -if test "$OSTYPE" = "SunOS"; then - # needed on SunOS for socket magic - arch_cppflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__" - AC_SUBST(arch_cppflags) -fi - +AC_USE_SYSTEM_EXTENSIONS AC_C_BIGENDIAN() AC_PATH_PROG([GENGETOPT], [gengetopt]) test -z "$GENGETOPT" && AC_MSG_ERROR( [gengetopt is required to build this package]) +AC_PATH_PROG([M4], [m4]) +test -z "$M4" && AC_MSG_ERROR( + [The m4 macro processor is required to build this package]) + AC_PATH_PROG([HELP2MAN], [help2man]) test -z "$HELP2MAN" && AC_MSG_ERROR( [help2man is required to build this package]) @@ -125,6 +116,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 @@ -168,12 +163,6 @@ case "$enable_cryptolib" in ;; esac AC_SUBST(crypto_ldflags) -########################################################################### libsocket -AC_CHECK_LIB([c], [socket], - [socket_ldlflags=], - [socket_ldflags="-lsocket"] -) -AC_SUBST(socket_ldflags) ########################################################################## iconv STASH_FLAGS LIBS= @@ -198,16 +187,9 @@ AC_COMPILE_IFELSE([ AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()]) AC_MSG_RESULT($msg) UNSTASH_FLAGS -########################################################################### libnsl -AC_CHECK_LIB([c], [gethostbyname], - [nsl_ldflags=], - [nsl_ldflags="-lnsl"] -) -AC_SUBST(nsl_ldflags) ########################################################################### ucred AC_MSG_CHECKING(for struct ucred) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #define _GNU_SOURCE #include #include ]], [[ @@ -440,6 +422,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then close_on_fork mm crypt_common + base64 ipc dccp_send fd @@ -502,6 +485,7 @@ if test -n "$CRYPTOLIB"; then client_common buffer_tree crypt_common + base64 version ggo " @@ -545,6 +529,7 @@ if test -n "$CRYPTOLIB"; then stat net crypt_common + base64 sideband time grab_client @@ -1157,7 +1142,6 @@ audio format handlers: $audio_format_handlers filters: $(echo $filters) writers: $writers -para_fade: $build_fade para_server: $build_server para_gui: $build_gui para_fade: $build_fade