diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 50 |
1 files changed, 17 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index a9845d202..e00b8ae1b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -763,14 +763,6 @@ fi | |||
763 | 763 | ||
764 | # libgnurl | 764 | # libgnurl |
765 | LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) | 765 | LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) |
766 | if test "$gnurl" = 1 | ||
767 | then | ||
768 | AM_CONDITIONAL(HAVE_LIBGNURL, true) | ||
769 | AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) | ||
770 | else | ||
771 | AM_CONDITIONAL(HAVE_LIBGNURL, false) | ||
772 | AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) | ||
773 | fi | ||
774 | 766 | ||
775 | SAVE_CPPFLAGS=$CPPFLAGS | 767 | SAVE_CPPFLAGS=$CPPFLAGS |
776 | CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS" | 768 | CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS" |
@@ -780,38 +772,30 @@ LIBS="$LIBGNURL $LIBCURL $LIBS" | |||
780 | LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) | 772 | LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) |
781 | if test "x$curl" = xtrue | 773 | if test "x$curl" = xtrue |
782 | then | 774 | then |
783 | 775 | AC_CHECK_HEADER([curl/curl.h], | |
784 | AC_CHECK_HEADERS([curl/curl.h], | ||
785 | AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]), | 776 | AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]), |
786 | [curl=false]) | 777 | [curl=false]) |
787 | AC_CHECK_HEADERS([gnurl/curl.h], | ||
788 | AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],,[[#include <gnurl/curl.h>]])) | ||
789 | # need libcurl-gnutls.so, everything else is not acceptable | 778 | # need libcurl-gnutls.so, everything else is not acceptable |
790 | AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) | 779 | AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) |
791 | # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 | 780 | # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 |
792 | fi | 781 | fi |
793 | 782 | ||
794 | # Check for curl/curl.h and gnurl/curl.h so we can use #ifdef | 783 | # libcurl and libgnurl should be mutually exclusive |
795 | # HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted | 784 | AS_IF([test "$gnurl" = 1], |
796 | # *either* header set). | 785 | [AM_CONDITIONAL(HAVE_LIBGNURL, true) |
797 | AC_CHECK_HEADERS([curl/curl.h],, | 786 | AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) |
798 | curl=false | 787 | AM_CONDITIONAL(HAVE_LIBCURL, false) |
799 | AC_CHECK_HEADERS([gnurl/curl.h],, | 788 | AC_DEFINE([HAVE_LIBCURL],[0],[Lacking libcurl])], |
800 | gnurl=false)) | 789 | [AS_IF([test "$curl" = true], |
801 | 790 | [AM_CONDITIONAL(HAVE_LIBGNURL, false) | |
802 | 791 | AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) | |
803 | 792 | AM_CONDITIONAL(HAVE_LIBCURL, true) | |
804 | if test x$curl = xfalse | 793 | AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])], |
805 | then | 794 | [AC_MSG_WARN([ERROR: GNUnet requires libcurl-gnutls or gnurl >= 7.34]) |
806 | AM_CONDITIONAL(HAVE_LIBCURL, false) | 795 | AM_CONDITIONAL(HAVE_LIBGNURL, false) |
807 | if test "$gnurl" = 0 | 796 | AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl]) |
808 | then | 797 | AM_CONDITIONAL(HAVE_LIBCURL, false) |
809 | AC_MSG_WARN([ERROR: GNUnet requires libcurl-gnutls or gnurl >= 7.34]) | 798 | AC_DEFINE([HAVE_LIBCURL],[0],[Lacking libcurl])])]) |
810 | fi | ||
811 | else | ||
812 | AM_CONDITIONAL(HAVE_LIBCURL, true) | ||
813 | AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL]) | ||
814 | fi | ||
815 | 799 | ||
816 | AC_SEARCH_LIBS(__atomic_load_8, atomic, [have_libatomic=1 AC_DEFINE(HAVE_LIBATOMIC,1,[external libatomic])]) | 800 | AC_SEARCH_LIBS(__atomic_load_8, atomic, [have_libatomic=1 AC_DEFINE(HAVE_LIBATOMIC,1,[external libatomic])]) |
817 | AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1]) | 801 | AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1]) |