[Asterisk-code-review] Fix declaration of PBX CURL for ./configure --without-libcurl (asterisk[13])

[George Joseph]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/9437 )

Change subject: Fix declaration of PBX_CURL for ./configure --without-libcurl
......................................................................

Fix declaration of PBX_CURL for ./configure --without-libcurl

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
---
M autoconf/libcurl.m4
M configure
2 files changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/autoconf/libcurl.m4 b/autoconf/libcurl.m4
index 9a31bfc..e1ae2a4 100644
--- a/autoconf/libcurl.m4
+++ b/autoconf/libcurl.m4
@@ -80,7 +80,7 @@
   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 @@
         else
            unset CURL_LIB
            unset CURL_INCLUDE
-           PBX_CURL=0
         fi
      fi
 
diff --git a/configure b/configure
index d6f39e8..926c59c 100755
--- a/configure
+++ b/configure
@@ -10229,6 +10229,7 @@
 
 
 
+  PBX_CURL=0
 
 
 
@@ -10568,7 +10569,6 @@
         else
            unset CURL_LIB
            unset CURL_INCLUDE
-           PBX_CURL=0
         fi
      fi
 

-- 
To view, visit https://gerrit.asterisk.org/9437
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: I03e2842a00899cbca2dbde52bb1f6636d54bae1e
Gerrit-Change-Number: 9437
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180717/07b16935/attachment-0001.html>