[GNUnet-SVN] [gnurl] 01/02: Introduce '--enable-gnurl' to autoconfigure.

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 54ea85343fdf6662e1ca254e59f46f20819c5394
Author: ng0 <address@hidden>
AuthorDate: Tue Oct 10 16:50:05 2017 +0000

    Introduce '--enable-gnurl' to autoconfigure.
---
 configure.ac   | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 guix-gnurl.scm | 12 +--------
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6c523a9ec..5424bc296 100755
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,8 @@ curl_verbose_msg="enabled (--disable-verbose)"
 
     ssl_backends=
 
+    gnurl_enable_msg="yes (--enable-gnurl)"
+
 dnl
 dnl Save some initial values the user might have provided
 dnl
@@ -3770,6 +3772,86 @@ ENABLE_STATIC="$enable_static"
 AC_SUBST(ENABLE_STATIC)
 
 
+dnl *** gnURL configure option, --enable-gnurl is short for:
+dnl --enable-ipv6 --with-gnutls
+dnl --without-libssh2 --without-libmetalink --without-winidn --without-librtmp
+dnl --without-nghttp2 --without-nss --without-cyassl --without-polarssl  
--without-ssl
+dnl --without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb 
--disable-ldap
+dnl --disable-rtsp --disable-dict --disable-telnet --disable-tftp 
--disable-pop3
+dnl --disable-imap --disable-smtp --disable-gopher --disable-file 
--disable-ftp --disable-smb
+dnl In the long run we should check what's really needed.
+AC_MSG_CHECKING([wether to build gnURL])
+AC_ARG_ENABLE(gnurl,
+AC_HELP_STRING([--enable-gnurl],[Enable building of gnURL])
+AC_HELP_STRING([--disable-gnurl],[Disable building of gnURL]),
+[ case "$enableval" in
+  no)
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([--enable-gnurl not provided. A build of gnURL will not 
happen.])
+        gnurl_enable_msg="disabled (not building gnURL)"
+        ;;
+  *)
+        AC_MSG_RESULT(yes)
+        IPV6_ENABLED=1
+        dnl AC_DEFINE(IPV6_ENABLED, 1)
+        GNUTLS_ENABLED=1
+        dnl AC_DEFINE(GNUTLS_ENABLED, 1)
+        dnl most of these are just safety off:
+        LIBSSH2_ENABLED=0
+        dnl AC_DEFINE(LIBSSH2_ENABLED, 0)
+        USE_METALINK=0
+        dnl AC_DEFINE(USE_METALINK, 0)
+        IDN_ENABLED=0
+        dnl AC_DEFINE(IDN_ENABLED, 0)
+        LIBRTMP_ENABLED=0
+        dnl AC_DEFINE(LIBRTMP_ENABLED, 0)
+        NGHTTP2_ENABLED=0
+        dnl AC_DEFINE(NGHTTP2_ENABLED, 0)
+        NSS_ENABLED=0
+        dnl AC_DEFINE(NSS_ENABLED, 0)
+        CYASSL_ENABLED=0
+        dnl AC_DEFINE(CYASSL_ENABLED, 0)
+        POLARSSL_ENABLED=0
+        dnl AC_DEFINE(POLARSSL_ENABLED, 0)
+        OPENSSL_ENABLED=0
+        dnl AC_DEFINE(OPENSSL_ENABLED, 0)
+        WINSSL_ENABLED=0
+        dnl AC_DEFINE(WINSSL_ENABLED, 0)
+        DARWINSSL_ENABLED=0
+        dnl AC_DEFINE(DARWINSSL_ENABLED, 0)
+        USE_WINDOWS_SSPI=0
+        dnl AC_DEFINE(USE_WINDOWS_SSPI, 0)
+        dnl what about --disable-ntlm-wb
+        CURL_DISABLED_LDAP=1
+        dnl AC_DEFINE(CURL_DISABLE_LDAP, 1)
+        CURL_DISABLE_RTSP=1
+        dnl AC_DEFINE(CURL_DISABLE_RTSP, 1)
+        CURL_DISABLE_DICT=1
+        dnl AC_DEFINE(CURL_DISABLE_DICT, 1)
+        CURL_DISABLE_TELNET=1
+        dnl AC_DEFINE(CURL_DISABLE_TELNET, 1)
+        CURL_DISABLE_TFTP=1
+        dnl AC_DEFINE(CURL_DISABLE_TFTP, 1)
+        CURL_DISABLE_POP3=1
+        dnl AC_DEFINE(CURL_DISABLE_POP3, 1)
+        CURL_DISABLE_IMAP=1
+        dnl AC_DEFINE(CURL_DISABLE_IMAP, 1)
+        CURL_DISABLE_SMTP=1
+        dnl AC_DEFINE(CURL_DISABLE_SMTP, 1)
+        CURL_DISABLE_GOPHER=1
+        dnl AC_DEFINE(CURL_DISABLE_GOPHER, 1)
+        CURL_DISABLE_FILE=1
+        dnl AC_DEFINE(CURL_DISABLE_FILE, 1)
+        CURL_DISABLE_FTP=1
+        dnl AC_DEFINE(CURL_DISABLE_FTP, 1)
+        CURL_DISABLE_SMB=1
+        dnl AC_DEFINE(CURL_DISABLE_SMB, 1)
+        gnurl_enable_msg="enabled (building gnURL)"
+        ;;
+  esac ],
+        AC_MSG_RESULT(yes)
+)
+
 dnl
 dnl For keeping supported features and protocols also in pkg-config file
 dnl since it is more cross-compile friendly than curl-config
@@ -4029,4 +4111,5 @@ AC_MSG_NOTICE([Configured to build gnurl/libgnurl:
   PSL support:      ${curl_psl_msg}
   HTTP2 support:    ${curl_h2_msg}
   Protocols:        ${SUPPORT_PROTOCOLS}
+  gnURL build:      $(gnurl_enable_msg)
 ])
diff --git a/guix-gnurl.scm b/guix-gnurl.scm
index 16edc973a..25dc36478 100644
--- a/guix-gnurl.scm
+++ b/guix-gnurl.scm
@@ -60,17 +60,7 @@
     ;;          (lambda _
     ;;            (zero? (system* "sh" "buildconf"))))))))
     (arguments
-     `(#:configure-flags '("--enable-ipv6" "--with-gnutls" "--without-libssh2"
-                           "--without-libmetalink" "--without-winidn"
-                           "--without-librtmp" "--without-nghttp2"
-                           "--without-nss" "--without-cyassl"
-                           "--without-polarssl" "--without-ssl"
-                           "--without-winssl" "--without-darwinssl"
-                           "--disable-sspi" "--disable-ntlm-wb"
-                           "--disable-ldap" "--disable-rtsp" "--disable-dict"
-                           "--disable-telnet" "--disable-tftp" "--disable-pop3"
-                           "--disable-imap" "--disable-smtp" "--disable-gopher"
-                           "--disable-file" "--disable-ftp" "--disable-smb")
+     `(#:configure-flags '("--enable-gnurl")
 
        #:test-target "test"
        #:parallel-tests? #f

-- 
To stop receiving notification emails like this one, please contact
address@hidden