gnurl: configure: require less mandatory switches.

gnurl: CI: adjust to changes.

3 files changed, 26 insertions, 146 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ec3eab63..007d3cd92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,4 +18,4 @@ build-gnurl:
   only:
     - master
   script:
-    - ./buildconf ; ./configure --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 ; make ; make -C tests test
+    - ./buildconf ; ./configure --with-gnutls --without-libssh2 --without-libmetalink --without-winidn --without-nghttp2 --without-nss --without-cyassl --without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb ; make ; make -C tests test
diff --git a/configure.ac b/configure.ac
index 5d15aa8a6..274accfc6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -167,8 +167,6 @@ 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
@@ -363,15 +361,6 @@ AC_ARG_ENABLE(http,
 AC_HELP_STRING([--enable-http],[Enable HTTP support])
 AC_HELP_STRING([--disable-http],[Disable HTTP support]),
 [ case "$enableval" in
-  no)
-       AC_MSG_RESULT(no)
-       AC_DEFINE(CURL_DISABLE_HTTP, 1, [to disable HTTP])
-       disable_http="yes"
-       AC_MSG_WARN([disable HTTP disables FTP over proxy and RTSP])
-       AC_SUBST(CURL_DISABLE_HTTP, [1])
-       AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
-       AC_SUBST(CURL_DISABLE_RTSP, [1])
-       ;;
   *)   AC_MSG_RESULT(yes)
        ;;
   esac ],
@@ -382,46 +371,39 @@ AC_ARG_ENABLE(ftp,
 AC_HELP_STRING([--enable-ftp],[Enable FTP support])
 AC_HELP_STRING([--disable-ftp],[Disable FTP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_FTP, 1, [to disable FTP])
        AC_SUBST(CURL_DISABLE_FTP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING([whether to support file])
 AC_ARG_ENABLE(file,
 AC_HELP_STRING([--enable-file],[Enable FILE support])
 AC_HELP_STRING([--disable-file],[Disable FILE support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_FILE, 1, [to disable FILE])
        AC_SUBST(CURL_DISABLE_FILE, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING([whether to support ldap])
 AC_ARG_ENABLE(ldap,
 AC_HELP_STRING([--enable-ldap],[Enable LDAP support])
 AC_HELP_STRING([--disable-ldap],[Disable LDAP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
        AC_SUBST(CURL_DISABLE_LDAP, [1])
        ;;
-  *)
-       AC_MSG_RESULT(yes)
-       ;;
   esac ],[
-       AC_MSG_RESULT(yes) ]
+       AC_MSG_RESULT(no) ]
 )
 AC_MSG_CHECKING([whether to support ldaps])
 AC_ARG_ENABLE(ldaps,
@@ -502,45 +484,39 @@ AC_ARG_ENABLE(dict,
 AC_HELP_STRING([--enable-dict],[Enable DICT support])
 AC_HELP_STRING([--disable-dict],[Disable DICT support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_DICT, 1, [to disable DICT])
        AC_SUBST(CURL_DISABLE_DICT, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING([whether to support telnet])
 AC_ARG_ENABLE(telnet,
 AC_HELP_STRING([--enable-telnet],[Enable TELNET support])
 AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_TELNET, 1, [to disable TELNET])
        AC_SUBST(CURL_DISABLE_TELNET, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING([whether to support tftp])
 AC_ARG_ENABLE(tftp,
 AC_HELP_STRING([--enable-tftp],[Enable TFTP support])
 AC_HELP_STRING([--disable-tftp],[Disable TFTP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_TFTP, 1, [to disable TFTP])
        AC_SUBST(CURL_DISABLE_TFTP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 
 AC_MSG_CHECKING([whether to support pop3])
@@ -548,15 +524,13 @@ AC_ARG_ENABLE(pop3,
 AC_HELP_STRING([--enable-pop3],[Enable POP3 support])
 AC_HELP_STRING([--disable-pop3],[Disable POP3 support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_POP3, 1, [to disable POP3])
        AC_SUBST(CURL_DISABLE_POP3, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 
 
@@ -565,15 +539,13 @@ AC_ARG_ENABLE(imap,
 AC_HELP_STRING([--enable-imap],[Enable IMAP support])
 AC_HELP_STRING([--disable-imap],[Disable IMAP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_IMAP, 1, [to disable IMAP])
        AC_SUBST(CURL_DISABLE_IMAP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 
 
@@ -582,15 +554,13 @@ AC_ARG_ENABLE(smb,
 AC_HELP_STRING([--enable-smb],[Enable SMB/CIFS support])
 AC_HELP_STRING([--disable-smb],[Disable SMB/CIFS support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_SMB, 1, [to disable SMB/CIFS])
        AC_SUBST(CURL_DISABLE_SMB, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 
 AC_MSG_CHECKING([whether to support smtp])
@@ -598,15 +568,13 @@ AC_ARG_ENABLE(smtp,
 AC_HELP_STRING([--enable-smtp],[Enable SMTP support])
 AC_HELP_STRING([--disable-smtp],[Disable SMTP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_SMTP, 1, [to disable SMTP])
        AC_SUBST(CURL_DISABLE_SMTP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 
 AC_MSG_CHECKING([whether to support gopher])
@@ -614,15 +582,13 @@ AC_ARG_ENABLE(gopher,
 AC_HELP_STRING([--enable-gopher],[Enable Gopher support])
 AC_HELP_STRING([--disable-gopher],[Disable Gopher support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable Gopher])
        AC_SUBST(CURL_DISABLE_GOPHER, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
 )
 
 
@@ -3767,87 +3733,6 @@ dnl to let curl-config output the static libraries correctly
 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
@@ -4106,5 +3991,4 @@ 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 b199e93a2..5ab9e8bd2 100644
--- a/guix-gnurl.scm
+++ b/guix-gnurl.scm
@@ -61,17 +61,13 @@
     ;;            (zero? (system* "sh" "buildconf"))))))))
     (arguments
      ;;`(;#:configure-flags '("--enable-gnurl")
-     `(#:configure-flags '("--enable-ipv6" "--with-gnutls" "--without-libssh2"
+     `(#:configure-flags '("--with-gnutls" "--without-libssh2"
                            "--without-libmetalink" "--without-winidn"
-                           "--without-librtmp" "--without-nghttp2"
+                           "--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")
+                           "--disable-sspi" "--disable-ntlm-wb")
        #:test-target "test"
        #:parallel-tests? #f
        #:phases