[Libreoffice-commits] core.git: configure.ac

[Michael Stahl (via logerrit)]

 configure.ac |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 37e7398e9cb02d19a0825fe2e72f5adc2296d06d
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Fri Sep 10 14:36:17 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Sep 14 11:16:55 2021 +0200

    configure: test_curl is always "yes"
    
    Presumably this should check enable_curl instead.
    
    Change-Id: Ifc0b871e9c34bdb43ef14b8002d4997860266a3a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122040
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/configure.ac b/configure.ac
index a2dd5dc5eeb9..4af48fc034d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -819,7 +819,6 @@ disable_database_connectivity_dependencies()
 # ===================================================================
 build_crypto=yes
 test_cmis=yes
-test_curl=yes
 test_gdb_index=no
 test_openldap=yes
 test_split_debug=no
@@ -10269,7 +10268,7 @@ if test "$with_system_curl" = "auto"; then
     with_system_curl="$with_system_libs"
 fi
 
-if test "$test_curl" = "yes" -a "$enable_curl" = "yes" -a "$with_system_curl" = "yes"; then
+if test "$enable_curl" = "yes" -a "$with_system_curl" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_CURL=TRUE
 
@@ -10301,7 +10300,7 @@ if test "$test_curl" = "yes" -a "$enable_curl" = "yes" -a "$with_system_curl" =
     fi
 
     ENABLE_CURL=TRUE
-elif test "$test_curl" = "no"; then
+elif test "$enable_curl" = "no"; then
     AC_MSG_RESULT([none])
 else
     AC_MSG_RESULT([internal])