]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix declaration of PBX_CURL for ./configure --without-libcurl
authorCorey Farrell <git@cfware.com>
Sat, 14 Jul 2018 03:44:53 +0000 (23:44 -0400)
committerCorey Farrell <git@cfware.com>
Sat, 14 Jul 2018 16:23:28 +0000 (11:23 -0500)
When `--without-libcurl` is used PBX_CURL is never set.  Set default
value 0 so the proper value is passed to menuselect.

Change-Id: I03e2842a00899cbca2dbde52bb1f6636d54bae1e

autoconf/libcurl.m4
configure

index 9a31bfc8bbb55db381a2ad30dc7f5122d75f77c9..e1ae2a47e63dbc20137c1144e10912ecb1c9da00 100644 (file)
@@ -80,7 +80,7 @@ AC_DEFUN([AST_LIBCURL_CHECK_CONFIG],
   AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3])
   AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP])
   AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
-  AC_SUBST(PBX_CURL)
+  AC_SUBST(PBX_CURL, 0)
 
   AC_ARG_WITH(libcurl,
      AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
@@ -248,7 +248,6 @@ if (x) {;}
         else
            unset CURL_LIB
            unset CURL_INCLUDE
-           PBX_CURL=0
         fi
      fi
 
index 709fb0e07fce5514e632fc104891de8b469605f7..93070147c04edf31ca99beef976f35945197f694 100755 (executable)
--- a/configure
+++ b/configure
@@ -10300,6 +10300,7 @@ fi
 
 
 
+  PBX_CURL=0
 
 
 
@@ -10639,7 +10640,6 @@ _ACEOF
         else
            unset CURL_LIB
            unset CURL_INCLUDE
-           PBX_CURL=0
         fi
      fi